diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a43c291..b56a318 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -52,7 +52,7 @@ }, { "type": "npm", - "script": "clear", + "script": "clean", "path": "Samples/TypeScript/Demo/", "problemMatcher": [] }, @@ -93,7 +93,7 @@ }, { "type": "npm", - "script": "clear", + "script": "clean", "path": "Framework/", "problemMatcher": [] } diff --git a/CHANGELOG.md b/CHANGELOG.md index ed9d222..1f26148 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [4-r.4] - 2021-12-09 + +### Changed + +* Update sample models. (Made with Cubism Editor 4.1.02) + +### Fixed + +* Fix a bug where the move process would affect other models while displaying multiple models. by [@catCoder](https://community.live2d.com/discussion/1043/multiple-models-when-using-translaterelative) +* Fix breathing behavior was different from Cubism Viewer (for OW). + + ## [4-r.3] - 2021-06-10 ### Fixed @@ -87,6 +99,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). * Fix issue with reloading model images in WebKit. +[4-r.4]: https://github.com/Live2D/CubismWebSamples/compare/4-r.3...4-r.4 [4-r.3]: https://github.com/Live2D/CubismWebSamples/compare/4-r.3-beta.1...4-r.3 [4-r.3-beta.1]: https://github.com/Live2D/CubismWebSamples/compare/4-r.2...4-r.3-beta.1 [4-r.2]: https://github.com/Live2D/CubismWebSamples/compare/4-r.1...4-r.2 diff --git a/Core/CHANGELOG.md b/Core/CHANGELOG.md index 18f3f33..7bd22ad 100644 --- a/Core/CHANGELOG.md +++ b/Core/CHANGELOG.md @@ -4,15 +4,30 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## 2021-12-09 + +### Added + +* Add static library(.a) for Mac Catalyst. + + +## 2021-10-07 + +### Added + +* Add `x86_64` library for Android. +* Add `arm64` library for macOS. + ## 2021-03-09 ### Added -* Add funtcions for Viewer. +* Add funtcions for Viewer. * `csmGetParameterKeyCounts` * `csmGetParameterKeyValues` + ### Changed * Update Core version to `04.01.0000`. diff --git a/Core/LICENSE.md b/Core/LICENSE.md index 5d2c2f4..4139d4f 100644 --- a/Core/LICENSE.md +++ b/Core/LICENSE.md @@ -4,3 +4,4 @@ Live2D Cubism Core is available under Live2D Proprietary Software License. * [Live2D Proprietary Software License Agreement](https://www.live2d.com/eula/live2d-proprietary-software-license-agreement_en.html) * [Live2D Proprietary Software 使用許諾契約書](https://www.live2d.com/eula/live2d-proprietary-software-license-agreement_jp.html) +* [Live2D Proprietary Software 使用授权协议](https://www.live2d.com/eula/live2d-proprietary-software-license-agreement_cn.html) diff --git a/Framework b/Framework index 50de62e..13ba60d 160000 --- a/Framework +++ b/Framework @@ -1 +1 @@ -Subproject commit 50de62e30608ffc03ebcf09d7797ea141e9174c7 +Subproject commit 13ba60d1b256ff6a8b76ba9b94da4e1e714e0512 diff --git a/README.md b/README.md index 5794d78..a7885f7 100644 --- a/README.md +++ b/README.md @@ -80,29 +80,38 @@ NOTE: デバック用の設定は、`.vscode/launch.json` に記述していま ### Node.js -* 16.1.0 -* 14.17.0 -* 12.22.1 +* 17.2.0 +* 16.13.1 +* 14.18.2 +* 12.22.7 ## 動作確認環境 | プラットフォーム | ブラウザ | バージョン | | --- | --- | --- | -| Android | Google Chrome | 90.0.4430.210 | -| Android | Microsoft Edge | 46.04.4.5157 | -| Android | Mozilla Firefox | 88.1.4 | -| iOS / iPadOS | Google Chrome | 90.0.4430.216 | -| iOS / iPadOS | Microsoft Edge | 46.3.13 | -| iOS / iPadOS | Mozilla Firefox | 33.1 | -| iOS / iPadOS | Safari | 14.1 | -| macOS | Google Chrome | 91.0.4472.77 | -| macOS | Microsoft Edge | 90.0.818.66 | -| macOS | Mozilla Firefox | 88.0.1 | -| macOS | Safari | 14.1 | -| Windows | Google Chrome | 91.0.4472.77 | -| Windows | Internet Explorer 11 | 19041.928 | -| Windows | Microsoft Edge | 90.0.818.66 | -| Windows | Mozilla Firefox | 88.0.1 | +| Android | Google Chrome | 96.0.4664.45 | +| Android | Microsoft Edge | 96.0.1054.36 | +| Android | Mozilla Firefox | 94.1.2 | +| iOS / iPadOS | Google Chrome | 96.0.4664.53 | +| iOS / iPadOS | Microsoft Edge | 95.0.1020.60 | +| iOS / iPadOS | Mozilla Firefox | 39.0 | +| iOS / iPadOS | Safari | 604.1 | +| macOS | Google Chrome | 96.0.4664.55 | +| macOS | Microsoft Edge | 96.0.1054.34 | +| macOS | Mozilla Firefox | 94.0.2 | +| macOS | Safari | 15.1 | +| Windows | Google Chrome | 96.0.4664.45 | +| Windows | Internet Explorer 11 | 19043.1387 | +| Windows | Microsoft Edge | 96.0.1054.41 | +| Windows | Mozilla Firefox | 94.0.2 | Note: 動作確認時のサーバの起動は `./Samples/TypeScript/Demo/package.json` の `serve` スクリプトを使用して行っています。 + + +## コミュニティ + +ユーザー同士でCubism SDKの活用方法の提案や質問をしたい場合は、是非コミュニティをご活用ください。 + +- [Live2D 公式コミュニティ](https://creatorsforum.live2d.com/) +- [Live2D community(English)](http://community.live2d.com/) diff --git a/Samples/Resources/Haru/Haru.2048/texture_00.png b/Samples/Resources/Haru/Haru.2048/texture_00.png index 455069c..881ad67 100644 Binary files a/Samples/Resources/Haru/Haru.2048/texture_00.png and b/Samples/Resources/Haru/Haru.2048/texture_00.png differ diff --git a/Samples/Resources/Haru/Haru.2048/texture_01.png b/Samples/Resources/Haru/Haru.2048/texture_01.png index f16c5f8..9caa21e 100644 Binary files a/Samples/Resources/Haru/Haru.2048/texture_01.png and b/Samples/Resources/Haru/Haru.2048/texture_01.png differ diff --git a/Samples/Resources/Haru/Haru.cdi3.json b/Samples/Resources/Haru/Haru.cdi3.json new file mode 100644 index 0000000..b4a751c --- /dev/null +++ b/Samples/Resources/Haru/Haru.cdi3.json @@ -0,0 +1,334 @@ +{ + "Version": 3, + "Parameters": [ + { + "Id": "ParamAngleX", + "GroupId": "ParamGroupFace", + "Name": "角度 X" + }, + { + "Id": "ParamAngleY", + "GroupId": "ParamGroupFace", + "Name": "角度 Y" + }, + { + "Id": "ParamAngleZ", + "GroupId": "ParamGroupFace", + "Name": "角度 Z" + }, + { + "Id": "ParamTere", + "GroupId": "ParamGroupFace", + "Name": "照れ" + }, + { + "Id": "ParamFaceForm", + "GroupId": "ParamGroupFace", + "Name": "顔の拡縮" + }, + { + "Id": "ParamEyeLOpen", + "GroupId": "ParamGroupEyes", + "Name": "左目　開閉" + }, + { + "Id": "ParamEyeLSmile", + "GroupId": "ParamGroupEyes", + "Name": "左目　笑顔" + }, + { + "Id": "ParamEyeROpen", + "GroupId": "ParamGroupEyes", + "Name": "右目　開閉" + }, + { + "Id": "ParamEyeRSmile", + "GroupId": "ParamGroupEyes", + "Name": "右目　笑顔" + }, + { + "Id": "ParamEyeForm", + "GroupId": "ParamGroupEyes", + "Name": "眼　変形" + }, + { + "Id": "ParamEyeBallForm", + "GroupId": "ParamGroupEyes", + "Name": "目玉　収縮" + }, + { + "Id": "ParamTear", + "GroupId": "ParamGroupEyes", + "Name": "涙" + }, + { + "Id": "ParamEyeBallX", + "GroupId": "ParamGroupEyes", + "Name": "目玉 X" + }, + { + "Id": "ParamEyeBallY", + "GroupId": "ParamGroupEyes", + "Name": "目玉 Y" + }, + { + "Id": "ParamBrowLY", + "GroupId": "ParamGroup", + "Name": "左眉　上下" + }, + { + "Id": "ParamBrowRY", + "GroupId": "ParamGroup", + "Name": "右眉　上下" + }, + { + "Id": "ParamBrowLX", + "GroupId": "ParamGroup", + "Name": "左眉　左右" + }, + { + "Id": "ParamBrowRX", + "GroupId": "ParamGroup", + "Name": "右眉　左右" + }, + { + "Id": "ParamBrowLAngle", + "GroupId": "ParamGroup", + "Name": "左眉　角度" + }, + { + "Id": "ParamBrowRAngle", + "GroupId": "ParamGroup", + "Name": "右眉　角度" + }, + { + "Id": "ParamBrowLForm", + "GroupId": "ParamGroup", + "Name": "左眉　変形" + }, + { + "Id": "ParamBrowRForm", + "GroupId": "ParamGroup", + "Name": "右眉　変形" + }, + { + "Id": "ParamMouthForm", + "GroupId": "ParamGroupMouth", + "Name": "口　変形" + }, + { + "Id": "ParamMouthOpenY", + "GroupId": "ParamGroupMouth", + "Name": "口　開閉" + }, + { + "Id": "ParamScarf", + "GroupId": "ParamGroup2", + "Name": "スカーフ揺れ" + }, + { + "Id": "ParamBodyAngleX", + "GroupId": "ParamGroup2", + "Name": "体の回転　X" + }, + { + "Id": "ParamBodyAngleY", + "GroupId": "ParamGroup2", + "Name": "体の回転　Y" + }, + { + "Id": "ParamBodyAngleZ", + "GroupId": "ParamGroup2", + "Name": "体の回転　Z" + }, + { + "Id": "ParamBodyUpper", + "GroupId": "ParamGroup2", + "Name": "上体" + }, + { + "Id": "ParamBreath", + "GroupId": "ParamGroup2", + "Name": "呼吸" + }, + { + "Id": "ParamBustY", + "GroupId": "ParamGroup2", + "Name": "胸　揺れ" + }, + { + "Id": "ParamArmLA", + "GroupId": "ParamGroupArms", + "Name": "左腕 A" + }, + { + "Id": "ParamArmRA", + "GroupId": "ParamGroupArms", + "Name": "右腕 A" + }, + { + "Id": "ParamArmLB", + "GroupId": "ParamGroupArms", + "Name": "右腕 B" + }, + { + "Id": "ParamArmRB", + "GroupId": "ParamGroupArms", + "Name": "左腕 B" + }, + { + "Id": "ParamHandChangeR", + "GroupId": "ParamGroupArms", + "Name": "右手切替" + }, + { + "Id": "ParamHandAngleR", + "GroupId": "ParamGroupArms", + "Name": "右手首角度" + }, + { + "Id": "ParamHandDhangeL", + "GroupId": "ParamGroupArms", + "Name": "左手切替" + }, + { + "Id": "ParamHandAngleL", + "GroupId": "ParamGroupArms", + "Name": "左手首角度" + }, + { + "Id": "ParamHairFront", + "GroupId": "ParamGroup3", + "Name": "髪揺れ　前" + }, + { + "Id": "ParamHairSide", + "GroupId": "ParamGroup3", + "Name": "髪揺れ　横" + }, + { + "Id": "ParamHairBack", + "GroupId": "ParamGroup3", + "Name": "髪揺れ　後" + } + ], + "ParameterGroups": [ + { + "Id": "ParamGroupFace", + "GroupId": "", + "Name": "顔" + }, + { + "Id": "ParamGroupEyes", + "GroupId": "", + "Name": "目" + }, + { + "Id": "ParamGroup", + "GroupId": "", + "Name": "眉毛" + }, + { + "Id": "ParamGroupMouth", + "GroupId": "", + "Name": "口" + }, + { + "Id": "ParamGroup2", + "GroupId": "", + "Name": "胴体" + }, + { + "Id": "ParamGroupArms", + "GroupId": "", + "Name": "腕" + }, + { + "Id": "ParamGroup3", + "GroupId": "", + "Name": "髪揺れ" + } + ], + "Parts": [ + { + "Id": "Part01Core", + "Name": "コアパーツ" + }, + { + "Id": "Part01Hoho001", + "Name": "頬" + }, + { + "Id": "Part01Brow001", + "Name": "まゆ毛" + }, + { + "Id": "Part01Tear", + "Name": "涙" + }, + { + "Id": "Part01EyeBall001", + "Name": "目玉" + }, + { + "Id": "Part01Eye001", + "Name": "目" + }, + { + "Id": "Part01Nose001", + "Name": "鼻" + }, + { + "Id": "Part01Mouth001", + "Name": "口" + }, + { + "Id": "Part01Face001", + "Name": "顔" + }, + { + "Id": "Part01Ear001", + "Name": "耳" + }, + { + "Id": "Part01Neck001", + "Name": "首" + }, + { + "Id": "Part01HairFront001", + "Name": "前髪" + }, + { + "Id": "Part01HairSide001", + "Name": "横髪" + }, + { + "Id": "Part01HairBack001", + "Name": "後ろ髪" + }, + { + "Id": "Part01ArmRB001", + "Name": "左腕 B" + }, + { + "Id": "Part01ArmLB001", + "Name": "右腕 B" + }, + { + "Id": "Part01ArmRA001", + "Name": "右腕 A" + }, + { + "Id": "Part01ArmLA001", + "Name": "左腕 A" + }, + { + "Id": "Part01Body001", + "Name": "制服" + }, + { + "Id": "Part01Sketch", + "Name": "[ 下絵 ]" + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Haru/Haru.moc3 b/Samples/Resources/Haru/Haru.moc3 index d355467..e5fc43a 100644 Binary files a/Samples/Resources/Haru/Haru.moc3 and b/Samples/Resources/Haru/Haru.moc3 differ diff --git a/Samples/Resources/Haru/Haru.model3.json b/Samples/Resources/Haru/Haru.model3.json index 00b148f..17335a8 100644 --- a/Samples/Resources/Haru/Haru.model3.json +++ b/Samples/Resources/Haru/Haru.model3.json @@ -3,46 +3,89 @@ "FileReferences": { "Moc": "Haru.moc3", "Textures": [ - "Haru.2048/texture_00.png", - "Haru.2048/texture_01.png" + "Haru.2048/texture_00.png", + "Haru.2048/texture_01.png" ], + "Physics": "Haru.physics3.json", "Pose": "Haru.pose3.json", + "DisplayInfo": "Haru.cdi3.json", "Expressions": [ - {"Name":"f00","File":"expressions/F01.exp3.json"}, - {"Name":"f01","File":"expressions/F02.exp3.json"}, - {"Name":"f02","File":"expressions/F03.exp3.json"}, - {"Name":"f03","File":"expressions/F04.exp3.json"}, - {"Name":"f04","File":"expressions/F05.exp3.json"}, - {"Name":"f05","File":"expressions/F06.exp3.json"}, - {"Name":"f06","File":"expressions/F07.exp3.json"}, - {"Name":"f07","File":"expressions/F08.exp3.json"} + { + "Name": "F01", + "File": "expressions/F01.exp3.json" + }, + { + "Name": "F02", + "File": "expressions/F02.exp3.json" + }, + { + "Name": "F03", + "File": "expressions/F03.exp3.json" + }, + { + "Name": "F04", + "File": "expressions/F04.exp3.json" + }, + { + "Name": "F05", + "File": "expressions/F05.exp3.json" + }, + { + "Name": "F06", + "File": "expressions/F06.exp3.json" + }, + { + "Name": "F07", + "File": "expressions/F07.exp3.json" + }, + { + "Name": "F08", + "File": "expressions/F08.exp3.json" + } ], "Motions": { "Idle": [ - {"File":"motions/haru_g_idle.motion3.json" ,"FadeInTime":0.5, "FadeOutTime":0.5}, - {"File":"motions/haru_g_m15.motion3.json" ,"FadeInTime":0.5, "FadeOutTime":0.5} + { + "File": "motions/haru_g_idle.motion3.json", + "FadeInTime": 0.5, + "FadeOutTime": 0.5 + }, + { + "File": "motions/haru_g_m15.motion3.json", + "FadeInTime": 0.5, + "FadeOutTime": 0.5 + } ], "TapBody": [ - {"File":"motions/haru_g_m06.motion3.json" ,"FadeInTime":0.5, "FadeOutTime":0.5 - ,"Sound": "sounds/haru_normal_01.wav"}, - {"File":"motions/haru_g_m09.motion3.json" ,"FadeInTime":0.5, "FadeOutTime":0.5 - ,"Sound": "sounds/haru_normal_02.wav"}, - {"File":"motions/haru_g_m20.motion3.json" ,"FadeInTime":0.5, "FadeOutTime":0.5 - ,"Sound": "sounds/haru_normal_03.wav"}, - {"File":"motions/haru_g_m26.motion3.json" ,"FadeInTime":0.5, "FadeOutTime":0.5 - ,"Sound": "sounds/haru_normal_04.wav"} + { + "File": "motions/haru_g_m26.motion3.json", + "FadeInTime": 0.5, + "FadeOutTime": 0.5, + "Sound": "sounds/haru_normal_04.wav" + }, + { + "File": "motions/haru_g_m06.motion3.json", + "FadeInTime": 0.5, + "FadeOutTime": 0.5, + "Sound": "sounds/haru_normal_01.wav" + }, + { + "File": "motions/haru_g_m20.motion3.json", + "FadeInTime": 0.5, + "FadeOutTime": 0.5, + "Sound": "sounds/haru_normal_03.wav" + }, + { + "File": "motions/haru_g_m09.motion3.json", + "FadeInTime": 0.5, + "FadeOutTime": 0.5, + "Sound": "sounds/haru_normal_02.wav" + } ] }, "UserData": "Haru.userdata3.json" }, "Groups": [ - { - "Target": "Parameter", - "Name": "LipSync", - "Ids": [ - "ParamMouthOpenY" - ] - }, { "Target": "Parameter", "Name": "EyeBlink", @@ -50,10 +93,23 @@ "ParamEyeLOpen", "ParamEyeROpen" ] + }, + { + "Target": "Parameter", + "Name": "LipSync", + "Ids": [ + "ParamMouthOpenY" + ] } ], "HitAreas": [ - {"Name":"Head", "Id":"HitArea"}, - {"Name":"Body", "Id":"HitArea2"} + { + "Id": "HitArea", + "Name": "Head" + }, + { + "Id": "HitArea2", + "Name": "Body" + } ] -} +} \ No newline at end of file diff --git a/Samples/Resources/Haru/Haru.physics3.json b/Samples/Resources/Haru/Haru.physics3.json new file mode 100644 index 0000000..3f14797 --- /dev/null +++ b/Samples/Resources/Haru/Haru.physics3.json @@ -0,0 +1,373 @@ +{ + "Version": 3, + "Meta": { + "PhysicsSettingCount": 4, + "TotalInputCount": 14, + "TotalOutputCount": 4, + "VertexCount": 8, + "EffectiveForces": { + "Gravity": { + "X": 0, + "Y": -1 + }, + "Wind": { + "X": 0, + "Y": 0 + } + }, + "PhysicsDictionary": [ + { + "Id": "PhysicsSetting1", + "Name": "前髪" + }, + { + "Id": "PhysicsSetting2", + "Name": "横髪" + }, + { + "Id": "PhysicsSetting3", + "Name": "後ろ髪" + }, + { + "Id": "PhysicsSetting4", + "Name": "スカーフ" + } + ] + }, + "PhysicsSettings": [ + { + "Id": "PhysicsSetting1", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "ParamAngleX" + }, + "Weight": 60, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamAngleZ" + }, + "Weight": 60, + "Type": "Angle", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleX" + }, + "Weight": 40, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleZ" + }, + "Weight": 40, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "ParamHairFront" + }, + "VertexIndex": 1, + "Scale": 1.821, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 8 + }, + "Mobility": 0.95, + "Delay": 0.8, + "Acceleration": 1.5, + "Radius": 8 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting2", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "ParamAngleX" + }, + "Weight": 60, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamAngleZ" + }, + "Weight": 60, + "Type": "Angle", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleX" + }, + "Weight": 40, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleZ" + }, + "Weight": 40, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "ParamHairSide" + }, + "VertexIndex": 1, + "Scale": 1.593, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 8 + }, + "Mobility": 0.95, + "Delay": 0.8, + "Acceleration": 1, + "Radius": 8 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting3", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "ParamAngleX" + }, + "Weight": 60, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamAngleZ" + }, + "Weight": 60, + "Type": "Angle", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleX" + }, + "Weight": 40, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleZ" + }, + "Weight": 40, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "ParamHairBack" + }, + "VertexIndex": 1, + "Scale": 1.943, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 8 + }, + "Mobility": 0.95, + "Delay": 0.8, + "Acceleration": 1.5, + "Radius": 8 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + }, + { + "Id": "PhysicsSetting4", + "Input": [ + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleX" + }, + "Weight": 100, + "Type": "X", + "Reflect": false + }, + { + "Source": { + "Target": "Parameter", + "Id": "ParamBodyAngleZ" + }, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Output": [ + { + "Destination": { + "Target": "Parameter", + "Id": "ParamScarf" + }, + "VertexIndex": 1, + "Scale": 0.873, + "Weight": 100, + "Type": "Angle", + "Reflect": false + } + ], + "Vertices": [ + { + "Position": { + "X": 0, + "Y": 0 + }, + "Mobility": 1, + "Delay": 1, + "Acceleration": 1, + "Radius": 0 + }, + { + "Position": { + "X": 0, + "Y": 10 + }, + "Mobility": 0.9, + "Delay": 0.6, + "Acceleration": 1.5, + "Radius": 10 + } + ], + "Normalization": { + "Position": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + }, + "Angle": { + "Minimum": -10, + "Default": 0, + "Maximum": 10 + } + } + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Haru/Haru.pose3.json b/Samples/Resources/Haru/Haru.pose3.json index c90a573..bae91c0 100644 --- a/Samples/Resources/Haru/Haru.pose3.json +++ b/Samples/Resources/Haru/Haru.pose3.json @@ -3,21 +3,21 @@ "Groups": [ [ { - "Id": "Part01ArmLB001", + "Id": "Part01ArmRA001", "Link": [] }, { - "Id": "Part01ArmRA001", + "Id": "Part01ArmRB001", "Link": [] } ], [ { - "Id": "Part01ArmRB001", + "Id": "Part01ArmLA001", "Link": [] }, { - "Id": "Part01ArmLA001", + "Id": "Part01ArmLB001", "Link": [] } ] diff --git a/Samples/Resources/Haru/motions/haru_g_idle.motion3.json b/Samples/Resources/Haru/motions/haru_g_idle.motion3.json index 1706002..f28938b 100644 --- a/Samples/Resources/Haru/motions/haru_g_idle.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_idle.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 298, - "TotalPointCount": 789, + "CurveCount": 63, + "TotalSegmentCount": 296, + "TotalPointCount": 785, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 3.322, + 3.32, 1, - 6.644, + 6.64, 1, - 9.967, + 9.97, 1, 0, 10, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 10, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 10, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -2005,7 +1983,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2019,7 +1997,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2033,7 +2011,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2047,7 +2025,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2061,7 +2039,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2075,7 +2053,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2089,7 +2067,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2103,7 +2081,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2117,7 +2095,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2131,7 +2109,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2145,7 +2123,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2159,7 +2137,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2173,7 +2151,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2187,7 +2165,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2201,7 +2179,7 @@ 0, 0, 2, - 9.967, + 9.97, 0, 0, 10, @@ -2215,7 +2193,7 @@ 0, 0, 2, - 9.967, + 9.97, 0, 0, 10, @@ -2229,7 +2207,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2243,7 +2221,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2257,7 +2235,7 @@ 0, 1, 2, - 9.967, + 9.97, 1, 0, 10, @@ -2271,7 +2249,7 @@ 0, 0, 2, - 9.967, + 9.97, 0, 0, 10, diff --git a/Samples/Resources/Haru/motions/haru_g_m01.motion3.json b/Samples/Resources/Haru/motions/haru_g_m01.motion3.json index 18d6f08..115419e 100644 --- a/Samples/Resources/Haru/motions/haru_g_m01.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m01.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 145, - "TotalPointCount": 330, + "CurveCount": 63, + "TotalSegmentCount": 143, + "TotalPointCount": 326, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 0.956, + 0.96, 1, - 1.911, + 1.91, 1, - 2.867, + 2.87, 1, 0, 2.9, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 2.9, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 2.9, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -934,7 +912,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -948,7 +926,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -962,7 +940,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -976,7 +954,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -990,7 +968,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1004,7 +982,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1018,7 +996,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1032,7 +1010,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1046,7 +1024,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1060,7 +1038,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1074,7 +1052,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1088,7 +1066,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1102,7 +1080,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1116,7 +1094,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1130,7 +1108,7 @@ 0, 0, 2, - 2.867, + 2.87, 0, 0, 2.9, @@ -1144,7 +1122,7 @@ 0, 0, 2, - 2.867, + 2.87, 0, 0, 2.9, @@ -1158,7 +1136,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1172,7 +1150,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1186,7 +1164,7 @@ 0, 1, 2, - 2.867, + 2.87, 1, 0, 2.9, @@ -1200,7 +1178,7 @@ 0, 0, 2, - 2.867, + 2.87, 0, 0, 2.9, diff --git a/Samples/Resources/Haru/motions/haru_g_m02.motion3.json b/Samples/Resources/Haru/motions/haru_g_m02.motion3.json index de18988..d0dd0f2 100644 --- a/Samples/Resources/Haru/motions/haru_g_m02.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m02.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 2.033, + "Duration": 2.03, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 148, - "TotalPointCount": 341, + "CurveCount": 63, + "TotalSegmentCount": 146, + "TotalPointCount": 337, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,43 +19,21 @@ 0, 1, 1, - 0.667, + 0.67, 1, - 1.333, + 1.33, 1, 2, 1, 1, - 2.011, + 2.01, 1, - 2.022, + 2.02, 1, - 2.033, + 2.03, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 2.033, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 2.033, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -962,7 +940,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -976,7 +954,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -990,7 +968,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1004,7 +982,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1018,7 +996,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1032,7 +1010,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1046,7 +1024,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1060,7 +1038,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1074,7 +1052,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1088,7 +1066,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1102,7 +1080,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1116,7 +1094,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1130,7 +1108,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1144,7 +1122,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1158,7 +1136,7 @@ 2, 0, 2, - 2.033, + 2.03, 0 ] }, @@ -1172,7 +1150,7 @@ 2, 0, 2, - 2.033, + 2.03, 0 ] }, @@ -1186,7 +1164,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1200,7 +1178,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1214,7 +1192,7 @@ 2, 1, 2, - 2.033, + 2.03, 1 ] }, @@ -1228,7 +1206,7 @@ 2, 0, 2, - 2.033, + 2.03, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m03.motion3.json b/Samples/Resources/Haru/motions/haru_g_m03.motion3.json index 9166ba7..5c5775a 100644 --- a/Samples/Resources/Haru/motions/haru_g_m03.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m03.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 4.633, + "Duration": 4.63, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 223, - "TotalPointCount": 564, + "CurveCount": 63, + "TotalSegmentCount": 221, + "TotalPointCount": 560, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.533, + 1.53, 1, - 3.067, + 3.07, 1, 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4.633, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4.633, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1483,7 +1461,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1497,7 +1475,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1511,7 +1489,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1525,7 +1503,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1539,7 +1517,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1553,7 +1531,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1567,7 +1545,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1581,7 +1559,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1595,7 +1573,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1609,7 +1587,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1623,7 +1601,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1637,7 +1615,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1651,7 +1629,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1665,7 +1643,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1679,7 +1657,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1693,7 +1671,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1707,7 +1685,7 @@ 4.6, 0, 0, - 4.633, + 4.63, 0 ] }, @@ -1721,7 +1699,7 @@ 4.6, 0, 0, - 4.633, + 4.63, 0 ] }, @@ -1735,7 +1713,7 @@ 4.6, 1, 0, - 4.633, + 4.63, 1 ] }, @@ -1749,7 +1727,7 @@ 4.6, 0, 0, - 4.633, + 4.63, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m04.motion3.json b/Samples/Resources/Haru/motions/haru_g_m04.motion3.json index 632e15a..b555601 100644 --- a/Samples/Resources/Haru/motions/haru_g_m04.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m04.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 330, - "TotalPointCount": 885, + "CurveCount": 63, + "TotalSegmentCount": 328, + "TotalPointCount": 881, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.756, + 1.76, 1, - 3.511, + 3.51, 1, - 5.267, + 5.27, 1, 0, 5.3, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 5.3, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 5.3, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -2229,7 +2207,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2243,7 +2221,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2257,7 +2235,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2271,7 +2249,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2285,7 +2263,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2299,7 +2277,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2313,7 +2291,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2327,7 +2305,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2341,7 +2319,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2355,7 +2333,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2369,7 +2347,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2383,7 +2361,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2397,7 +2375,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2411,7 +2389,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2425,7 +2403,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2439,7 +2417,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2453,7 +2431,7 @@ 0, 0, 2, - 5.267, + 5.27, 0, 0, 5.3, @@ -2467,7 +2445,7 @@ 0, 0, 2, - 5.267, + 5.27, 0, 0, 5.3, @@ -2481,7 +2459,7 @@ 0, 1, 2, - 5.267, + 5.27, 1, 0, 5.3, @@ -2495,7 +2473,7 @@ 0, 0, 2, - 5.267, + 5.27, 0, 0, 5.3, diff --git a/Samples/Resources/Haru/motions/haru_g_m05.motion3.json b/Samples/Resources/Haru/motions/haru_g_m05.motion3.json index 9444b58..fffb9fc 100644 --- a/Samples/Resources/Haru/motions/haru_g_m05.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m05.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 2.033, + "Duration": 2.03, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 181, - "TotalPointCount": 438, + "CurveCount": 63, + "TotalSegmentCount": 179, + "TotalPointCount": 434, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 0.667, + 0.67, 1, - 1.333, + 1.33, 1, 2, 1, 0, - 2.033, + 2.03, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 2.033, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 2.033, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1189,7 +1167,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1203,7 +1181,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1217,7 +1195,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1231,7 +1209,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1245,7 +1223,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1259,7 +1237,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1273,7 +1251,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1287,7 +1265,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1301,7 +1279,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1315,7 +1293,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1329,7 +1307,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1343,7 +1321,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1357,7 +1335,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1371,7 +1349,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1385,7 +1363,7 @@ 2, 0, 0, - 2.033, + 2.03, 0 ] }, @@ -1399,7 +1377,7 @@ 2, 0, 0, - 2.033, + 2.03, 0 ] }, @@ -1413,7 +1391,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1427,7 +1405,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1441,7 +1419,7 @@ 2, 1, 0, - 2.033, + 2.03, 1 ] }, @@ -1455,7 +1433,7 @@ 2, 0, 0, - 2.033, + 2.03, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m06.motion3.json b/Samples/Resources/Haru/motions/haru_g_m06.motion3.json index 3451bd8..b03be90 100644 --- a/Samples/Resources/Haru/motions/haru_g_m06.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m06.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 4.533, + "Duration": 4.53, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 195, - "TotalPointCount": 480, + "CurveCount": 63, + "TotalSegmentCount": 193, + "TotalPointCount": 476, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,32 +26,10 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4.533, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4.533, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1287,7 +1265,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1301,7 +1279,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1315,7 +1293,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1329,7 +1307,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1343,7 +1321,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1357,7 +1335,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1371,7 +1349,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1385,7 +1363,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1399,7 +1377,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1413,7 +1391,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1427,7 +1405,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1441,7 +1419,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1455,7 +1433,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1469,7 +1447,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1483,7 +1461,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1497,7 +1475,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1511,7 +1489,7 @@ 4.5, 0, 0, - 4.533, + 4.53, 0 ] }, @@ -1525,7 +1503,7 @@ 4.5, 0, 0, - 4.533, + 4.53, 0 ] }, @@ -1539,7 +1517,7 @@ 4.5, 1, 0, - 4.533, + 4.53, 1 ] }, @@ -1553,7 +1531,7 @@ 4.5, 0, 0, - 4.533, + 4.53, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m07.motion3.json b/Samples/Resources/Haru/motions/haru_g_m07.motion3.json index b8387a4..a7d6d86 100644 --- a/Samples/Resources/Haru/motions/haru_g_m07.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m07.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 3.933, + "Duration": 3.93, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 189, - "TotalPointCount": 462, + "CurveCount": 63, + "TotalSegmentCount": 187, + "TotalPointCount": 458, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,32 +26,10 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 3.933, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 3.933, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1245,7 +1223,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1259,7 +1237,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1273,7 +1251,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1287,7 +1265,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1301,7 +1279,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1315,7 +1293,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1329,7 +1307,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1343,7 +1321,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1357,7 +1335,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1371,7 +1349,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1385,7 +1363,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1399,7 +1377,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1413,7 +1391,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1427,7 +1405,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1441,7 +1419,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1455,7 +1433,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1469,7 +1447,7 @@ 3.9, 0, 0, - 3.933, + 3.93, 0 ] }, @@ -1483,7 +1461,7 @@ 3.9, 0, 0, - 3.933, + 3.93, 0 ] }, @@ -1497,7 +1475,7 @@ 3.9, 1, 0, - 3.933, + 3.93, 1 ] }, @@ -1511,7 +1489,7 @@ 3.9, 0, 0, - 3.933, + 3.93, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m08.motion3.json b/Samples/Resources/Haru/motions/haru_g_m08.motion3.json index 8444839..d24f5ee 100644 --- a/Samples/Resources/Haru/motions/haru_g_m08.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m08.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 201, - "TotalPointCount": 498, + "CurveCount": 63, + "TotalSegmentCount": 199, + "TotalPointCount": 494, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.522, + 1.52, 1, - 3.044, + 3.04, 1, - 4.567, + 4.57, 1, 0, 4.6, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4.6, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4.6, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1326,7 +1304,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1340,7 +1318,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1354,7 +1332,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1368,7 +1346,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1382,7 +1360,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1396,7 +1374,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1410,7 +1388,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1424,7 +1402,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1438,7 +1416,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1452,7 +1430,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1466,7 +1444,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1480,7 +1458,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1494,7 +1472,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1508,7 +1486,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1522,7 +1500,7 @@ 0, 0, 2, - 4.567, + 4.57, 0, 0, 4.6, @@ -1536,7 +1514,7 @@ 0, 0, 2, - 4.567, + 4.57, 0, 0, 4.6, @@ -1550,7 +1528,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1564,7 +1542,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1578,7 +1556,7 @@ 0, 1, 2, - 4.567, + 4.57, 1, 0, 4.6, @@ -1592,7 +1570,7 @@ 0, 0, 2, - 4.567, + 4.57, 0, 0, 4.6, diff --git a/Samples/Resources/Haru/motions/haru_g_m09.motion3.json b/Samples/Resources/Haru/motions/haru_g_m09.motion3.json index 5b55ffd..55583e3 100644 --- a/Samples/Resources/Haru/motions/haru_g_m09.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m09.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 4.033, + "Duration": 4.03, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 371, - "TotalPointCount": 968, + "CurveCount": 63, + "TotalSegmentCount": 369, + "TotalPointCount": 964, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,46 +19,24 @@ 0, 1, 1, - 0.956, + 0.96, 1, - 1.911, + 1.91, 1, - 2.867, + 2.87, 1, 1, - 3.244, + 3.24, 1, - 3.622, + 3.62, 1, 4, 1, 0, - 4.033, + 4.03, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4.033, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4.033, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -2376,13 +2354,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2393,13 +2371,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2410,13 +2388,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2427,13 +2405,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2444,13 +2422,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2461,13 +2439,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2478,13 +2456,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2495,13 +2473,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2512,13 +2490,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2529,13 +2507,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2546,13 +2524,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2563,13 +2541,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2580,13 +2558,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2597,13 +2575,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2614,13 +2592,13 @@ 0, 0, 2, - 2.867, + 2.87, 0, 2, 4, 0, 0, - 4.033, + 4.03, 0 ] }, @@ -2631,13 +2609,13 @@ 0, 0, 2, - 2.867, + 2.87, 0, 2, 4, 0, 0, - 4.033, + 4.03, 0 ] }, @@ -2648,13 +2626,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2665,13 +2643,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2682,13 +2660,13 @@ 0, 1, 2, - 2.867, + 2.87, 1, 2, 4, 1, 0, - 4.033, + 4.03, 1 ] }, @@ -2699,13 +2677,13 @@ 0, 0, 2, - 2.867, + 2.87, 0, 2, 4, 0, 0, - 4.033, + 4.03, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m10.motion3.json b/Samples/Resources/Haru/motions/haru_g_m10.motion3.json index e0158c1..e8d4acf 100644 --- a/Samples/Resources/Haru/motions/haru_g_m10.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m10.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 5.533, + "Duration": 5.53, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 516, - "TotalPointCount": 1403, + "CurveCount": 63, + "TotalSegmentCount": 514, + "TotalPointCount": 1399, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,9 +19,9 @@ 0, 1, 1, - 1.133, + 1.13, 1, - 2.267, + 2.27, 1, 3.4, 1, @@ -33,32 +33,10 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 5.533, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 5.533, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -3397,7 +3375,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3414,7 +3392,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3431,7 +3409,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3448,7 +3426,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3465,7 +3443,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3482,7 +3460,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3499,7 +3477,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3516,7 +3494,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3533,7 +3511,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3550,7 +3528,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3567,7 +3545,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3584,7 +3562,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3601,7 +3579,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3618,7 +3596,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3635,7 +3613,7 @@ 5.5, 0, 0, - 5.533, + 5.53, 0 ] }, @@ -3652,7 +3630,7 @@ 5.5, 0, 0, - 5.533, + 5.53, 0 ] }, @@ -3669,7 +3647,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3686,7 +3664,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3703,7 +3681,7 @@ 5.5, 1, 0, - 5.533, + 5.53, 1 ] }, @@ -3720,7 +3698,7 @@ 5.5, 0, 0, - 5.533, + 5.53, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m11.motion3.json b/Samples/Resources/Haru/motions/haru_g_m11.motion3.json index 568aa6c..e18f08a 100644 --- a/Samples/Resources/Haru/motions/haru_g_m11.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m11.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 3.433, + "Duration": 3.43, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 183, - "TotalPointCount": 444, + "CurveCount": 63, + "TotalSegmentCount": 181, + "TotalPointCount": 440, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.133, + 1.13, 1, - 2.267, + 2.27, 1, 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 3.433, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 3.433, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1203,7 +1181,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1217,7 +1195,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1231,7 +1209,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1245,7 +1223,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1259,7 +1237,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1273,7 +1251,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1287,7 +1265,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1301,7 +1279,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1315,7 +1293,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1329,7 +1307,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1343,7 +1321,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1357,7 +1335,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1371,7 +1349,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1385,7 +1363,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1399,7 +1377,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1413,7 +1391,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1427,7 +1405,7 @@ 3.4, 0, 0, - 3.433, + 3.43, 0 ] }, @@ -1441,7 +1419,7 @@ 3.4, 0, 0, - 3.433, + 3.43, 0 ] }, @@ -1455,7 +1433,7 @@ 3.4, 1, 0, - 3.433, + 3.43, 1 ] }, @@ -1469,7 +1447,7 @@ 3.4, 0, 0, - 3.433, + 3.43, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m12.motion3.json b/Samples/Resources/Haru/motions/haru_g_m12.motion3.json index babaaa7..7df2740 100644 --- a/Samples/Resources/Haru/motions/haru_g_m12.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m12.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 4.933, + "Duration": 4.93, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 330, - "TotalPointCount": 819, + "CurveCount": 63, + "TotalSegmentCount": 328, + "TotalPointCount": 815, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.633, + 1.63, 1, - 3.267, + 3.27, 1, 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4.933, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4.933, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1949,7 +1927,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -1958,7 +1936,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -1969,7 +1947,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -1978,7 +1956,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -1989,7 +1967,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -1998,7 +1976,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2009,7 +1987,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2018,7 +1996,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2029,7 +2007,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2038,7 +2016,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2049,7 +2027,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2058,7 +2036,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2069,7 +2047,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2078,7 +2056,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2089,7 +2067,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2098,7 +2076,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2109,7 +2087,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2118,7 +2096,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2129,7 +2107,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2138,7 +2116,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2149,7 +2127,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2158,7 +2136,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2169,7 +2147,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2178,7 +2156,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2189,7 +2167,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2198,7 +2176,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2209,7 +2187,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2218,7 +2196,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2229,21 +2207,21 @@ 0, 1, 2, - 2.633, + 2.63, 1, 1, - 2.722, + 2.72, 1, - 2.811, - 0.002, + 2.81, + 0, 2.9, - 0.002, + 0, 2, 4.9, - 0.002, 0, - 4.933, - 0.002 + 0, + 4.93, + 0 ] }, { @@ -2253,25 +2231,25 @@ 0, 1, 1, - 0.878, + 0.88, 1, - 1.756, + 1.76, 1, - 2.633, - 0.999, + 2.63, 1, - 2.722, - 0.999, - 2.811, - 0.001, + 1, + 2.72, + 1, + 2.81, + 0, 2.9, - 0.001, + 0, 2, 4.9, - 0.001, 0, - 4.933, - 0.001 + 0, + 4.93, + 0 ] }, { @@ -2281,16 +2259,16 @@ 0, 0, 1, - 0.878, + 0.88, 0, - 1.756, + 1.76, 0, - 2.633, + 2.63, 0, 1, - 2.722, + 2.72, 0, - 2.811, + 2.81, 1, 2.9, 1, @@ -2298,7 +2276,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2309,16 +2287,16 @@ 0, 0, 1, - 0.878, + 0.88, 0, - 1.756, + 1.76, 0, - 2.633, + 2.63, 0, 1, - 2.722, + 2.72, 0, - 2.811, + 2.81, 1, 2.9, 1, @@ -2326,7 +2304,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2337,7 +2315,7 @@ 0, 1, 2, - 2.633, + 2.63, 1, 2, 2.9, @@ -2346,7 +2324,7 @@ 4.9, 1, 0, - 4.933, + 4.93, 1 ] }, @@ -2357,7 +2335,7 @@ 0, 0, 2, - 2.633, + 2.63, 0, 2, 2.9, @@ -2366,7 +2344,7 @@ 4.9, 0, 0, - 4.933, + 4.93, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m13.motion3.json b/Samples/Resources/Haru/motions/haru_g_m13.motion3.json index 66bb158..045dfe2 100644 --- a/Samples/Resources/Haru/motions/haru_g_m13.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m13.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 2.533, + "Duration": 2.53, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 137, - "TotalPointCount": 306, + "CurveCount": 63, + "TotalSegmentCount": 135, + "TotalPointCount": 302, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 0.833, + 0.83, 1, - 1.667, + 1.67, 1, 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 2.533, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 2.533, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -881,7 +859,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -895,7 +873,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -909,7 +887,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -923,7 +901,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -937,7 +915,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -951,7 +929,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -965,7 +943,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -979,7 +957,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -993,7 +971,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1007,7 +985,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1021,7 +999,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1035,7 +1013,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1049,7 +1027,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1063,7 +1041,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1077,7 +1055,7 @@ 2.5, 0, 0, - 2.533, + 2.53, 0 ] }, @@ -1091,7 +1069,7 @@ 2.5, 0, 0, - 2.533, + 2.53, 0 ] }, @@ -1105,7 +1083,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1119,7 +1097,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1133,7 +1111,7 @@ 2.5, 1, 0, - 2.533, + 2.53, 1 ] }, @@ -1147,7 +1125,7 @@ 2.5, 0, 0, - 2.533, + 2.53, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m14.motion3.json b/Samples/Resources/Haru/motions/haru_g_m14.motion3.json index 024d41a..a0c55c0 100644 --- a/Samples/Resources/Haru/motions/haru_g_m14.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m14.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 3.033, + "Duration": 3.03, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 286, - "TotalPointCount": 753, + "CurveCount": 63, + "TotalSegmentCount": 284, + "TotalPointCount": 749, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,32 +26,10 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 3.033, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 3.033, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -188,7 +166,7 @@ 1, 1.778, 19.291, - 1.978, + 1.956, 18, 2.133, 18, @@ -1924,7 +1902,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -1938,7 +1916,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -1952,7 +1930,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -1966,7 +1944,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -1980,7 +1958,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -1994,7 +1972,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2008,7 +1986,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2022,7 +2000,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2036,7 +2014,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2050,7 +2028,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2064,7 +2042,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2078,7 +2056,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2092,7 +2070,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2106,7 +2084,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2120,7 +2098,7 @@ 3, 0, 0, - 3.033, + 3.03, 0 ] }, @@ -2134,7 +2112,7 @@ 3, 0, 0, - 3.033, + 3.03, 0 ] }, @@ -2148,7 +2126,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2162,7 +2140,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2176,7 +2154,7 @@ 3, 1, 0, - 3.033, + 3.03, 1 ] }, @@ -2190,7 +2168,7 @@ 3, 0, 0, - 3.033, + 3.03, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m15.motion3.json b/Samples/Resources/Haru/motions/haru_g_m15.motion3.json index e67b4c7..c774ddf 100644 --- a/Samples/Resources/Haru/motions/haru_g_m15.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m15.motion3.json @@ -1,17 +1,15 @@ { "Version": 3, "Meta": { - "Duration": 5.333, + "Duration": 5.33, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 169, - "TotalPointCount": 402, + "CurveCount": 63, + "TotalSegmentCount": 167, + "TotalPointCount": 398, "UserDataCount": 0, - "TotalUserDataSize": 0, - "FadeInTime": 0, - "FadeOutTime": 0 + "TotalUserDataSize": 0 }, "Curves": [ { @@ -21,39 +19,17 @@ 0, 1, 1, - 1.767, + 1.77, 1, - 3.533, + 3.53, 1, 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 5.333, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 5.333, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1107,7 +1083,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1121,7 +1097,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1135,7 +1111,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1149,7 +1125,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1163,7 +1139,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1177,7 +1153,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1191,7 +1167,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1205,7 +1181,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1219,7 +1195,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1233,7 +1209,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1247,7 +1223,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1261,7 +1237,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1275,7 +1251,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1289,7 +1265,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1303,7 +1279,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1317,7 +1293,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1331,7 +1307,7 @@ 5.3, 0, 0, - 5.333, + 5.33, 0 ] }, @@ -1345,7 +1321,7 @@ 5.3, 0, 0, - 5.333, + 5.33, 0 ] }, @@ -1359,7 +1335,7 @@ 5.3, 1, 0, - 5.333, + 5.33, 1 ] }, @@ -1373,7 +1349,7 @@ 5.3, 0, 0, - 5.333, + 5.33, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m16.motion3.json b/Samples/Resources/Haru/motions/haru_g_m16.motion3.json index 1f4d9d9..aa0e834 100644 --- a/Samples/Resources/Haru/motions/haru_g_m16.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m16.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 249, - "TotalPointCount": 642, + "CurveCount": 63, + "TotalSegmentCount": 247, + "TotalPointCount": 638, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.322, + 1.32, 1, - 2.644, + 2.64, 1, - 3.967, + 3.97, 1, 0, 4, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1458,7 +1436,7 @@ 1, 1.356, 1, - 1.467, + 1.478, 0.4, 1.6, 0.4, @@ -1536,7 +1514,7 @@ 1, 1.356, -1, - 1.467, + 1.478, -0.4, 1.6, -0.4, @@ -1662,7 +1640,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1676,7 +1654,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1690,7 +1668,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1704,7 +1682,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1718,7 +1696,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1732,7 +1710,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1746,7 +1724,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1760,7 +1738,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1774,7 +1752,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1788,7 +1766,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1802,7 +1780,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1816,7 +1794,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1830,7 +1808,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1844,7 +1822,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1858,7 +1836,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1872,7 +1850,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1886,7 +1864,7 @@ 0, 0, 2, - 3.967, + 3.97, 0, 0, 4, @@ -1900,7 +1878,7 @@ 0, 0, 2, - 3.967, + 3.97, 0, 0, 4, @@ -1914,7 +1892,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1928,7 +1906,7 @@ 0, 0, 2, - 3.967, + 3.97, 0, 0, 4, diff --git a/Samples/Resources/Haru/motions/haru_g_m17.motion3.json b/Samples/Resources/Haru/motions/haru_g_m17.motion3.json index 790ed15..3057b7a 100644 --- a/Samples/Resources/Haru/motions/haru_g_m17.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m17.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 209, - "TotalPointCount": 522, + "CurveCount": 63, + "TotalSegmentCount": 207, + "TotalPointCount": 518, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.489, + 1.49, 1, - 2.978, + 2.98, 1, - 4.467, + 4.47, 1, 0, 4.5, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4.5, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4.5, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1382,7 +1360,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1396,7 +1374,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1410,7 +1388,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1424,7 +1402,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1438,7 +1416,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1452,7 +1430,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1466,7 +1444,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1480,7 +1458,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1494,7 +1472,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1508,7 +1486,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1522,7 +1500,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1536,7 +1514,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1550,7 +1528,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1564,7 +1542,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1578,7 +1556,7 @@ 0, 0, 2, - 4.467, + 4.47, 0, 0, 4.5, @@ -1592,7 +1570,7 @@ 0, 0, 2, - 4.467, + 4.47, 0, 0, 4.5, @@ -1606,7 +1584,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1620,7 +1598,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1634,7 +1612,7 @@ 0, 1, 2, - 4.467, + 4.47, 1, 0, 4.5, @@ -1648,7 +1626,7 @@ 0, 0, 2, - 4.467, + 4.47, 0, 0, 4.5, diff --git a/Samples/Resources/Haru/motions/haru_g_m18.motion3.json b/Samples/Resources/Haru/motions/haru_g_m18.motion3.json index 05f0b57..192a3a1 100644 --- a/Samples/Resources/Haru/motions/haru_g_m18.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m18.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 167, - "TotalPointCount": 396, + "CurveCount": 63, + "TotalSegmentCount": 165, + "TotalPointCount": 392, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.056, + 1.06, 1, - 2.111, + 2.11, 1, - 3.167, + 3.17, 1, 0, 3.2, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 3.2, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 3.2, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1088,7 +1066,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1102,7 +1080,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1116,7 +1094,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1130,7 +1108,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1144,7 +1122,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1158,7 +1136,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1172,7 +1150,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1186,7 +1164,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1200,7 +1178,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1214,7 +1192,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1228,7 +1206,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1242,7 +1220,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1256,7 +1234,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1270,7 +1248,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1284,7 +1262,7 @@ 0, 0, 2, - 3.167, + 3.17, 0, 0, 3.2, @@ -1298,7 +1276,7 @@ 0, 0, 2, - 3.167, + 3.17, 0, 0, 3.2, @@ -1312,7 +1290,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1326,7 +1304,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1340,7 +1318,7 @@ 0, 1, 2, - 3.167, + 3.17, 1, 0, 3.2, @@ -1354,7 +1332,7 @@ 0, 0, 2, - 3.167, + 3.17, 0, 0, 3.2, diff --git a/Samples/Resources/Haru/motions/haru_g_m19.motion3.json b/Samples/Resources/Haru/motions/haru_g_m19.motion3.json index 797371f..674bc3f 100644 --- a/Samples/Resources/Haru/motions/haru_g_m19.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m19.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 133, - "TotalPointCount": 294, + "CurveCount": 63, + "TotalSegmentCount": 131, + "TotalPointCount": 290, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 2.656, + 2.66, 1, - 5.311, + 5.31, 1, - 7.967, + 7.97, 1, 0, 8, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 8, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 8, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -850,7 +828,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -864,7 +842,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -878,7 +856,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -892,7 +870,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -906,7 +884,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -920,7 +898,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -934,7 +912,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -948,7 +926,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -962,7 +940,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -976,7 +954,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -990,7 +968,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -1004,7 +982,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -1018,7 +996,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -1032,7 +1010,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -1046,7 +1024,7 @@ 0, 0, 2, - 7.967, + 7.97, 0, 0, 8, @@ -1060,7 +1038,7 @@ 0, 0, 2, - 7.967, + 7.97, 0, 0, 8, @@ -1074,7 +1052,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -1088,7 +1066,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -1102,7 +1080,7 @@ 0, 1, 2, - 7.967, + 7.97, 1, 0, 8, @@ -1116,7 +1094,7 @@ 0, 0, 2, - 7.967, + 7.97, 0, 0, 8, diff --git a/Samples/Resources/Haru/motions/haru_g_m20.motion3.json b/Samples/Resources/Haru/motions/haru_g_m20.motion3.json index e134adb..6820adc 100644 --- a/Samples/Resources/Haru/motions/haru_g_m20.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m20.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 6.033, + "Duration": 6.03, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 329, - "TotalPointCount": 882, + "CurveCount": 63, + "TotalSegmentCount": 327, + "TotalPointCount": 878, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,32 +26,10 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 6.033, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 6.033, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -2225,7 +2203,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2239,7 +2217,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2253,7 +2231,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2267,7 +2245,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2281,7 +2259,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2295,7 +2273,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2309,7 +2287,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2323,7 +2301,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2337,7 +2315,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2351,7 +2329,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2365,7 +2343,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2379,7 +2357,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2393,7 +2371,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2407,7 +2385,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2421,7 +2399,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2435,7 +2413,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2449,7 +2427,7 @@ 6, 0, 0, - 6.033, + 6.03, 0 ] }, @@ -2463,7 +2441,7 @@ 6, 0, 0, - 6.033, + 6.03, 0 ] }, @@ -2477,7 +2455,7 @@ 6, 1, 0, - 6.033, + 6.03, 1 ] }, @@ -2491,7 +2469,7 @@ 6, 0, 0, - 6.033, + 6.03, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m21.motion3.json b/Samples/Resources/Haru/motions/haru_g_m21.motion3.json index 6501fb3..3d43542 100644 --- a/Samples/Resources/Haru/motions/haru_g_m21.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m21.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 354, - "TotalPointCount": 915, + "CurveCount": 63, + "TotalSegmentCount": 352, + "TotalPointCount": 911, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,46 +19,24 @@ 0, 1, 1, - 0.889, + 0.89, 1, - 1.778, + 1.78, 1, - 2.667, + 2.67, 1, 1, - 3.433, + 3.43, 1, 4.2, 1, - 4.967, + 4.97, 1, 0, 5, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 5, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 5, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -2253,10 +2231,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2270,10 +2248,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2287,10 +2265,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2304,10 +2282,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2321,10 +2299,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2338,10 +2316,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2355,10 +2333,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2372,10 +2350,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2389,10 +2367,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2406,10 +2384,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2423,10 +2401,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2440,10 +2418,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2457,10 +2435,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2474,10 +2452,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2491,10 +2469,10 @@ 0, 0, 2, - 2.667, + 2.67, 0, 2, - 4.967, + 4.97, 0, 0, 5, @@ -2508,10 +2486,10 @@ 0, 0, 2, - 2.667, + 2.67, 0, 2, - 4.967, + 4.97, 0, 0, 5, @@ -2525,10 +2503,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2542,10 +2520,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2559,10 +2537,10 @@ 0, 1, 2, - 2.667, + 2.67, 1, 2, - 4.967, + 4.97, 1, 0, 5, @@ -2576,10 +2554,10 @@ 0, 0, 2, - 2.667, + 2.67, 0, 2, - 4.967, + 4.97, 0, 0, 5, diff --git a/Samples/Resources/Haru/motions/haru_g_m22.motion3.json b/Samples/Resources/Haru/motions/haru_g_m22.motion3.json index cf25304..196ad33 100644 --- a/Samples/Resources/Haru/motions/haru_g_m22.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m22.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 5.033, + "Duration": 5.03, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 410, - "TotalPointCount": 1085, + "CurveCount": 63, + "TotalSegmentCount": 408, + "TotalPointCount": 1081, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,46 +19,24 @@ 0, 1, 1, - 1.411, + 1.41, 1, - 2.822, + 2.82, 1, - 4.233, + 4.23, 1, 1, - 4.489, + 4.49, 1, - 4.744, + 4.74, 1, 5, 1, 0, - 5.033, + 5.03, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 5.033, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 5.033, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -2649,13 +2627,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2666,13 +2644,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2683,13 +2661,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2700,13 +2678,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2717,13 +2695,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2734,13 +2712,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2751,13 +2729,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2768,13 +2746,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2785,13 +2763,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2802,13 +2780,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2819,13 +2797,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2836,13 +2814,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2853,13 +2831,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2870,13 +2848,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2887,13 +2865,13 @@ 0, 0, 2, - 4.233, + 4.23, 0, 2, 5, 0, 0, - 5.033, + 5.03, 0 ] }, @@ -2904,13 +2882,13 @@ 0, 0, 2, - 4.233, + 4.23, 0, 2, 5, 0, 0, - 5.033, + 5.03, 0 ] }, @@ -2921,13 +2899,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2938,13 +2916,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2955,13 +2933,13 @@ 0, 1, 2, - 4.233, + 4.23, 1, 2, 5, 1, 0, - 5.033, + 5.03, 1 ] }, @@ -2972,13 +2950,13 @@ 0, 0, 2, - 4.233, + 4.23, 0, 2, 5, 0, 0, - 5.033, + 5.03, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m23.motion3.json b/Samples/Resources/Haru/motions/haru_g_m23.motion3.json index 3c14c91..a2e5001 100644 --- a/Samples/Resources/Haru/motions/haru_g_m23.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m23.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 221, - "TotalPointCount": 558, + "CurveCount": 63, + "TotalSegmentCount": 219, + "TotalPointCount": 554, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.322, + 1.32, 1, - 2.644, + 2.64, 1, - 3.967, + 3.97, 1, 0, 4, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1466,7 +1444,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1480,7 +1458,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1494,7 +1472,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1508,7 +1486,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1522,7 +1500,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1536,7 +1514,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1550,7 +1528,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1564,7 +1542,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1578,7 +1556,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1592,7 +1570,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1606,7 +1584,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1620,7 +1598,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1634,7 +1612,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1648,7 +1626,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1662,7 +1640,7 @@ 0, 0, 2, - 3.967, + 3.97, 0, 0, 4, @@ -1676,7 +1654,7 @@ 0, 0, 2, - 3.967, + 3.97, 0, 0, 4, @@ -1690,7 +1668,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1704,7 +1682,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1718,7 +1696,7 @@ 0, 1, 2, - 3.967, + 3.97, 1, 0, 4, @@ -1732,7 +1710,7 @@ 0, 0, 2, - 3.967, + 3.97, 0, 0, 4, diff --git a/Samples/Resources/Haru/motions/haru_g_m24.motion3.json b/Samples/Resources/Haru/motions/haru_g_m24.motion3.json index ace909e..0be005d 100644 --- a/Samples/Resources/Haru/motions/haru_g_m24.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m24.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 240, - "TotalPointCount": 615, + "CurveCount": 63, + "TotalSegmentCount": 238, + "TotalPointCount": 611, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.122, + 1.12, 1, - 2.244, + 2.24, 1, - 3.367, + 3.37, 1, 0, 3.4, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 3.4, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 3.4, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -1599,7 +1577,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1613,7 +1591,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1627,7 +1605,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1641,7 +1619,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1655,7 +1633,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1669,7 +1647,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1683,7 +1661,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1697,7 +1675,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1711,7 +1689,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1725,7 +1703,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1739,7 +1717,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1753,7 +1731,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1767,7 +1745,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1781,7 +1759,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1795,7 +1773,7 @@ 0, 0, 2, - 3.367, + 3.37, 0, 0, 3.4, @@ -1809,7 +1787,7 @@ 0, 0, 2, - 3.367, + 3.37, 0, 0, 3.4, @@ -1823,7 +1801,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1837,7 +1815,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1851,7 +1829,7 @@ 0, 1, 2, - 3.367, + 3.37, 1, 0, 3.4, @@ -1865,7 +1843,7 @@ 0, 0, 2, - 3.367, + 3.37, 0, 0, 3.4, diff --git a/Samples/Resources/Haru/motions/haru_g_m25.motion3.json b/Samples/Resources/Haru/motions/haru_g_m25.motion3.json index 49dc63e..5745701 100644 --- a/Samples/Resources/Haru/motions/haru_g_m25.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m25.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 10.467, + "Duration": 4.03, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 233, - "TotalPointCount": 594, + "CurveCount": 63, + "TotalSegmentCount": 231, + "TotalPointCount": 590, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.333, + 1.33, 1, - 2.667, + 2.67, 1, 4, 1, 0, - 10.467, + 4.03, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 10.467, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 10.467, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -66,7 +44,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -126,7 +104,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -172,7 +150,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -190,7 +168,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -208,7 +186,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -289,7 +267,7 @@ 4, 1, 0, - 10.467, + 4.033, 1 ] }, @@ -307,7 +285,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -388,7 +366,7 @@ 4, 1, 0, - 10.467, + 4.033, 1 ] }, @@ -406,7 +384,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -424,7 +402,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -463,7 +441,7 @@ 4, -0.49, 0, - 10.467, + 4.033, -0.49 ] }, @@ -481,7 +459,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -527,7 +505,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -608,7 +586,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -675,7 +653,7 @@ 4, 0.3, 0, - 10.467, + 4.033, 0.3 ] }, @@ -742,7 +720,7 @@ 4, 0.3, 0, - 10.467, + 4.033, 0.3 ] }, @@ -788,7 +766,7 @@ 4, 0.2, 0, - 10.467, + 4.033, 0.2 ] }, @@ -834,7 +812,7 @@ 4, 0.2, 0, - 10.467, + 4.033, 0.2 ] }, @@ -880,7 +858,7 @@ 4, 0.5, 0, - 10.467, + 4.033, 0.5 ] }, @@ -926,7 +904,7 @@ 4, 0.5, 0, - 10.467, + 4.033, 0.5 ] }, @@ -972,7 +950,7 @@ 4, 0.3, 0, - 10.467, + 4.033, 0.3 ] }, @@ -1018,7 +996,7 @@ 4, 0.3, 0, - 10.467, + 4.033, 0.3 ] }, @@ -1071,7 +1049,7 @@ 4, 1, 0, - 10.467, + 4.033, 1 ] }, @@ -1089,7 +1067,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1107,7 +1085,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1146,7 +1124,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1185,7 +1163,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1224,7 +1202,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1249,7 +1227,7 @@ 4, 6, 0, - 10.467, + 4.033, 6 ] }, @@ -1267,7 +1245,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1285,7 +1263,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1331,7 +1309,7 @@ 4, -1, 0, - 10.467, + 4.033, -1 ] }, @@ -1377,7 +1355,7 @@ 4, -1, 0, - 10.467, + 4.033, -1 ] }, @@ -1395,7 +1373,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1413,7 +1391,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1431,7 +1409,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1449,7 +1427,7 @@ 4, 1, 0, - 10.467, + 4.033, 1 ] }, @@ -1467,7 +1445,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1485,7 +1463,7 @@ 4, -1, 0, - 10.467, + 4.033, -1 ] }, @@ -1503,7 +1481,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1521,7 +1499,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1539,7 +1517,7 @@ 4, 0, 0, - 10.467, + 4.033, 0 ] }, @@ -1553,7 +1531,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1567,7 +1545,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1581,7 +1559,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1595,7 +1573,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1609,7 +1587,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1623,7 +1601,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1637,7 +1615,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1651,7 +1629,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1665,7 +1643,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1679,7 +1657,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1693,7 +1671,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1707,7 +1685,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1721,7 +1699,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1735,7 +1713,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1749,7 +1727,7 @@ 4, 0, 0, - 10.467, + 4.03, 0 ] }, @@ -1763,7 +1741,7 @@ 4, 0, 0, - 10.467, + 4.03, 0 ] }, @@ -1777,7 +1755,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1791,7 +1769,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1805,7 +1783,7 @@ 4, 1, 0, - 10.467, + 4.03, 1 ] }, @@ -1819,7 +1797,7 @@ 4, 0, 0, - 10.467, + 4.03, 0 ] } diff --git a/Samples/Resources/Haru/motions/haru_g_m26.motion3.json b/Samples/Resources/Haru/motions/haru_g_m26.motion3.json index e0a1c81..0b1b05d 100644 --- a/Samples/Resources/Haru/motions/haru_g_m26.motion3.json +++ b/Samples/Resources/Haru/motions/haru_g_m26.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 4.967, + "Duration": 4.97, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 65, - "TotalSegmentCount": 328, - "TotalPointCount": 879, + "CurveCount": 63, + "TotalSegmentCount": 326, + "TotalPointCount": 875, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,39 +19,17 @@ 0, 1, 1, - 1.644, + 1.64, 1, - 3.289, + 3.29, 1, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, - { - "Target": "Model", - "Id": "EyeBlink", - "Segments": [ - 0, - 1, - 0, - 4.967, - 1 - ] - }, - { - "Target": "Model", - "Id": "LipSync", - "Segments": [ - 0, - 0, - 0, - 4.967, - 0 - ] - }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -2215,10 +2193,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2229,10 +2207,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2243,10 +2221,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2257,10 +2235,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2271,10 +2249,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2285,10 +2263,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2299,10 +2277,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2313,10 +2291,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2327,10 +2305,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2341,10 +2319,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2355,10 +2333,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2369,10 +2347,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2383,10 +2361,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2397,10 +2375,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2411,10 +2389,10 @@ 0, 0, 2, - 4.933, + 4.93, 0, 0, - 4.967, + 4.97, 0 ] }, @@ -2425,10 +2403,10 @@ 0, 0, 2, - 4.933, + 4.93, 0, 0, - 4.967, + 4.97, 0 ] }, @@ -2439,10 +2417,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2453,10 +2431,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2467,10 +2445,10 @@ 0, 1, 2, - 4.933, + 4.93, 1, 0, - 4.967, + 4.97, 1 ] }, @@ -2481,10 +2459,10 @@ 0, 0, 2, - 4.933, + 4.93, 0, 0, - 4.967, + 4.97, 0 ] } diff --git a/Samples/Resources/Hiyori/Hiyori.2048/texture_00.png b/Samples/Resources/Hiyori/Hiyori.2048/texture_00.png index 0769375..8ff89e5 100644 Binary files a/Samples/Resources/Hiyori/Hiyori.2048/texture_00.png and b/Samples/Resources/Hiyori/Hiyori.2048/texture_00.png differ diff --git a/Samples/Resources/Hiyori/Hiyori.2048/texture_01.png b/Samples/Resources/Hiyori/Hiyori.2048/texture_01.png index a705c44..2f50d2f 100644 Binary files a/Samples/Resources/Hiyori/Hiyori.2048/texture_01.png and b/Samples/Resources/Hiyori/Hiyori.2048/texture_01.png differ diff --git a/Samples/Resources/Hiyori/Hiyori.cdi3.json b/Samples/Resources/Hiyori/Hiyori.cdi3.json new file mode 100644 index 0000000..234dff3 --- /dev/null +++ b/Samples/Resources/Hiyori/Hiyori.cdi3.json @@ -0,0 +1,523 @@ +{ + "Version": 3, + "Parameters": [ + { + "Id": "ParamAngleX", + "GroupId": "ParamGroupFace", + "Name": "角度 X" + }, + { + "Id": "ParamAngleY", + "GroupId": "ParamGroupFace", + "Name": "角度 Y" + }, + { + "Id": "ParamAngleZ", + "GroupId": "ParamGroupFace", + "Name": "角度 Z" + }, + { + "Id": "ParamCheek", + "GroupId": "ParamGroupFace", + "Name": "照れ" + }, + { + "Id": "ParamEyeLOpen", + "GroupId": "ParamGroupEyes", + "Name": "左目　開閉" + }, + { + "Id": "ParamEyeLSmile", + "GroupId": "ParamGroupEyes", + "Name": "左目　笑顔" + }, + { + "Id": "ParamEyeROpen", + "GroupId": "ParamGroupEyes", + "Name": "右目　開閉" + }, + { + "Id": "ParamEyeRSmile", + "GroupId": "ParamGroupEyes", + "Name": "右目　笑顔" + }, + { + "Id": "ParamEyeBallX", + "GroupId": "ParamGroupEyeballs", + "Name": "目玉 X" + }, + { + "Id": "ParamEyeBallY", + "GroupId": "ParamGroupEyeballs", + "Name": "目玉 Y" + }, + { + "Id": "ParamBrowLY", + "GroupId": "ParamGroupBrows", + "Name": "左眉　上下" + }, + { + "Id": "ParamBrowRY", + "GroupId": "ParamGroupBrows", + "Name": "右眉　上下" + }, + { + "Id": "ParamBrowLX", + "GroupId": "ParamGroupBrows", + "Name": "左眉　左右" + }, + { + "Id": "ParamBrowRX", + "GroupId": "ParamGroupBrows", + "Name": "右眉　左右" + }, + { + "Id": "ParamBrowLAngle", + "GroupId": "ParamGroupBrows", + "Name": "左眉　角度" + }, + { + "Id": "ParamBrowRAngle", + "GroupId": "ParamGroupBrows", + "Name": "右眉　角度" + }, + { + "Id": "ParamBrowLForm", + "GroupId": "ParamGroupBrows", + "Name": "左眉　変形" + }, + { + "Id": "ParamBrowRForm", + "GroupId": "ParamGroupBrows", + "Name": "右眉　変形" + }, + { + "Id": "ParamMouthForm", + "GroupId": "ParamGroupMouth", + "Name": "口　変形" + }, + { + "Id": "ParamMouthOpenY", + "GroupId": "ParamGroupMouth", + "Name": "口　開閉" + }, + { + "Id": "ParamBodyAngleX", + "GroupId": "ParamGroupBody", + "Name": "体の回転　X" + }, + { + "Id": "ParamBodyAngleY", + "GroupId": "ParamGroupBody", + "Name": "体の回転　Y" + }, + { + "Id": "ParamBodyAngleZ", + "GroupId": "ParamGroupBody", + "Name": "体の回転　Z" + }, + { + "Id": "ParamBreath", + "GroupId": "ParamGroupBody", + "Name": "呼吸" + }, + { + "Id": "ParamShoulder", + "GroupId": "ParamGroupBody", + "Name": "肩　すくみ" + }, + { + "Id": "ParamLeg", + "GroupId": "ParamGroupBody", + "Name": "あし" + }, + { + "Id": "ParamArmLA", + "GroupId": "ParamGroupArms", + "Name": "左腕 A" + }, + { + "Id": "ParamArmRA", + "GroupId": "ParamGroupArms", + "Name": "右腕 A" + }, + { + "Id": "ParamArmLB", + "GroupId": "ParamGroupArms", + "Name": "左腕 B" + }, + { + "Id": "ParamArmRB", + "GroupId": "ParamGroupArms", + "Name": "右腕 B" + }, + { + "Id": "ParamHandLB", + "GroupId": "ParamGroupArms", + "Name": "左手B 回転" + }, + { + "Id": "ParamHandRB", + "GroupId": "ParamGroupArms", + "Name": "右手B 回転" + }, + { + "Id": "ParamHandL", + "GroupId": "ParamGroupArms", + "Name": "左手" + }, + { + "Id": "ParamHandR", + "GroupId": "ParamGroupArms", + "Name": "右手" + }, + { + "Id": "ParamBustY", + "GroupId": "ParamGroupSway", + "Name": "胸　揺れ" + }, + { + "Id": "ParamHairAhoge", + "GroupId": "ParamGroupSway", + "Name": "髪揺れ　アホ毛" + }, + { + "Id": "ParamHairFront", + "GroupId": "ParamGroupSway", + "Name": "髪揺れ　前" + }, + { + "Id": "ParamHairBack", + "GroupId": "ParamGroupSway", + "Name": "髪揺れ　後" + }, + { + "Id": "ParamSideupRibbon", + "GroupId": "ParamGroupSway", + "Name": "髪飾りの揺れ" + }, + { + "Id": "ParamRibbon", + "GroupId": "ParamGroupSway", + "Name": "胸リボンの揺れ" + }, + { + "Id": "ParamSkirt", + "GroupId": "ParamGroupSway", + "Name": "スカートの揺れ" + }, + { + "Id": "ParamSkirt2", + "GroupId": "ParamGroupSway", + "Name": "スカートめくれ" + }, + { + "Id": "Param_Angle_Rotation_1_ArtMesh62", + "GroupId": "ParamGroup2", + "Name": "[0]サイドアップ左" + }, + { + "Id": "Param_Angle_Rotation_2_ArtMesh62", + "GroupId": "ParamGroup2", + "Name": "[1]サイドアップ左" + }, + { + "Id": "Param_Angle_Rotation_3_ArtMesh62", + "GroupId": "ParamGroup2", + "Name": "[2]サイドアップ左" + }, + { + "Id": "Param_Angle_Rotation_4_ArtMesh62", + "GroupId": "ParamGroup2", + "Name": "[3]サイドアップ左" + }, + { + "Id": "Param_Angle_Rotation_5_ArtMesh62", + "GroupId": "ParamGroup2", + "Name": "[4]サイドアップ左" + }, + { + "Id": "Param_Angle_Rotation_6_ArtMesh62", + "GroupId": "ParamGroup2", + "Name": "[5]サイドアップ左" + }, + { + "Id": "Param_Angle_Rotation_7_ArtMesh62", + "GroupId": "ParamGroup2", + "Name": "[6]サイドアップ左" + }, + { + "Id": "Param_Angle_Rotation_1_ArtMesh61", + "GroupId": "ParamGroup", + "Name": "[0]サイドアップ右" + }, + { + "Id": "Param_Angle_Rotation_2_ArtMesh61", + "GroupId": "ParamGroup", + "Name": "[1]サイドアップ右" + }, + { + "Id": "Param_Angle_Rotation_3_ArtMesh61", + "GroupId": "ParamGroup", + "Name": "[2]サイドアップ右" + }, + { + "Id": "Param_Angle_Rotation_4_ArtMesh61", + "GroupId": "ParamGroup", + "Name": "[3]サイドアップ右" + }, + { + "Id": "Param_Angle_Rotation_5_ArtMesh61", + "GroupId": "ParamGroup", + "Name": "[4]サイドアップ右" + }, + { + "Id": "Param_Angle_Rotation_6_ArtMesh61", + "GroupId": "ParamGroup", + "Name": "[5]サイドアップ右" + }, + { + "Id": "Param_Angle_Rotation_7_ArtMesh61", + "GroupId": "ParamGroup", + "Name": "[6]サイドアップ右" + }, + { + "Id": "Param_Angle_Rotation_1_ArtMesh55", + "GroupId": "ParamGroup4", + "Name": "[0]前髪左" + }, + { + "Id": "Param_Angle_Rotation_2_ArtMesh55", + "GroupId": "ParamGroup4", + "Name": "[1]前髪左" + }, + { + "Id": "Param_Angle_Rotation_3_ArtMesh55", + "GroupId": "ParamGroup4", + "Name": "[2]前髪左" + }, + { + "Id": "Param_Angle_Rotation_4_ArtMesh55", + "GroupId": "ParamGroup4", + "Name": "[3]前髪左" + }, + { + "Id": "Param_Angle_Rotation_5_ArtMesh55", + "GroupId": "ParamGroup4", + "Name": "[4]前髪左" + }, + { + "Id": "Param_Angle_Rotation_6_ArtMesh55", + "GroupId": "ParamGroup4", + "Name": "[5]前髪左" + }, + { + "Id": "Param_Angle_Rotation_7_ArtMesh55", + "GroupId": "ParamGroup4", + "Name": "[6]前髪左" + }, + { + "Id": "Param_Angle_Rotation_1_ArtMesh54", + "GroupId": "ParamGroup3", + "Name": "[0]前髪右" + }, + { + "Id": "Param_Angle_Rotation_2_ArtMesh54", + "GroupId": "ParamGroup3", + "Name": "[1]前髪右" + }, + { + "Id": "Param_Angle_Rotation_3_ArtMesh54", + "GroupId": "ParamGroup3", + "Name": "[2]前髪右" + }, + { + "Id": "Param_Angle_Rotation_4_ArtMesh54", + "GroupId": "ParamGroup3", + "Name": "[3]前髪右" + }, + { + "Id": "Param_Angle_Rotation_5_ArtMesh54", + "GroupId": "ParamGroup3", + "Name": "[4]前髪右" + }, + { + "Id": "Param_Angle_Rotation_6_ArtMesh54", + "GroupId": "ParamGroup3", + "Name": "[5]前髪右" + }, + { + "Id": "Param_Angle_Rotation_7_ArtMesh54", + "GroupId": "ParamGroup3", + "Name": "[6]前髪右" + } + ], + "ParameterGroups": [ + { + "Id": "ParamGroupFace", + "GroupId": "", + "Name": "顔" + }, + { + "Id": "ParamGroupEyes", + "GroupId": "", + "Name": "目" + }, + { + "Id": "ParamGroupEyeballs", + "GroupId": "", + "Name": "目玉" + }, + { + "Id": "ParamGroupBrows", + "GroupId": "", + "Name": "眉" + }, + { + "Id": "ParamGroupMouth", + "GroupId": "", + "Name": "口" + }, + { + "Id": "ParamGroupBody", + "GroupId": "", + "Name": "体" + }, + { + "Id": "ParamGroupArms", + "GroupId": "", + "Name": "腕" + }, + { + "Id": "ParamGroupSway", + "GroupId": "", + "Name": "揺れ" + }, + { + "Id": "ParamGroup2", + "GroupId": "", + "Name": "揺れ　サイドアップ左" + }, + { + "Id": "ParamGroup", + "GroupId": "", + "Name": "揺れ　サイドアップ右" + }, + { + "Id": "ParamGroup4", + "GroupId": "", + "Name": "揺れ　前髪左" + }, + { + "Id": "ParamGroup3", + "GroupId": "", + "Name": "揺れ　前髪右" + } + ], + "Parts": [ + { + "Id": "PartCore", + "Name": "コア" + }, + { + "Id": "PartCheek", + "Name": "頬" + }, + { + "Id": "PartBrow", + "Name": "まゆ毛" + }, + { + "Id": "PartEye", + "Name": "目" + }, + { + "Id": "PartNose", + "Name": "鼻" + }, + { + "Id": "PartMouth", + "Name": "口" + }, + { + "Id": "PartFace", + "Name": "顔" + }, + { + "Id": "PartEar", + "Name": "耳" + }, + { + "Id": "PartHairSide", + "Name": "横髪" + }, + { + "Id": "PartHairFront", + "Name": "前髪" + }, + { + "Id": "PartHairBack", + "Name": "後ろ髪" + }, + { + "Id": "PartNeck", + "Name": "首" + }, + { + "Id": "PartArmA", + "Name": "腕 A" + }, + { + "Id": "PartArmB", + "Name": "腕 B" + }, + { + "Id": "PartBody", + "Name": "体" + }, + { + "Id": "PartBackground", + "Name": "背景" + }, + { + "Id": "PartSketch", + "Name": "[ 下絵 ]" + }, + { + "Id": "PartEyeBall", + "Name": "目玉" + }, + { + "Id": "ArtMesh55_Skinning", + "Name": "前髪左(スキニング)" + }, + { + "Id": "Part4", + "Name": "前髪左(回転)" + }, + { + "Id": "ArtMesh54_Skinning", + "Name": "前髪右(スキニング)" + }, + { + "Id": "Part3", + "Name": "前髪右(回転)" + }, + { + "Id": "ArtMesh61_Skinning", + "Name": "サイドアップ右(スキニング)" + }, + { + "Id": "Part", + "Name": "サイドアップ右(回転)" + }, + { + "Id": "ArtMesh62_Skinning", + "Name": "サイドアップ左(スキニング)" + }, + { + "Id": "Part2", + "Name": "サイドアップ左(回転)" + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Hiyori/Hiyori.moc3 b/Samples/Resources/Hiyori/Hiyori.moc3 index 1c0299b..7231288 100644 Binary files a/Samples/Resources/Hiyori/Hiyori.moc3 and b/Samples/Resources/Hiyori/Hiyori.moc3 differ diff --git a/Samples/Resources/Hiyori/Hiyori.model3.json b/Samples/Resources/Hiyori/Hiyori.model3.json index c265f7c..b93e450 100644 --- a/Samples/Resources/Hiyori/Hiyori.model3.json +++ b/Samples/Resources/Hiyori/Hiyori.model3.json @@ -9,6 +9,7 @@ "Physics": "Hiyori.physics3.json", "Pose": "Hiyori.pose3.json", "UserData": "Hiyori.userdata3.json", + "DisplayInfo": "Hiyori.cdi3.json", "Motions": { "Idle": [ { diff --git a/Samples/Resources/Hiyori/Hiyori.physics3.json b/Samples/Resources/Hiyori/Hiyori.physics3.json index a09c78b..d1f2f96 100644 --- a/Samples/Resources/Hiyori/Hiyori.physics3.json +++ b/Samples/Resources/Hiyori/Hiyori.physics3.json @@ -17,54 +17,54 @@ }, "PhysicsDictionary": [ { - "Id": "PhysicsSetting2", + "Id": "PhysicsSetting1", "Name": "前髪" }, { - "Id": "PhysicsSetting4", + "Id": "PhysicsSetting2", "Name": "後ろ髪" }, { - "Id": "PhysicsSetting5", + "Id": "PhysicsSetting3", "Name": "リボン　髪" }, { - "Id": "PhysicsSetting6", + "Id": "PhysicsSetting4", "Name": "スカート　横揺れ" }, { - "Id": "PhysicsSetting8", + "Id": "PhysicsSetting5", "Name": "スカート　縦揺れ" }, { - "Id": "PhysicsSetting9", + "Id": "PhysicsSetting6", "Name": "リボン　体" }, { - "Id": "PhysicsSetting10", + "Id": "PhysicsSetting7", "Name": "胸揺れ" }, { - "Id": "PhysicsSetting9", + "Id": "PhysicsSetting8", "Name": "サイドアップ　右" }, { - "Id": "PhysicsSetting10", + "Id": "PhysicsSetting9", "Name": "サイドアップ　左" }, { - "Id": "PhysicsSetting11", + "Id": "PhysicsSetting10", "Name": "横髪　右" }, { - "Id": "PhysicsSetting12", + "Id": "PhysicsSetting11", "Name": "横髪　左" } ] }, "PhysicsSettings": [ { - "Id": "PhysicsSetting2", + "Id": "PhysicsSetting1", "Input": [ { "Source": { @@ -152,7 +152,7 @@ } }, { - "Id": "PhysicsSetting4", + "Id": "PhysicsSetting2", "Input": [ { "Source": { @@ -240,7 +240,7 @@ } }, { - "Id": "PhysicsSetting5", + "Id": "PhysicsSetting3", "Input": [ { "Source": { @@ -328,7 +328,7 @@ } }, { - "Id": "PhysicsSetting6", + "Id": "PhysicsSetting4", "Input": [ { "Source": { @@ -398,7 +398,7 @@ } }, { - "Id": "PhysicsSetting8", + "Id": "PhysicsSetting5", "Input": [ { "Source": { @@ -459,7 +459,7 @@ } }, { - "Id": "PhysicsSetting9", + "Id": "PhysicsSetting6", "Input": [ { "Source": { @@ -529,7 +529,7 @@ } }, { - "Id": "PhysicsSetting10", + "Id": "PhysicsSetting7", "Input": [ { "Source": { @@ -590,7 +590,7 @@ } }, { - "Id": "PhysicsSetting9", + "Id": "PhysicsSetting8", "Input": [ { "Source": { @@ -834,7 +834,7 @@ } }, { - "Id": "PhysicsSetting10", + "Id": "PhysicsSetting9", "Input": [ { "Source": { @@ -1078,7 +1078,7 @@ } }, { - "Id": "PhysicsSetting11", + "Id": "PhysicsSetting10", "Input": [ { "Source": { @@ -1322,7 +1322,7 @@ } }, { - "Id": "PhysicsSetting12", + "Id": "PhysicsSetting11", "Input": [ { "Source": { diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m01.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m01.motion3.json index 700929a..5adb229 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m01.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m01.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 4.733, + "Duration": 4.7, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -82,7 +82,7 @@ 4.333, 1, 0, - 4.733, + 4.7, 1 ] }, @@ -170,7 +170,7 @@ 3.933, -9, 0, - 4.733, + 4.7, -9 ] }, @@ -237,7 +237,7 @@ 4.4, -11.207, 0, - 4.733, + 4.7, -11.207 ] }, @@ -248,7 +248,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -315,7 +315,7 @@ 3.867, 1, 0, - 4.733, + 4.7, 1 ] }, @@ -326,7 +326,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -393,7 +393,7 @@ 3.867, 1, 0, - 4.733, + 4.7, 1 ] }, @@ -404,7 +404,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -457,7 +457,7 @@ 3.667, 0.803, 0, - 4.733, + 4.7, 0.803 ] }, @@ -510,7 +510,7 @@ 3.667, 0.794, 0, - 4.733, + 4.7, 0.794 ] }, @@ -521,7 +521,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -532,7 +532,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -543,7 +543,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -554,7 +554,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -565,7 +565,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -576,7 +576,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -587,7 +587,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -598,7 +598,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -609,7 +609,7 @@ 0, 1, 0, - 4.733, + 4.7, 1 ] }, @@ -620,7 +620,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -652,7 +652,7 @@ 3.933, -6, 0, - 4.733, + 4.7, -6 ] }, @@ -740,7 +740,7 @@ 4.333, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -779,7 +779,7 @@ 4.467, -3.976, 0, - 4.733, + 4.7, -3.976 ] }, @@ -790,7 +790,7 @@ 0, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -836,7 +836,7 @@ 4.433, -0.9, 0, - 4.733, + 4.7, -0.9 ] }, @@ -847,7 +847,7 @@ 0, 1, 0, - 4.733, + 4.7, 1 ] }, @@ -907,7 +907,7 @@ 3.033, -10, 0, - 4.733, + 4.7, -10 ] }, @@ -967,7 +967,7 @@ 3.033, -10, 0, - 4.733, + 4.7, -10 ] }, @@ -1055,7 +1055,7 @@ 4.467, 0, 0, - 4.733, + 4.7, 0 ] }, @@ -1064,10 +1064,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.999, + 1, 0, - 4.733, - 0.999 + 4.7, + 1 ] }, { @@ -1075,10 +1075,10 @@ "Id": "PartArmB", "Segments": [ 0, - 0.001, 0, - 4.733, - 0.001 + 0, + 4.7, + 0 ] } ] diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m02.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m02.motion3.json index 3b05801..bb652b1 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m02.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m02.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 5.967, + "Duration": 5.93, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -68,7 +68,7 @@ 4.5, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -149,7 +149,7 @@ 4.5, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -216,7 +216,7 @@ 4.733, 17, 0, - 5.967, + 5.933, 17 ] }, @@ -227,7 +227,7 @@ 0, 1, 0, - 5.967, + 5.933, 1 ] }, @@ -329,7 +329,7 @@ 4.7, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -354,7 +354,7 @@ 4.6, 0.771, 0, - 5.967, + 5.933, 0.771 ] }, @@ -456,7 +456,7 @@ 4.7, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -481,7 +481,7 @@ 4.6, 0.76, 0, - 5.967, + 5.933, 0.76 ] }, @@ -534,7 +534,7 @@ 4.5, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -587,7 +587,7 @@ 4.5, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -633,7 +633,7 @@ 4.8, 0.396, 0, - 5.967, + 5.933, 0.396 ] }, @@ -679,7 +679,7 @@ 4.8, 0.417, 0, - 5.967, + 5.933, 0.417 ] }, @@ -690,7 +690,7 @@ 0, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -701,7 +701,7 @@ 0, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -712,7 +712,7 @@ 0, 0.03, 0, - 5.967, + 5.933, 0.03 ] }, @@ -723,7 +723,7 @@ 0, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -734,7 +734,7 @@ 0, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -745,7 +745,7 @@ 0, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -770,7 +770,7 @@ 4.5, 1, 0, - 5.967, + 5.933, 1 ] }, @@ -795,7 +795,7 @@ 4.5, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -869,7 +869,7 @@ 5.567, 0.013, 0, - 5.967, + 5.933, 0.013 ] }, @@ -957,7 +957,7 @@ 5.133, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -1010,7 +1010,7 @@ 4.8, -3, 0, - 5.967, + 5.933, -3 ] }, @@ -1084,7 +1084,7 @@ 5.3, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -1116,7 +1116,7 @@ 3.867, -1, 0, - 5.967, + 5.933, -1 ] }, @@ -1127,7 +1127,7 @@ 0, 1, 0, - 5.967, + 5.933, 1 ] }, @@ -1201,7 +1201,7 @@ 5.433, -3, 0, - 5.967, + 5.933, -3 ] }, @@ -1275,7 +1275,7 @@ 5.5, -0.002, 0, - 5.967, + 5.933, -0.002 ] }, @@ -1314,7 +1314,7 @@ 5.367, 0.208, 0, - 5.967, + 5.933, 0.208 ] }, @@ -1353,7 +1353,7 @@ 5.367, 0.208, 0, - 5.967, + 5.933, 0.208 ] }, @@ -1448,7 +1448,7 @@ 5.667, 0, 0, - 5.967, + 5.933, 0 ] }, @@ -1457,10 +1457,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.997, + 1, 0, - 5.967, - 0.997 + 5.93, + 1 ] }, { @@ -1470,7 +1470,7 @@ 0, 0, 0, - 5.967, + 5.93, 0 ] } diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m03.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m03.motion3.json index 5fcb5ad..83c5c39 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m03.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m03.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 4.233, + "Duration": 4.2, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -61,7 +61,7 @@ 2.267, -2, 0, - 4.233, + 4.2, -2 ] }, @@ -121,7 +121,7 @@ 2.267, -3, 0, - 4.233, + 4.2, -3 ] }, @@ -167,7 +167,7 @@ 2.667, 11, 0, - 4.233, + 4.2, 11 ] }, @@ -185,7 +185,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -273,7 +273,7 @@ 2.733, 1, 0, - 4.233, + 4.2, 1 ] }, @@ -291,7 +291,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -379,7 +379,7 @@ 2.733, 1, 0, - 4.233, + 4.2, 1 ] }, @@ -397,7 +397,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -457,7 +457,7 @@ 2.567, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -517,7 +517,7 @@ 2.567, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -535,7 +535,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -553,7 +553,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -571,7 +571,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -589,7 +589,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -607,7 +607,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -625,7 +625,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -643,7 +643,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -661,7 +661,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -679,7 +679,7 @@ 0.167, 1, 0, - 4.233, + 4.2, 1 ] }, @@ -697,7 +697,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -715,7 +715,7 @@ 0.167, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -803,7 +803,7 @@ 3.967, 6, 0, - 4.233, + 4.2, 6 ] }, @@ -849,7 +849,7 @@ 3.167, 8, 0, - 4.233, + 4.2, 8 ] }, @@ -902,7 +902,7 @@ 3.8, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -913,7 +913,7 @@ 0, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -945,7 +945,7 @@ 3.5, 0.062, 0, - 4.233, + 4.2, 0.062 ] }, @@ -1019,7 +1019,7 @@ 4.067, -3, 0, - 4.233, + 4.2, -3 ] }, @@ -1086,7 +1086,7 @@ 3.9, -0.029, 0, - 4.233, + 4.2, -0.029 ] }, @@ -1153,7 +1153,7 @@ 3.7, 0.8, 0, - 4.233, + 4.2, 0.8 ] }, @@ -1220,7 +1220,7 @@ 3.7, 0.8, 0, - 4.233, + 4.2, 0.8 ] }, @@ -1301,7 +1301,7 @@ 4.033, 0, 0, - 4.233, + 4.2, 0 ] }, @@ -1310,10 +1310,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.999, + 1, 0, - 4.233, - 0.999 + 4.2, + 1 ] }, { @@ -1323,7 +1323,7 @@ 0, 0, 0, - 4.233, + 4.2, 0 ] } diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m04.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m04.motion3.json index f3740e4..aa8aa81 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m04.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m04.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 4.467, + "Duration": 4.43, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -54,7 +54,7 @@ 3.267, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -100,7 +100,7 @@ 3.267, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -153,7 +153,7 @@ 3.8, -12, 0, - 4.467, + 4.433, -12 ] }, @@ -164,7 +164,7 @@ 0, 1, 0, - 4.467, + 4.433, 1 ] }, @@ -231,7 +231,7 @@ 3.133, 1, 0, - 4.467, + 4.433, 1 ] }, @@ -242,7 +242,7 @@ 0, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -309,7 +309,7 @@ 3.133, 1, 0, - 4.467, + 4.433, 1 ] }, @@ -320,7 +320,7 @@ 0, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -359,7 +359,7 @@ 3.267, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -398,7 +398,7 @@ 3.267, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -430,7 +430,7 @@ 2.9, 1, 0, - 4.467, + 4.433, 1 ] }, @@ -462,7 +462,7 @@ 2.9, 1, 0, - 4.467, + 4.433, 1 ] }, @@ -473,7 +473,7 @@ 0, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -484,7 +484,7 @@ 0, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -495,7 +495,7 @@ 0, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -506,7 +506,7 @@ 0, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -517,7 +517,7 @@ 0, -1, 0, - 4.467, + 4.433, -1 ] }, @@ -528,7 +528,7 @@ 0, -1, 0, - 4.467, + 4.433, -1 ] }, @@ -539,7 +539,7 @@ 0, -2, 0, - 4.467, + 4.433, -2 ] }, @@ -550,7 +550,7 @@ 0, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -582,7 +582,7 @@ 2.267, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -600,7 +600,7 @@ 0.733, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -660,7 +660,7 @@ 3.733, -2, 0, - 4.467, + 4.433, -2 ] }, @@ -713,7 +713,7 @@ 3.567, 0, 0, - 4.467, + 4.433, 0 ] }, @@ -745,7 +745,7 @@ 3.433, -1, 0, - 4.467, + 4.433, -1 ] }, @@ -756,7 +756,7 @@ 0, 1, 0, - 4.467, + 4.433, 1 ] }, @@ -767,7 +767,7 @@ 0, -10, 0, - 4.467, + 4.433, -10 ] }, @@ -778,7 +778,7 @@ 0, -10, 0, - 4.467, + 4.433, -10 ] }, @@ -852,7 +852,7 @@ 4.1, -0.032, 0, - 4.467, + 4.433, -0.032 ] }, @@ -861,10 +861,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.997, + 1, 0, - 4.467, - 0.997 + 4.43, + 1 ] }, { @@ -872,10 +872,10 @@ "Id": "PartArmB", "Segments": [ 0, - 0.001, 0, - 4.467, - 0.001 + 0, + 4.43, + 0 ] } ] diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m05.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m05.motion3.json index 06fc35b..509924b 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m05.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m05.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 8.6, + "Duration": 8.57, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -54,7 +54,7 @@ 7.1, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -135,7 +135,7 @@ 7.1, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -202,7 +202,7 @@ 7.1, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -227,7 +227,7 @@ 7.333, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -357,7 +357,7 @@ 7.333, 1, 0, - 8.6, + 8.567, 1 ] }, @@ -375,7 +375,7 @@ 0.833, 0.812, 0, - 8.6, + 8.567, 0.812 ] }, @@ -505,7 +505,7 @@ 7.333, 1, 0, - 8.6, + 8.567, 1 ] }, @@ -530,7 +530,7 @@ 4.233, 0.8, 0, - 8.6, + 8.567, 0.8 ] }, @@ -604,7 +604,7 @@ 6.967, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -671,7 +671,7 @@ 6.967, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -717,7 +717,7 @@ 2.5, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -763,7 +763,7 @@ 2.5, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -781,7 +781,7 @@ 0.6, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -799,7 +799,7 @@ 0.6, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -817,7 +817,7 @@ 0.6, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -835,7 +835,7 @@ 0.6, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -853,7 +853,7 @@ 0.6, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -871,7 +871,7 @@ 0.6, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -924,7 +924,7 @@ 6.733, 1, 0, - 8.6, + 8.567, 1 ] }, @@ -998,7 +998,7 @@ 6.733, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -1100,7 +1100,7 @@ 8.167, -0.326, 0, - 8.6, + 8.567, -0.326 ] }, @@ -1181,7 +1181,7 @@ 8.033, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -1276,7 +1276,7 @@ 8.333, 0.025, 0, - 8.6, + 8.567, 0.025 ] }, @@ -1378,7 +1378,7 @@ 8.133, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -1389,7 +1389,7 @@ 0, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -1400,7 +1400,7 @@ 0, 1, 0, - 8.6, + 8.567, 1 ] }, @@ -1460,7 +1460,7 @@ 7.333, -10, 0, - 8.6, + 8.567, -10 ] }, @@ -1527,7 +1527,7 @@ 7.333, -10, 0, - 8.6, + 8.567, -10 ] }, @@ -1538,7 +1538,7 @@ 0, 0.02, 0, - 8.6, + 8.567, 0.02 ] }, @@ -1640,7 +1640,7 @@ 8.4, 0, 0, - 8.6, + 8.567, 0 ] }, @@ -1649,10 +1649,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.999, + 1, 0, - 8.6, - 0.999 + 8.57, + 1 ] }, { @@ -1662,7 +1662,7 @@ 0, 0, 0, - 8.6, + 8.57, 0 ] } diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m06.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m06.motion3.json index ce7cd5f..0bfe600 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m06.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m06.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 5.4, + "Duration": 5.37, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -68,7 +68,7 @@ 4.4, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -121,7 +121,7 @@ 4.4, -10, 0, - 5.4, + 5.367, -10 ] }, @@ -181,7 +181,7 @@ 3.7, -3, 0, - 5.4, + 5.367, -3 ] }, @@ -199,7 +199,7 @@ 0.367, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -308,7 +308,7 @@ 4.3, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -333,7 +333,7 @@ 4.233, 0.833, 0, - 5.4, + 5.367, 0.833 ] }, @@ -442,7 +442,7 @@ 4.3, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -467,7 +467,7 @@ 4.233, 0.823, 0, - 5.4, + 5.367, 0.823 ] }, @@ -534,7 +534,7 @@ 4.4, -0.28, 0, - 5.4, + 5.367, -0.28 ] }, @@ -601,7 +601,7 @@ 4.4, 0.13, 0, - 5.4, + 5.367, 0.13 ] }, @@ -689,7 +689,7 @@ 4.333, 0.479, 0, - 5.4, + 5.367, 0.479 ] }, @@ -777,7 +777,7 @@ 4.333, 0.479, 0, - 5.4, + 5.367, 0.479 ] }, @@ -809,7 +809,7 @@ 4.333, -0.479, 0, - 5.4, + 5.367, -0.479 ] }, @@ -841,7 +841,7 @@ 4.333, 0.688, 0, - 5.4, + 5.367, 0.688 ] }, @@ -873,7 +873,7 @@ 4.333, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -905,7 +905,7 @@ 4.333, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -937,7 +937,7 @@ 4.333, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -969,7 +969,7 @@ 4.333, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -987,7 +987,7 @@ 4.1, 1, 0, - 5.4, + 5.367, 1 ] }, @@ -1012,7 +1012,7 @@ 4.233, 1, 0, - 5.4, + 5.367, 1 ] }, @@ -1093,7 +1093,7 @@ 3.933, 2.025, 0, - 5.4, + 5.367, 2.025 ] }, @@ -1188,7 +1188,7 @@ 4.533, 0.095, 0, - 5.4, + 5.367, 0.095 ] }, @@ -1248,7 +1248,7 @@ 4.467, 8, 0, - 5.4, + 5.367, 8 ] }, @@ -1315,7 +1315,7 @@ 4.7, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -1396,7 +1396,7 @@ 4.667, -0.2, 0, - 5.4, + 5.367, -0.2 ] }, @@ -1428,7 +1428,7 @@ 5, 0.052, 0, - 5.4, + 5.367, 0.052 ] }, @@ -1481,7 +1481,7 @@ 4.467, -6.458, 0, - 5.4, + 5.367, -6.458 ] }, @@ -1541,7 +1541,7 @@ 4.467, -5.833, 0, - 5.4, + 5.367, -5.833 ] }, @@ -1622,7 +1622,7 @@ 4.667, 7.1, 0, - 5.4, + 5.367, 7.1 ] }, @@ -1703,7 +1703,7 @@ 4.667, 6.8, 0, - 5.4, + 5.367, 6.8 ] }, @@ -1763,7 +1763,7 @@ 4.733, 0.4, 0, - 5.4, + 5.367, 0.4 ] }, @@ -1823,7 +1823,7 @@ 4.733, 0.3, 0, - 5.4, + 5.367, 0.3 ] }, @@ -1960,7 +1960,7 @@ 5.233, 0, 0, - 5.4, + 5.367, 0 ] }, @@ -1969,10 +1969,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.001, 0, - 5.4, - 0.001 + 0, + 5.37, + 0 ] }, { @@ -1980,10 +1980,10 @@ "Id": "PartArmB", "Segments": [ 0, - 0.999, + 1, 0, - 5.4, - 0.999 + 5.37, + 1 ] } ] diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m07.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m07.motion3.json index 53051f4..b190148 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m07.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m07.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 1.933, + "Duration": 1.9, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -26,7 +26,7 @@ 0.333, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -44,7 +44,7 @@ 0.333, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -69,7 +69,7 @@ 0.667, 8, 0, - 1.933, + 1.9, 8 ] }, @@ -87,7 +87,7 @@ 0.333, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -161,7 +161,7 @@ 1.4, 1.2, 0, - 1.933, + 1.9, 1.2 ] }, @@ -179,7 +179,7 @@ 0.333, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -253,7 +253,7 @@ 1.4, 1.2, 0, - 1.933, + 1.9, 1.2 ] }, @@ -285,7 +285,7 @@ 0.667, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -317,7 +317,7 @@ 0.667, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -349,7 +349,7 @@ 0.667, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -381,7 +381,7 @@ 0.667, 0.26, 0, - 1.933, + 1.9, 0.26 ] }, @@ -413,7 +413,7 @@ 0.667, 0.36, 0, - 1.933, + 1.9, 0.36 ] }, @@ -445,7 +445,7 @@ 0.667, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -477,7 +477,7 @@ 0.667, 0.27, 0, - 1.933, + 1.9, 0.27 ] }, @@ -509,7 +509,7 @@ 0.667, 0.26, 0, - 1.933, + 1.9, 0.26 ] }, @@ -541,7 +541,7 @@ 0.667, -0.03, 0, - 1.933, + 1.9, -0.03 ] }, @@ -573,7 +573,7 @@ 0.667, 0.33, 0, - 1.933, + 1.9, 0.33 ] }, @@ -605,7 +605,7 @@ 0.667, 0.21, 0, - 1.933, + 1.9, 0.21 ] }, @@ -637,7 +637,7 @@ 0.667, -2, 0, - 1.933, + 1.9, -2 ] }, @@ -669,7 +669,7 @@ 0.667, 0.75, 0, - 1.933, + 1.9, 0.75 ] }, @@ -694,7 +694,7 @@ 0.667, -6, 0, - 1.933, + 1.9, -6 ] }, @@ -740,7 +740,7 @@ 1.233, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -765,7 +765,7 @@ 0.667, -3, 0, - 1.933, + 1.9, -3 ] }, @@ -783,7 +783,7 @@ 0.333, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -808,7 +808,7 @@ 1.1, 1, 0, - 1.933, + 1.9, 1 ] }, @@ -840,7 +840,7 @@ 0.9, -8.2, 0, - 1.933, + 1.9, -8.2 ] }, @@ -872,7 +872,7 @@ 0.9, -7.2, 0, - 1.933, + 1.9, -7.2 ] }, @@ -890,7 +890,7 @@ 0.333, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -908,7 +908,7 @@ 0.333, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -961,7 +961,7 @@ 1.5, 0, 0, - 1.933, + 1.9, 0 ] }, @@ -970,10 +970,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.999, + 1, 0, - 1.933, - 0.999 + 1.9, + 1 ] }, { @@ -983,7 +983,7 @@ 0, 0, 0, - 1.933, + 1.9, 0 ] } diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m08.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m08.motion3.json index ad50480..94b9c88 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m08.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m08.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 2.133, + "Duration": 2.1, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -47,7 +47,7 @@ 0.733, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -86,7 +86,7 @@ 0.733, 11, 0, - 2.133, + 2.1, 11 ] }, @@ -125,7 +125,7 @@ 0.833, -9, 0, - 2.133, + 2.1, -9 ] }, @@ -150,7 +150,7 @@ 0.433, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -182,7 +182,7 @@ 0.7, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -214,7 +214,7 @@ 0.7, 1, 0, - 2.133, + 2.1, 1 ] }, @@ -246,7 +246,7 @@ 0.7, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -278,7 +278,7 @@ 0.7, 1, 0, - 2.133, + 2.1, 1 ] }, @@ -303,7 +303,7 @@ 0.333, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -328,7 +328,7 @@ 0.333, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -360,7 +360,7 @@ 0.7, -0.14, 0, - 2.133, + 2.1, -0.14 ] }, @@ -392,7 +392,7 @@ 0.7, -0.14, 0, - 2.133, + 2.1, -0.14 ] }, @@ -424,7 +424,7 @@ 0.7, -0.21, 0, - 2.133, + 2.1, -0.21 ] }, @@ -456,7 +456,7 @@ 0.7, 0.2, 0, - 2.133, + 2.1, 0.2 ] }, @@ -488,7 +488,7 @@ 0.7, 0.25, 0, - 2.133, + 2.1, 0.25 ] }, @@ -520,7 +520,7 @@ 0.7, 0.23, 0, - 2.133, + 2.1, 0.23 ] }, @@ -552,7 +552,7 @@ 0.7, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -584,7 +584,7 @@ 0.7, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -616,7 +616,7 @@ 0.7, 1, 0, - 2.133, + 2.1, 1 ] }, @@ -648,7 +648,7 @@ 0.7, 1, 0, - 2.133, + 2.1, 1 ] }, @@ -659,7 +659,7 @@ 0, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -705,7 +705,7 @@ 0.933, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -744,7 +744,7 @@ 0.833, 2, 0, - 2.133, + 2.1, 2 ] }, @@ -769,7 +769,7 @@ 0.433, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -815,7 +815,7 @@ 1.267, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -826,7 +826,7 @@ 0, 1, 0, - 2.133, + 2.1, 1 ] }, @@ -837,7 +837,7 @@ 0, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -848,7 +848,7 @@ 0, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -880,7 +880,7 @@ 0.533, 9.583, 0, - 2.133, + 2.1, 9.583 ] }, @@ -912,7 +912,7 @@ 0.533, 4.375, 0, - 2.133, + 2.1, 4.375 ] }, @@ -944,7 +944,7 @@ 0.633, 4.792, 0, - 2.133, + 2.1, 4.792 ] }, @@ -976,7 +976,7 @@ 0.633, 7.292, 0, - 2.133, + 2.1, 7.292 ] }, @@ -1057,7 +1057,7 @@ 1.867, 0, 0, - 2.133, + 2.1, 0 ] }, @@ -1066,10 +1066,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.001, 0, - 2.133, - 0.001 + 0, + 2.1, + 0 ] }, { @@ -1077,10 +1077,10 @@ "Id": "PartArmB", "Segments": [ 0, - 0.995, + 1, 0, - 2.133, - 0.995 + 2.1, + 1 ] } ] diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m09.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m09.motion3.json index 5215cdf..47f74bf 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m09.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m09.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 1.633, + "Duration": 1.6, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -33,7 +33,7 @@ 0.6, -4, 0, - 1.633, + 1.6, -4 ] }, @@ -93,7 +93,7 @@ 1.233, -17, 0, - 1.633, + 1.6, -17 ] }, @@ -111,7 +111,7 @@ 0.2, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -143,7 +143,7 @@ 1, 1, 0, - 1.633, + 1.6, 1 ] }, @@ -203,7 +203,7 @@ 1.233, 0.825, 0, - 1.633, + 1.6, 0.825 ] }, @@ -228,7 +228,7 @@ 1.233, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -288,7 +288,7 @@ 1.233, 0.8, 0, - 1.633, + 1.6, 0.8 ] }, @@ -320,7 +320,7 @@ 1.233, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -352,7 +352,7 @@ 1.233, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -384,7 +384,7 @@ 1.233, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -423,7 +423,7 @@ 1.233, -0.417, 0, - 1.633, + 1.6, -0.417 ] }, @@ -462,7 +462,7 @@ 1.233, -1, 0, - 1.633, + 1.6, -1 ] }, @@ -494,7 +494,7 @@ 1.233, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -526,7 +526,7 @@ 1.233, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -558,7 +558,7 @@ 1.233, -1, 0, - 1.633, + 1.6, -1 ] }, @@ -590,7 +590,7 @@ 1.233, -1, 0, - 1.633, + 1.6, -1 ] }, @@ -622,7 +622,7 @@ 1.233, -1, 0, - 1.633, + 1.6, -1 ] }, @@ -654,7 +654,7 @@ 1.233, -1, 0, - 1.633, + 1.6, -1 ] }, @@ -686,7 +686,7 @@ 1.233, -2, 0, - 1.633, + 1.6, -2 ] }, @@ -739,7 +739,7 @@ 1.467, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -771,7 +771,7 @@ 1.033, -9, 0, - 1.633, + 1.6, -9 ] }, @@ -824,7 +824,7 @@ 1.4, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -842,7 +842,7 @@ 0.2, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -860,7 +860,7 @@ 0.2, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -899,7 +899,7 @@ 1.433, -1, 0, - 1.633, + 1.6, -1 ] }, @@ -910,7 +910,7 @@ 0, 1, 0, - 1.633, + 1.6, 1 ] }, @@ -977,7 +977,7 @@ 1.467, -2.4, 0, - 1.633, + 1.6, -2.4 ] }, @@ -1044,7 +1044,7 @@ 1.467, -1.8, 0, - 1.633, + 1.6, -1.8 ] }, @@ -1062,7 +1062,7 @@ 0.2, 0, 0, - 1.633, + 1.6, 0 ] }, @@ -1101,7 +1101,7 @@ 0.867, 0.86, 0, - 1.633, + 1.6, 0.86 ] }, @@ -1168,7 +1168,7 @@ 1.4, -9, 0, - 1.633, + 1.6, -9 ] }, @@ -1177,10 +1177,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.998, + 1, 0, - 1.633, - 0.998 + 1.6, + 1 ] }, { @@ -1190,7 +1190,7 @@ 0, 0, 0, - 1.633, + 1.6, 0 ] } diff --git a/Samples/Resources/Hiyori/motions/Hiyori_m10.motion3.json b/Samples/Resources/Hiyori/motions/Hiyori_m10.motion3.json index 6720a7e..341f9ec 100644 --- a/Samples/Resources/Hiyori/motions/Hiyori_m10.motion3.json +++ b/Samples/Resources/Hiyori/motions/Hiyori_m10.motion3.json @@ -1,7 +1,7 @@ { "Version": 3, "Meta": { - "Duration": 4.2, + "Duration": 4.17, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": false, @@ -54,7 +54,7 @@ 3.3, 6, 0, - 4.2, + 4.167, 6 ] }, @@ -79,7 +79,7 @@ 0.633, -30, 0, - 4.2, + 4.167, -30 ] }, @@ -97,7 +97,7 @@ 0.2, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -115,7 +115,7 @@ 0.2, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -189,7 +189,7 @@ 2.8, 0.8, 0, - 4.2, + 4.167, 0.8 ] }, @@ -207,7 +207,7 @@ 0.2, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -281,7 +281,7 @@ 2.8, 0.8, 0, - 4.2, + 4.167, 0.8 ] }, @@ -306,7 +306,7 @@ 0.433, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -352,7 +352,7 @@ 2.767, 0.283, 0, - 4.2, + 4.167, 0.283 ] }, @@ -377,7 +377,7 @@ 0.433, -1, 0, - 4.2, + 4.167, -1 ] }, @@ -402,7 +402,7 @@ 0.433, 0.19, 0, - 4.2, + 4.167, 0.19 ] }, @@ -427,7 +427,7 @@ 0.433, 0.11, 0, - 4.2, + 4.167, 0.11 ] }, @@ -452,7 +452,7 @@ 0.433, -0.48, 0, - 4.2, + 4.167, -0.48 ] }, @@ -477,7 +477,7 @@ 0.433, 0.29, 0, - 4.2, + 4.167, 0.29 ] }, @@ -502,7 +502,7 @@ 0.433, 1, 0, - 4.2, + 4.167, 1 ] }, @@ -527,7 +527,7 @@ 0.433, 0.85, 0, - 4.2, + 4.167, 0.85 ] }, @@ -552,7 +552,7 @@ 0.433, -0.75, 0, - 4.2, + 4.167, -0.75 ] }, @@ -577,7 +577,7 @@ 0.433, -0.87, 0, - 4.2, + 4.167, -0.87 ] }, @@ -602,7 +602,7 @@ 0.433, -1, 0, - 4.2, + 4.167, -1 ] }, @@ -627,7 +627,7 @@ 0.433, 1, 0, - 4.2, + 4.167, 1 ] }, @@ -673,7 +673,7 @@ 3.833, 10, 0, - 4.2, + 4.167, 10 ] }, @@ -691,7 +691,7 @@ 0.2, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -723,7 +723,7 @@ 3.367, 8.125, 0, - 4.2, + 4.167, 8.125 ] }, @@ -741,7 +741,7 @@ 0.2, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -752,7 +752,7 @@ 0, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -777,7 +777,7 @@ 2.8, 0.948, 0, - 4.2, + 4.167, 0.948 ] }, @@ -830,7 +830,7 @@ 3.467, -10, 0, - 4.2, + 4.167, -10 ] }, @@ -883,7 +883,7 @@ 3.467, -10, 0, - 4.2, + 4.167, -10 ] }, @@ -894,7 +894,7 @@ 0, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -905,7 +905,7 @@ 0, 0, 0, - 4.2, + 4.167, 0 ] }, @@ -944,7 +944,7 @@ 0.833, 4, 0, - 4.2, + 4.167, 4 ] }, @@ -953,10 +953,10 @@ "Id": "PartArmA", "Segments": [ 0, - 0.997, + 1, 0, - 4.2, - 0.997 + 4.17, + 1 ] }, { @@ -966,7 +966,7 @@ 0, 0, 0, - 4.2, + 4.17, 0 ] } diff --git a/Samples/Resources/Mark/Mark.2048/texture_00.png b/Samples/Resources/Mark/Mark.2048/texture_00.png index 88defe7..6b2804e 100644 Binary files a/Samples/Resources/Mark/Mark.2048/texture_00.png and b/Samples/Resources/Mark/Mark.2048/texture_00.png differ diff --git a/Samples/Resources/Mark/Mark.cdi3.json b/Samples/Resources/Mark/Mark.cdi3.json new file mode 100644 index 0000000..ef486a2 --- /dev/null +++ b/Samples/Resources/Mark/Mark.cdi3.json @@ -0,0 +1,181 @@ +{ + "Version": 3, + "Parameters": [ + { + "Id": "ParamAngleX", + "GroupId": "", + "Name": "角度 X" + }, + { + "Id": "ParamAngleY", + "GroupId": "", + "Name": "角度 Y" + }, + { + "Id": "ParamAngleZ", + "GroupId": "", + "Name": "角度 Z" + }, + { + "Id": "ParamEyeLOpen", + "GroupId": "", + "Name": "左目　開閉" + }, + { + "Id": "ParamEyeROpen", + "GroupId": "", + "Name": "右目　開閉" + }, + { + "Id": "ParamEyeBallX", + "GroupId": "", + "Name": "目玉 X" + }, + { + "Id": "ParamEyeBallY", + "GroupId": "", + "Name": "目玉 Y" + }, + { + "Id": "ParamBrowLY", + "GroupId": "", + "Name": "左眉　上下" + }, + { + "Id": "ParamBrowRY", + "GroupId": "", + "Name": "右眉　上下" + }, + { + "Id": "ParamMouthOpenY", + "GroupId": "", + "Name": "口　開閉" + }, + { + "Id": "ParamArmL", + "GroupId": "", + "Name": "左腕" + }, + { + "Id": "ParamArmR", + "GroupId": "", + "Name": "右腕" + }, + { + "Id": "ParamLeftLeg", + "GroupId": "", + "Name": "左脚" + }, + { + "Id": "ParamRightLeg", + "GroupId": "", + "Name": "右脚" + }, + { + "Id": "ParamBodyAngleX", + "GroupId": "", + "Name": "体の回転　X" + }, + { + "Id": "ParamBodyAngleY", + "GroupId": "", + "Name": "体の回転　Y" + }, + { + "Id": "ParamBodyAngleZ", + "GroupId": "", + "Name": "体の回転　Z" + }, + { + "Id": "ParamBreath", + "GroupId": "", + "Name": "呼吸" + }, + { + "Id": "ParamHairFront", + "GroupId": "", + "Name": "髪揺れ　前" + }, + { + "Id": "ParamHairSide", + "GroupId": "", + "Name": "髪揺れ　横" + }, + { + "Id": "ParamHairBack", + "GroupId": "", + "Name": "髪揺れ　後" + } + ], + "ParameterGroups": [], + "Parts": [ + { + "Id": "PartHead", + "Name": "頭部" + }, + { + "Id": "PartBody", + "Name": "体" + }, + { + "Id": "PartArmL", + "Name": "左腕" + }, + { + "Id": "PartArmR", + "Name": "右腕" + }, + { + "Id": "PartHairBack", + "Name": "後ろ髪" + }, + { + "Id": "Part", + "Name": "コア" + }, + { + "Id": "PartHairFront", + "Name": "前髪" + }, + { + "Id": "PartEyeL", + "Name": "左目" + }, + { + "Id": "PartEyeR", + "Name": "右目" + }, + { + "Id": "PartHairSide", + "Name": "横髪" + }, + { + "Id": "PartMouth", + "Name": "口" + }, + { + "Id": "PartFace", + "Name": "顔" + }, + { + "Id": "PartEyeBallL", + "Name": "左目玉" + }, + { + "Id": "PartEyeWhiteL", + "Name": "左白目" + }, + { + "Id": "PartEyeBallR", + "Name": "右目玉" + }, + { + "Id": "PartEyeWhiteR", + "Name": "右白目" + }, + { + "Id": "PartOral", + "Name": "口内" + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Mark/Mark.moc3 b/Samples/Resources/Mark/Mark.moc3 index 74b0c57..e1da269 100644 Binary files a/Samples/Resources/Mark/Mark.moc3 and b/Samples/Resources/Mark/Mark.moc3 differ diff --git a/Samples/Resources/Mark/Mark.model3.json b/Samples/Resources/Mark/Mark.model3.json index dba0f2c..55e6a37 100644 --- a/Samples/Resources/Mark/Mark.model3.json +++ b/Samples/Resources/Mark/Mark.model3.json @@ -7,6 +7,7 @@ ], "Physics": "Mark.physics3.json", "UserData": "Mark.userdata3.json", + "DisplayInfo": "Mark.cdi3.json", "Motions": { "Idle": [ { diff --git a/Samples/Resources/Mark/Mark.physics3.json b/Samples/Resources/Mark/Mark.physics3.json index f7da9b8..06e5b1f 100644 --- a/Samples/Resources/Mark/Mark.physics3.json +++ b/Samples/Resources/Mark/Mark.physics3.json @@ -18,7 +18,7 @@ "PhysicsDictionary": [ { "Id": "PhysicsSetting1", - "Name": "Hair" + "Name": "髪揺れ" } ] }, diff --git a/Samples/Resources/Mark/motions/mark_m01.motion3.json b/Samples/Resources/Mark/motions/mark_m01.motion3.json index ec8a6a1..f21ad29 100644 --- a/Samples/Resources/Mark/motions/mark_m01.motion3.json +++ b/Samples/Resources/Mark/motions/mark_m01.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 38, - "TotalSegmentCount": 414, - "TotalPointCount": 1246, + "CurveCount": 37, + "TotalSegmentCount": 405, + "TotalPointCount": 1216, "UserDataCount": 2, "TotalUserDataSize": 14 }, @@ -33,6 +33,73 @@ 1 ] }, + { + "Target": "Model", + "Id": "EyeBlink", + "Segments": [ + 0, + 0.997, + 1, + 1.511, + 0.997, + 3.022, + 1, + 4.533, + 1, + 1, + 4.567, + 1, + 4.6, + 0, + 4.633, + 0, + 1, + 4.667, + 0, + 4.7, + 0, + 4.733, + 0, + 1, + 4.789, + 0, + 4.844, + 1, + 4.9, + 1, + 1, + 5.5, + 1, + 6.1, + 1, + 6.7, + 1, + 1, + 6.733, + 1, + 6.767, + 0, + 6.8, + 0, + 1, + 6.833, + 0, + 6.867, + 0, + 6.9, + 0, + 1, + 6.956, + 0, + 7.011, + 1, + 7.067, + 1, + 0, + 10.4, + 1 + ] + }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -512,148 +579,6 @@ -10.291 ] }, - { - "Target": "Parameter", - "Id": "ParamEyeLOpen", - "Segments": [ - 0, - 0.997, - 1, - 1.511, - 0.997, - 3.022, - 1, - 4.533, - 1, - 1, - 4.567, - 1, - 4.6, - 0, - 4.633, - 0, - 1, - 4.667, - 0, - 4.7, - 0, - 4.733, - 0, - 1, - 4.789, - 0, - 4.844, - 1, - 4.9, - 1, - 1, - 5.5, - 1, - 6.1, - 1, - 6.7, - 1, - 1, - 6.733, - 1, - 6.767, - 0, - 6.8, - 0, - 1, - 6.833, - 0, - 6.867, - 0, - 6.9, - 0, - 1, - 6.956, - 0, - 7.011, - 1, - 7.067, - 1, - 1, - 8.178, - 1, - 9.289, - 1, - 10.4, - 1 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeROpen", - "Segments": [ - 0, - 0.997, - 1, - 1.511, - 0.997, - 3.022, - 1, - 4.533, - 1, - 1, - 4.567, - 1, - 4.6, - 0, - 4.633, - 0, - 1, - 4.667, - 0, - 4.7, - 0, - 4.733, - 0, - 1, - 4.789, - 0, - 4.844, - 1, - 4.9, - 1, - 1, - 5.5, - 1, - 6.1, - 1, - 6.7, - 1, - 1, - 6.733, - 1, - 6.767, - 0, - 6.8, - 0, - 1, - 6.833, - 0, - 6.867, - 0, - 6.9, - 0, - 1, - 6.956, - 0, - 7.011, - 1, - 7.067, - 1, - 1, - 8.178, - 1, - 9.289, - 1, - 10.4, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamEyeBallX", diff --git a/Samples/Resources/Mark/motions/mark_m02.motion3.json b/Samples/Resources/Mark/motions/mark_m02.motion3.json index 8ee4991..839ee18 100644 --- a/Samples/Resources/Mark/motions/mark_m02.motion3.json +++ b/Samples/Resources/Mark/motions/mark_m02.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 38, - "TotalSegmentCount": 261, - "TotalPointCount": 787, + "CurveCount": 37, + "TotalSegmentCount": 260, + "TotalPointCount": 781, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -23,6 +23,17 @@ 1 ] }, + { + "Target": "Model", + "Id": "EyeBlink", + "Segments": [ + 0, + 1, + 0, + 4.8, + 1 + ] + }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -341,36 +352,6 @@ -27.935 ] }, - { - "Target": "Parameter", - "Id": "ParamEyeLOpen", - "Segments": [ - 0, - 1, - 1, - 1.6, - 1, - 3.2, - 1, - 4.8, - 1 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeROpen", - "Segments": [ - 0, - 1, - 1, - 1.6, - 1, - 3.2, - 1, - 4.8, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamEyeBallX", diff --git a/Samples/Resources/Mark/motions/mark_m03.motion3.json b/Samples/Resources/Mark/motions/mark_m03.motion3.json index c3e5cbe..1ad2f75 100644 --- a/Samples/Resources/Mark/motions/mark_m03.motion3.json +++ b/Samples/Resources/Mark/motions/mark_m03.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 38, - "TotalSegmentCount": 110, - "TotalPointCount": 294, + "CurveCount": 37, + "TotalSegmentCount": 109, + "TotalPointCount": 288, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,6 +19,45 @@ 0, 1, 0, + 1.97, + 1 + ] + }, + { + "Target": "Model", + "Id": "EyeBlink", + "Segments": [ + 0, + 1, + 1, + 0.222, + 1, + 0.444, + 1, + 0.667, + 0.997, + 1, + 0.756, + 0.996, + 0.844, + 0.005, + 0.933, + 0.003, + 1, + 1.078, + 0, + 1.222, + 0, + 1.367, + 0, + 1, + 1.467, + 0, + 1.567, + 1, + 1.667, + 1, + 0, 1.967, 1 ] @@ -164,64 +203,6 @@ 0 ] }, - { - "Target": "Parameter", - "Id": "ParamEyeLOpen", - "Segments": [ - 0, - 1, - 1, - 0.433, - 1, - 0.867, - 0.01, - 1.3, - 0.01, - 1, - 1.422, - 0.01, - 1.544, - 1, - 1.667, - 1, - 1, - 1.767, - 1, - 1.867, - 1, - 1.967, - 1 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeROpen", - "Segments": [ - 0, - 1, - 1, - 0.433, - 1, - 0.867, - 0.01, - 1.3, - 0.01, - 1, - 1.422, - 0.01, - 1.544, - 1, - 1.667, - 1, - 1, - 1.767, - 1, - 1.867, - 1, - 1.967, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamEyeBallX", @@ -769,7 +750,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -780,7 +761,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -791,7 +772,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -802,7 +783,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -813,7 +794,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -824,7 +805,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -835,7 +816,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -846,7 +827,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -857,7 +838,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -868,7 +849,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -879,7 +860,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -890,7 +871,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -901,7 +882,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -912,7 +893,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -923,7 +904,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] }, @@ -934,7 +915,7 @@ 0, 1, 0, - 1.967, + 1.97, 1 ] } diff --git a/Samples/Resources/Mark/motions/mark_m04.motion3.json b/Samples/Resources/Mark/motions/mark_m04.motion3.json index 18d03e9..32d318e 100644 --- a/Samples/Resources/Mark/motions/mark_m04.motion3.json +++ b/Samples/Resources/Mark/motions/mark_m04.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 38, - "TotalSegmentCount": 227, - "TotalPointCount": 613, + "CurveCount": 37, + "TotalSegmentCount": 224, + "TotalPointCount": 601, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,17 +19,56 @@ 0, 1, 1, - 0.422, + 0.42, 1, - 0.844, + 0.84, 1, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, + { + "Target": "Model", + "Id": "EyeBlink", + "Segments": [ + 0, + 1, + 1, + 0.311, + 1, + 0.622, + 1, + 0.933, + 1, + 1, + 0.978, + 1, + 1.022, + 0.003, + 1.067, + 0.003, + 1, + 1.911, + 0.001, + 2.756, + 0, + 3.6, + 0, + 1, + 3.711, + 0, + 3.822, + 0.997, + 3.933, + 0.997, + 0, + 4.833, + 0.997 + ] + }, { "Target": "Parameter", "Id": "ParamAngleX", @@ -273,78 +312,6 @@ 0 ] }, - { - "Target": "Parameter", - "Id": "ParamEyeLOpen", - "Segments": [ - 0, - 1, - 1, - 0.311, - 1, - 0.622, - 1, - 0.933, - 1, - 1, - 1.822, - 1, - 2.711, - 0, - 3.6, - 0, - 1, - 3.711, - 0, - 3.822, - 0.997, - 3.933, - 0.997, - 1, - 4.233, - 0.997, - 4.533, - 0.997, - 4.833, - 0.997 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeROpen", - "Segments": [ - 0, - 1, - 1, - 0.311, - 1, - 0.622, - 1, - 0.933, - 1, - 1, - 1.822, - 1, - 2.711, - 0, - 3.6, - 0, - 1, - 3.711, - 0, - 3.822, - 0.997, - 3.933, - 0.997, - 1, - 4.233, - 0.997, - 4.533, - 0.997, - 4.833, - 0.997 - ] - }, { "Target": "Parameter", "Id": "ParamEyeBallX", @@ -1476,10 +1443,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1490,10 +1457,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1504,10 +1471,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1518,10 +1485,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1532,10 +1499,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1546,10 +1513,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1560,10 +1527,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1574,10 +1541,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1588,10 +1555,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1602,10 +1569,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1616,10 +1583,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1630,10 +1597,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1644,10 +1611,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1658,10 +1625,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1672,10 +1639,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] }, @@ -1686,10 +1653,10 @@ 0, 1, 2, - 1.267, + 1.27, 1, 0, - 4.833, + 4.83, 1 ] } diff --git a/Samples/Resources/Mark/motions/mark_m05.motion3.json b/Samples/Resources/Mark/motions/mark_m05.motion3.json index 790c773..426eb57 100644 --- a/Samples/Resources/Mark/motions/mark_m05.motion3.json +++ b/Samples/Resources/Mark/motions/mark_m05.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 39, - "TotalSegmentCount": 180, - "TotalPointCount": 511, + "CurveCount": 38, + "TotalSegmentCount": 173, + "TotalPointCount": 487, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,11 +19,64 @@ 0, 1, 1, - 0.111, + 0.11, 1, - 0.222, + 0.22, 1, - 0.333, + 0.33, + 1, + 0, + 4, + 1 + ] + }, + { + "Target": "Model", + "Id": "EyeBlink", + "Segments": [ + 0, + 1, + 1, + 0.2, + 1, + 0.4, + 1, + 0.6, + 1, + 1, + 0.733, + 1, + 0.867, + 0.7, + 1, + 0.7, + 1, + 1.222, + 0.7, + 1.444, + 0.7, + 1.667, + 0.7, + 1, + 1.711, + 0.7, + 1.756, + 0, + 1.8, + 0, + 1, + 1.844, + 0, + 1.889, + -0.001, + 1.933, + 0.003, + 1, + 1.978, + 0.007, + 2.022, + 1, + 2.067, 1, 0, 4, @@ -222,120 +275,6 @@ 0 ] }, - { - "Target": "Parameter", - "Id": "ParamEyeLOpen", - "Segments": [ - 0, - 1, - 1, - 0.2, - 1, - 0.4, - 1, - 0.6, - 1, - 1, - 0.733, - 1, - 0.867, - 0.7, - 1, - 0.7, - 1, - 1.222, - 0.7, - 1.444, - 0.7, - 1.667, - 0.7, - 1, - 1.711, - 0.7, - 1.756, - 0, - 1.8, - 0, - 1, - 1.811, - 0, - 1.822, - 0, - 1.833, - 0, - 1, - 1.911, - 0, - 1.989, - 1, - 2.067, - 1, - 1, - 2.711, - 1, - 3.356, - 1, - 4, - 1 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeROpen", - "Segments": [ - 0, - 1, - 1, - 0.2, - 1, - 0.4, - 1, - 0.6, - 1, - 1, - 0.733, - 1, - 0.867, - 0.7, - 1, - 0.7, - 1, - 1.222, - 0.7, - 1.444, - 0.7, - 1.667, - 0.7, - 1, - 1.711, - 0.7, - 1.756, - 0, - 1.8, - 0, - 1, - 1.811, - 0, - 1.822, - 0, - 1.833, - 0, - 1, - 1.911, - 0, - 1.989, - 1, - 2.067, - 1, - 1, - 2.711, - 1, - 3.356, - 1, - 4, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamEyeBallX", @@ -1220,7 +1159,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1234,7 +1173,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1248,7 +1187,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1262,7 +1201,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1276,7 +1215,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1290,7 +1229,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1304,7 +1243,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1318,7 +1257,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1332,7 +1271,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1346,7 +1285,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1360,7 +1299,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1374,7 +1313,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1388,7 +1327,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1402,7 +1341,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1416,7 +1355,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, @@ -1430,7 +1369,7 @@ 0, 1, 2, - 0.333, + 0.33, 1, 0, 4, diff --git a/Samples/Resources/Mark/motions/mark_m06.motion3.json b/Samples/Resources/Mark/motions/mark_m06.motion3.json index a63a0a3..947e343 100644 --- a/Samples/Resources/Mark/motions/mark_m06.motion3.json +++ b/Samples/Resources/Mark/motions/mark_m06.motion3.json @@ -5,9 +5,9 @@ "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 38, - "TotalSegmentCount": 100, - "TotalPointCount": 266, + "CurveCount": 37, + "TotalSegmentCount": 99, + "TotalPointCount": 260, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -15,6 +15,17 @@ { "Target": "Model", "Id": "Opacity", + "Segments": [ + 0, + 1, + 0, + 1.43, + 1 + ] + }, + { + "Target": "Model", + "Id": "EyeBlink", "Segments": [ 0, 1, @@ -140,36 +151,6 @@ 0 ] }, - { - "Target": "Parameter", - "Id": "ParamEyeLOpen", - "Segments": [ - 0, - 1, - 1, - 0.478, - 1, - 0.956, - 1, - 1.433, - 1 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeROpen", - "Segments": [ - 0, - 1, - 1, - 0.478, - 1, - 0.956, - 1, - 1.433, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamEyeBallX", @@ -703,7 +684,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -714,7 +695,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -725,7 +706,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -736,7 +717,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -747,7 +728,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -758,7 +739,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -769,7 +750,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -780,7 +761,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -791,7 +772,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -802,7 +783,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -813,7 +794,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -824,7 +805,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -835,7 +816,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -846,7 +827,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -857,7 +838,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] }, @@ -868,7 +849,7 @@ 0, 1, 0, - 1.433, + 1.43, 1 ] } diff --git a/Samples/Resources/Natori/Natori.cdi3.json b/Samples/Resources/Natori/Natori.cdi3.json new file mode 100644 index 0000000..0c00cea --- /dev/null +++ b/Samples/Resources/Natori/Natori.cdi3.json @@ -0,0 +1,677 @@ +{ + "Version": 3, + "Parameters": [ + { + "Id": "ParamAngleX", + "GroupId": "", + "Name": "角度 X" + }, + { + "Id": "ParamAngleY", + "GroupId": "", + "Name": "角度 Y" + }, + { + "Id": "ParamAngleZ", + "GroupId": "", + "Name": "角度 Z" + }, + { + "Id": "ParamEyeLOpen", + "GroupId": "ParamGroupExpression", + "Name": "左目　開閉" + }, + { + "Id": "ParamEyeLSmile", + "GroupId": "ParamGroupExpression", + "Name": "左目　笑顔" + }, + { + "Id": "ParamEyeLForm", + "GroupId": "ParamGroupExpression", + "Name": "左目　変形" + }, + { + "Id": "ParamEyeROpen", + "GroupId": "ParamGroupExpression", + "Name": "右目　開閉" + }, + { + "Id": "ParamEyeRSmile", + "GroupId": "ParamGroupExpression", + "Name": "右目　笑顔" + }, + { + "Id": "ParamEyeRForm", + "GroupId": "ParamGroupExpression", + "Name": "右目　変形" + }, + { + "Id": "ParamEyeBallX", + "GroupId": "ParamGroupExpression", + "Name": "目玉 X" + }, + { + "Id": "ParamEyeBallY", + "GroupId": "ParamGroupExpression", + "Name": "目玉 Y" + }, + { + "Id": "ParamEyeBallForm", + "GroupId": "ParamGroupExpression", + "Name": "目玉 収縮" + }, + { + "Id": "ParamBrowLY", + "GroupId": "ParamGroupExpression", + "Name": "左眉　上下" + }, + { + "Id": "ParamBrowRY", + "GroupId": "ParamGroupExpression", + "Name": "右眉　上下" + }, + { + "Id": "ParamBrowLX", + "GroupId": "ParamGroupExpression", + "Name": "左眉　左右" + }, + { + "Id": "ParamBrowRX", + "GroupId": "ParamGroupExpression", + "Name": "右眉　左右" + }, + { + "Id": "ParamBrowLAngle", + "GroupId": "ParamGroupExpression", + "Name": "左眉　角度" + }, + { + "Id": "ParamBrowRAngle", + "GroupId": "ParamGroupExpression", + "Name": "右眉　角度" + }, + { + "Id": "ParamBrowLForm", + "GroupId": "ParamGroupExpression", + "Name": "左眉　変形" + }, + { + "Id": "ParamBrowLForm2", + "GroupId": "ParamGroupExpression", + "Name": "左眉　変形2" + }, + { + "Id": "ParamBrowRForm", + "GroupId": "ParamGroupExpression", + "Name": "右眉　変形" + }, + { + "Id": "ParamBrowRForm2", + "GroupId": "ParamGroupExpression", + "Name": "右眉　変形2" + }, + { + "Id": "ParamMouthForm", + "GroupId": "ParamGroupExpression", + "Name": "口　変形" + }, + { + "Id": "ParamMouthOpenY", + "GroupId": "ParamGroupExpression", + "Name": "口　開閉" + }, + { + "Id": "ParamMouthForm2", + "GroupId": "ParamGroupExpression", + "Name": "口　変形2" + }, + { + "Id": "ParamTeethOn", + "GroupId": "ParamGroupExpression", + "Name": "歯の表示" + }, + { + "Id": "ParamCheek", + "GroupId": "ParamGroupExpression", + "Name": "照れ" + }, + { + "Id": "ParamGlassUD", + "GroupId": "ParamGroupExpression", + "Name": "メガネ　上下" + }, + { + "Id": "ParamGrassWhite", + "GroupId": "ParamGroupExpression", + "Name": "メガネ　白" + }, + { + "Id": "ParamGrassHighlight", + "GroupId": "ParamGroupExpression", + "Name": "メガネ　HL表示" + }, + { + "Id": "ParamGrassHighlightMove", + "GroupId": "ParamGroupExpression", + "Name": "メガネ　HL移動" + }, + { + "Id": "ParamBodyAngleX", + "GroupId": "ParamGroupBody", + "Name": "体の回転　X" + }, + { + "Id": "ParamBodyAngleY", + "GroupId": "ParamGroupBody", + "Name": "体の回転　Y" + }, + { + "Id": "ParamBodyAngleZ", + "GroupId": "ParamGroupBody", + "Name": "体の回転　Z" + }, + { + "Id": "ParamWaistAngleZ", + "GroupId": "ParamGroupBody", + "Name": "腰の回転　Z" + }, + { + "Id": "ParamBodyPosition", + "GroupId": "ParamGroupBody", + "Name": "体の前後" + }, + { + "Id": "ParamBreath", + "GroupId": "ParamGroupBody", + "Name": "呼吸" + }, + { + "Id": "ParamLeftShoulderUp", + "GroupId": "ParamGroupBody", + "Name": "左肩の上下" + }, + { + "Id": "ParamRightShoulderUp", + "GroupId": "ParamGroupBody", + "Name": "右肩の上下" + }, + { + "Id": "ParamAllX", + "GroupId": "ParamGroup", + "Name": "全体の移動 X" + }, + { + "Id": "ParamAllY", + "GroupId": "ParamGroup", + "Name": "全体の移動 Y" + }, + { + "Id": "ParamAllRotate", + "GroupId": "ParamGroup", + "Name": "全体の回転" + }, + { + "Id": "ParamHairFront", + "GroupId": "ParamGroupSway", + "Name": "髪揺れ　前" + }, + { + "Id": "ParamHairSide", + "GroupId": "ParamGroupSway", + "Name": "髪揺れ　横" + }, + { + "Id": "ParamHairBack", + "GroupId": "ParamGroupSway", + "Name": "髪揺れ　後" + }, + { + "Id": "ParamHairFrontFuwa", + "GroupId": "ParamGroupSway", + "Name": "前髪　ふわ" + }, + { + "Id": "ParamHairSideFuwa", + "GroupId": "ParamGroupSway", + "Name": "横髪　ふわ" + }, + { + "Id": "ParamHairBackFuwa", + "GroupId": "ParamGroupSway", + "Name": "後ろ髪　ふわ" + }, + { + "Id": "ParamJacket", + "GroupId": "ParamGroupSway", + "Name": "ジャケット燕尾の揺れ" + }, + { + "Id": "ParamChainWaist", + "GroupId": "ParamGroupSway", + "Name": "チェーンAの揺れ" + }, + { + "Id": "ParamWatchSwingA1", + "GroupId": "ParamGroupSway", + "Name": "時計A　揺れ1" + }, + { + "Id": "ParamWatchSwingA2", + "GroupId": "ParamGroupSway", + "Name": "時計A　揺れ2" + }, + { + "Id": "ParamWatchBChain", + "GroupId": "ParamGroupSway", + "Name": "時計B　チェーン揺れ" + }, + { + "Id": "ParamWatchAX", + "GroupId": "ParamGroup8", + "Name": "時計A　横回転" + }, + { + "Id": "ParamWatchBSwitch", + "GroupId": "ParamGroup9", + "Name": "時計B　スイッチ" + }, + { + "Id": "ParamWatchBOpen", + "GroupId": "ParamGroup9", + "Name": "時計B　ふた開閉" + }, + { + "Id": "ParamWatchBOpen2", + "GroupId": "ParamGroup9", + "Name": "時計B　内側開閉" + }, + { + "Id": "ParamWatchBX", + "GroupId": "ParamGroup9", + "Name": "時計B　横回転" + }, + { + "Id": "ParamWatchBRoll", + "GroupId": "ParamGroup9", + "Name": "時計B　回転" + }, + { + "Id": "ParamWatchBLR", + "GroupId": "ParamGroup9", + "Name": "時計B　左右" + }, + { + "Id": "ParamWatchBUD", + "GroupId": "ParamGroup9", + "Name": "時計B　上下" + }, + { + "Id": "ParamArmAL01", + "GroupId": "ParamGroup3", + "Name": "左腕A　肩" + }, + { + "Id": "ParamArmAL02", + "GroupId": "ParamGroup3", + "Name": "左肩A　肘回転" + }, + { + "Id": "ParamArmAL03", + "GroupId": "ParamGroup3", + "Name": "左腕A　手首" + }, + { + "Id": "ParamArmAL04", + "GroupId": "ParamGroup3", + "Name": "左腕A　前腕の前後" + }, + { + "Id": "ParamArmAR01", + "GroupId": "ParamGroup2", + "Name": "右腕A　肩の回転" + }, + { + "Id": "ParamArmAR02", + "GroupId": "ParamGroup2", + "Name": "右腕A　肘回転" + }, + { + "Id": "ParamArmAR03", + "GroupId": "ParamGroup2", + "Name": "右腕A　手首回転" + }, + { + "Id": "ParamArmAR04", + "GroupId": "ParamGroup2", + "Name": "右腕A　前腕の前後" + }, + { + "Id": "ParamArmBR01", + "GroupId": "ParamGroup4", + "Name": "右腕B　肩の回転" + }, + { + "Id": "ParamArmBR02", + "GroupId": "ParamGroup4", + "Name": "右腕B　肘の回転" + }, + { + "Id": "ParamArmBR03", + "GroupId": "ParamGroup4", + "Name": "右腕B　手首の回転" + }, + { + "Id": "ParamArmBRHand01", + "GroupId": "ParamGroup4", + "Name": "右手01　表示" + }, + { + "Id": "ParamArmBRHand01Roll", + "GroupId": "ParamGroup4", + "Name": "右手01　指曲げ" + }, + { + "Id": "ParamArmBRHand05", + "GroupId": "ParamGroup4", + "Name": "右手05　表示" + }, + { + "Id": "ParamArmBRHand05Roll1", + "GroupId": "ParamGroup4", + "Name": "右手05　指曲げ1" + }, + { + "Id": "ParamArmBRHand05Roll2", + "GroupId": "ParamGroup4", + "Name": "右手05　指曲げ2" + }, + { + "Id": "ParamArmBRHand05Roll3", + "GroupId": "ParamGroup4", + "Name": "右手05　指曲げ3" + }, + { + "Id": "ParamArmCR01", + "GroupId": "ParamGroup5", + "Name": "左腕C　肩の回転" + }, + { + "Id": "ParamArmCR02", + "GroupId": "ParamGroup5", + "Name": "左腕C　肘の回転" + }, + { + "Id": "ParamArmCR03", + "GroupId": "ParamGroup5", + "Name": "左腕C　手首回転" + }, + { + "Id": "ParamArmCLHandRoll1", + "GroupId": "ParamGroup5", + "Name": "左手C　指曲げ1" + }, + { + "Id": "ParamArmDL01", + "GroupId": "ParamGroup6", + "Name": "左腕D 肩回転" + }, + { + "Id": "ParamArmDL02", + "GroupId": "ParamGroup6", + "Name": "左腕D 肘回転" + }, + { + "Id": "ParamArmDL03", + "GroupId": "ParamGroup6", + "Name": "左腕D 手首回転" + }, + { + "Id": "ParamArmDLHand03Roll", + "GroupId": "ParamGroup6", + "Name": "左手03　指曲げ" + }, + { + "Id": "ParamArmER01", + "GroupId": "ParamGroup7", + "Name": "右腕E　肩回転" + }, + { + "Id": "ParamArmER02", + "GroupId": "ParamGroup7", + "Name": "右腕E　肘回転" + }, + { + "Id": "ParamArmER03", + "GroupId": "ParamGroup7", + "Name": "右腕E　手首回転" + }, + { + "Id": "ParamArmER04", + "GroupId": "ParamGroup7", + "Name": "右腕E　上腕の長さ" + }, + { + "Id": "ParamArmERHand04", + "GroupId": "ParamGroup7", + "Name": "右手04　表示" + }, + { + "Id": "ParamArmERHand04Roll1", + "GroupId": "ParamGroup7", + "Name": "右手04　指曲げ1" + }, + { + "Id": "ParamArmERHand04Roll2", + "GroupId": "ParamGroup7", + "Name": "右手04　指曲げ2" + }, + { + "Id": "ParamArmERHand06", + "GroupId": "ParamGroup7", + "Name": "右手06　表示" + }, + { + "Id": "ParamArmERHand06Roll1", + "GroupId": "ParamGroup7", + "Name": "右手06　指曲げ1" + }, + { + "Id": "ParamArmERHand06Roll2", + "GroupId": "ParamGroup7", + "Name": "右手06　指曲げ2" + } + ], + "ParameterGroups": [ + { + "Id": "ParamGroupExpression", + "GroupId": "", + "Name": "表情" + }, + { + "Id": "ParamGroupBody", + "GroupId": "", + "Name": "体" + }, + { + "Id": "ParamGroup", + "GroupId": "", + "Name": "全体移動" + }, + { + "Id": "ParamGroupSway", + "GroupId": "", + "Name": "揺れ" + }, + { + "Id": "ParamGroup8", + "GroupId": "", + "Name": "懐中時計A" + }, + { + "Id": "ParamGroup9", + "GroupId": "", + "Name": "懐中時計B" + }, + { + "Id": "ParamGroup3", + "GroupId": "", + "Name": "左腕A" + }, + { + "Id": "ParamGroup2", + "GroupId": "", + "Name": "右腕A" + }, + { + "Id": "ParamGroup4", + "GroupId": "", + "Name": "右腕B" + }, + { + "Id": "ParamGroup5", + "GroupId": "", + "Name": "左腕C" + }, + { + "Id": "ParamGroup6", + "GroupId": "", + "Name": "左腕D" + }, + { + "Id": "ParamGroup7", + "GroupId": "", + "Name": "右腕E" + } + ], + "Parts": [ + { + "Id": "PartCredit", + "Name": "クレジット" + }, + { + "Id": "PartCore", + "Name": "CORE" + }, + { + "Id": "PartGlass", + "Name": "メガネ" + }, + { + "Id": "PartWatchA", + "Name": "懐中時計_A" + }, + { + "Id": "PartWatchB", + "Name": "懐中時計_B" + }, + { + "Id": "PartHairFront", + "Name": "前髪" + }, + { + "Id": "PartHead", + "Name": "頭" + }, + { + "Id": "PartUpperBody", + "Name": "上半身" + }, + { + "Id": "PartHairBack", + "Name": "後ろ髪" + }, + { + "Id": "PartLowerBody", + "Name": "下半身" + }, + { + "Id": "PartArmAL", + "Name": "左腕A" + }, + { + "Id": "PartArmAR", + "Name": "右腕A" + }, + { + "Id": "PartArmBR", + "Name": "右腕B" + }, + { + "Id": "PartArmCL", + "Name": "左腕C" + }, + { + "Id": "PartArmDL", + "Name": "左腕D" + }, + { + "Id": "PartArmER", + "Name": "右腕E" + }, + { + "Id": "PartEyeBlow", + "Name": "まゆ毛" + }, + { + "Id": "PartEyeR", + "Name": "右目" + }, + { + "Id": "PartEyeL", + "Name": "左目" + }, + { + "Id": "PartHairLine", + "Name": "生え際" + }, + { + "Id": "PartHairShadow", + "Name": "髪影" + }, + { + "Id": "PartNose", + "Name": "鼻" + }, + { + "Id": "PartMouth", + "Name": "口" + }, + { + "Id": "PartJacket", + "Name": "ジャケット" + }, + { + "Id": "PartArmALFore", + "Name": "左腕A 前腕" + }, + { + "Id": "PartArmARFore", + "Name": "右腕A 前腕" + }, + { + "Id": "PartHand11", + "Name": "手袋_1" + }, + { + "Id": "PartHand51", + "Name": "手袋_5" + }, + { + "Id": "PartHand21", + "Name": "手袋_2" + }, + { + "Id": "PartHand31", + "Name": "手袋_3" + }, + { + "Id": "PartHand41", + "Name": "手袋_4" + }, + { + "Id": "PartHand61", + "Name": "手袋_6" + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Natori/Natori.moc3 b/Samples/Resources/Natori/Natori.moc3 index 69ff8ae..9f7303b 100644 Binary files a/Samples/Resources/Natori/Natori.moc3 and b/Samples/Resources/Natori/Natori.moc3 differ diff --git a/Samples/Resources/Natori/Natori.model3.json b/Samples/Resources/Natori/Natori.model3.json index c2eaddf..62cde7a 100644 --- a/Samples/Resources/Natori/Natori.model3.json +++ b/Samples/Resources/Natori/Natori.model3.json @@ -7,60 +7,66 @@ ], "Physics": "Natori.physics3.json", "Pose": "Natori.pose3.json", + "DisplayInfo": "Natori.cdi3.json", "Expressions": [ { - "Name": "exp_00.exp3.json", - "File": "exp/exp_00.exp3.json" + "Name": "Angry", + "File": "exp/Angry.exp3.json" }, { - "Name": "exp_01.exp3.json", + "Name": "Blushing", + "File": "exp/Blushing.exp3.json" + }, + { + "Name": "Normal", + "File": "exp/Normal.exp3.json" + }, + { + "Name": "Sad", + "File": "exp/Sad.exp3.json" + }, + { + "Name": "Smile", + "File": "exp/Smile.exp3.json" + }, + { + "Name": "Surprised", + "File": "exp/Surprised.exp3.json" + }, + { + "Name": "exp_01", "File": "exp/exp_01.exp3.json" }, { - "Name": "exp_02.exp3.json", + "Name": "exp_02", "File": "exp/exp_02.exp3.json" }, { - "Name": "exp_03.exp3.json", + "Name": "exp_03", "File": "exp/exp_03.exp3.json" }, { - "Name": "exp_04.exp3.json", + "Name": "exp_04", "File": "exp/exp_04.exp3.json" }, { - "Name": "exp_05.exp3.json", + "Name": "exp_05", "File": "exp/exp_05.exp3.json" - }, - { - "Name": "exp_06.exp3.json", - "File": "exp/exp_06.exp3.json" - }, - { - "Name": "exp_07.exp3.json", - "File": "exp/exp_07.exp3.json" - }, - { - "Name": "exp_08.exp3.json", - "File": "exp/exp_08.exp3.json" - }, - { - "Name": "exp_09.exp3.json", - "File": "exp/exp_09.exp3.json" - }, - { - "Name": "exp_10.exp3.json", - "File": "exp/exp_10.exp3.json" } ], "Motions": { - "TapBody": [ + "Idle": [ + { + "File": "motions/mtn_00.motion3.json" + }, { "File": "motions/mtn_01.motion3.json" }, { "File": "motions/mtn_02.motion3.json" - }, + } + ], + "TapBody": [ { "File": "motions/mtn_03.motion3.json" }, @@ -75,14 +81,6 @@ }, { "File": "motions/mtn_07.motion3.json" - }, - { - "File": "motions/mtn_08.motion3.json" - } - ], - "Idle": [ - { - "File": "motions/mtn_00.motion3.json" } ] } @@ -90,17 +88,17 @@ "Groups": [ { "Target": "Parameter", - "Name": "EyeBlink", + "Name": "LipSync", "Ids": [ - "ParamEyeLOpen", - "ParamEyeROpen" + "ParamMouthOpenY" ] }, { "Target": "Parameter", - "Name": "LipSync", + "Name": "EyeBlink", "Ids": [ - "ParamMouthOpenY" + "ParamEyeLOpen", + "ParamEyeROpen" ] } ], @@ -114,4 +112,4 @@ "Name": "Body" } ] -} \ No newline at end of file +} diff --git a/Samples/Resources/Natori/exp/Angry.exp3.json b/Samples/Resources/Natori/exp/Angry.exp3.json new file mode 100644 index 0000000..49890a9 --- /dev/null +++ b/Samples/Resources/Natori/exp/Angry.exp3.json @@ -0,0 +1,135 @@ +{ + "Type": "Live2D Expression", + "Parameters": [ + { + "Id": "ParamEyeLOpen", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamEyeLSmile", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamEyeLForm", + "Value": -2, + "Blend": "Add" + }, + { + "Id": "ParamEyeROpen", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamEyeRSmile", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamEyeRForm", + "Value": -2, + "Blend": "Add" + }, + { + "Id": "ParamEyeBallForm", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamBrowLY", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamBrowRY", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamBrowLX", + "Value": 0.3, + "Blend": "Add" + }, + { + "Id": "ParamBrowRX", + "Value": 0.3, + "Blend": "Add" + }, + { + "Id": "ParamBrowLAngle", + "Value": -0.4, + "Blend": "Add" + }, + { + "Id": "ParamBrowRAngle", + "Value": -0.4, + "Blend": "Add" + }, + { + "Id": "ParamBrowLForm", + "Value": -1, + "Blend": "Add" + }, + { + "Id": "ParamBrowLForm2", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamBrowRForm", + "Value": -1, + "Blend": "Add" + }, + { + "Id": "ParamBrowRForm2", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamMouthForm", + "Value": -2, + "Blend": "Add" + }, + { + "Id": "ParamMouthOpenY", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamMouthForm2", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamTeethOn", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamCheek", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamGlassUD", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamGrassWhite", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamGrassHighlight", + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamGrassHighlightMove", + "Value": 0, + "Blend": "Add" + } + ] +} \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_07.exp3.json b/Samples/Resources/Natori/exp/Blushing.exp3.json similarity index 99% rename from Samples/Resources/Natori/exp/exp_07.exp3.json rename to Samples/Resources/Natori/exp/Blushing.exp3.json index cfda677..6850cf5 100644 --- a/Samples/Resources/Natori/exp/exp_07.exp3.json +++ b/Samples/Resources/Natori/exp/Blushing.exp3.json @@ -31,6 +31,11 @@ "Value": 0, "Blend": "Add" }, + { + "Id": "ParamEyeBallForm", + "Value": 0, + "Blend": "Add" + }, { "Id": "ParamBrowLY", "Value": 0, @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_00.exp3.json b/Samples/Resources/Natori/exp/Normal.exp3.json similarity index 99% rename from Samples/Resources/Natori/exp/exp_00.exp3.json rename to Samples/Resources/Natori/exp/Normal.exp3.json index 8b9b88c..b4f4bee 100644 --- a/Samples/Resources/Natori/exp/exp_00.exp3.json +++ b/Samples/Resources/Natori/exp/Normal.exp3.json @@ -31,6 +31,11 @@ "Value": 0, "Blend": "Add" }, + { + "Id": "ParamEyeBallForm", + "Value": 0, + "Blend": "Add" + }, { "Id": "ParamBrowLY", "Value": 0, @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_06.exp3.json b/Samples/Resources/Natori/exp/Sad.exp3.json similarity index 99% rename from Samples/Resources/Natori/exp/exp_06.exp3.json rename to Samples/Resources/Natori/exp/Sad.exp3.json index e9b5358..ddf964d 100644 --- a/Samples/Resources/Natori/exp/exp_06.exp3.json +++ b/Samples/Resources/Natori/exp/Sad.exp3.json @@ -31,6 +31,11 @@ "Value": -2, "Blend": "Add" }, + { + "Id": "ParamEyeBallForm", + "Value": 0, + "Blend": "Add" + }, { "Id": "ParamBrowLY", "Value": 0, @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_10.exp3.json b/Samples/Resources/Natori/exp/Smile.exp3.json similarity index 94% rename from Samples/Resources/Natori/exp/exp_10.exp3.json rename to Samples/Resources/Natori/exp/Smile.exp3.json index c47875e..db6d34e 100644 --- a/Samples/Resources/Natori/exp/exp_10.exp3.json +++ b/Samples/Resources/Natori/exp/Smile.exp3.json @@ -3,12 +3,12 @@ "Parameters": [ { "Id": "ParamEyeLOpen", - "Value": 0, - "Blend": "Multiply" + "Value": -1, + "Blend": "Add" }, { "Id": "ParamEyeLSmile", - "Value": 0, + "Value": 1, "Blend": "Add" }, { @@ -18,12 +18,12 @@ }, { "Id": "ParamEyeROpen", - "Value": 0, - "Blend": "Multiply" + "Value": -1, + "Blend": "Add" }, { "Id": "ParamEyeRSmile", - "Value": 0, + "Value": 1, "Blend": "Add" }, { @@ -31,6 +31,11 @@ "Value": 0, "Blend": "Add" }, + { + "Id": "ParamEyeBallForm", + "Value": 0, + "Blend": "Add" + }, { "Id": "ParamBrowLY", "Value": 0, @@ -68,12 +73,12 @@ }, { "Id": "ParamBrowLForm2", - "Value": 0, + "Value": 1, "Blend": "Add" }, { "Id": "ParamBrowRForm", - "Value": 1, + "Value": 0, "Blend": "Add" }, { @@ -83,7 +88,7 @@ }, { "Id": "ParamMouthForm", - "Value": -3, + "Value": 0, "Blend": "Add" }, { @@ -93,7 +98,7 @@ }, { "Id": "ParamMouthForm2", - "Value": 1, + "Value": 0, "Blend": "Add" }, { @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_08.exp3.json b/Samples/Resources/Natori/exp/Surprised.exp3.json similarity index 95% rename from Samples/Resources/Natori/exp/exp_08.exp3.json rename to Samples/Resources/Natori/exp/Surprised.exp3.json index 5a6706c..154205e 100644 --- a/Samples/Resources/Natori/exp/exp_08.exp3.json +++ b/Samples/Resources/Natori/exp/Surprised.exp3.json @@ -3,8 +3,8 @@ "Parameters": [ { "Id": "ParamEyeLOpen", - "Value": 1.3, - "Blend": "Multiply" + "Value": 0.3, + "Blend": "Add" }, { "Id": "ParamEyeLSmile", @@ -18,8 +18,8 @@ }, { "Id": "ParamEyeROpen", - "Value": 1.3, - "Blend": "Multiply" + "Value": 0.3, + "Blend": "Add" }, { "Id": "ParamEyeRSmile", @@ -31,6 +31,11 @@ "Value": 0, "Blend": "Add" }, + { + "Id": "ParamEyeBallForm", + "Value": -1, + "Blend": "Add" + }, { "Id": "ParamBrowLY", "Value": 0.2, @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": -1, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_01.exp3.json b/Samples/Resources/Natori/exp/exp_01.exp3.json index 32d232b..7f207a2 100644 --- a/Samples/Resources/Natori/exp/exp_01.exp3.json +++ b/Samples/Resources/Natori/exp/exp_01.exp3.json @@ -4,41 +4,46 @@ { "Id": "ParamEyeLOpen", "Value": 0, - "Blend": "Multiply" + "Blend": "Add" }, { "Id": "ParamEyeLSmile", - "Value": 1, + "Value": 0, "Blend": "Add" }, { "Id": "ParamEyeLForm", - "Value": 0, + "Value": 3, "Blend": "Add" }, { "Id": "ParamEyeROpen", "Value": 0, - "Blend": "Multiply" + "Blend": "Add" }, { "Id": "ParamEyeRSmile", - "Value": 1, + "Value": 0, "Blend": "Add" }, { "Id": "ParamEyeRForm", + "Value": 3, + "Blend": "Add" + }, + { + "Id": "ParamEyeBallForm", "Value": 0, "Blend": "Add" }, { "Id": "ParamBrowLY", - "Value": 0, + "Value": -0.1, "Blend": "Add" }, { "Id": "ParamBrowRY", - "Value": 0, + "Value": -0.1, "Blend": "Add" }, { @@ -63,7 +68,7 @@ }, { "Id": "ParamBrowLForm", - "Value": 1, + "Value": 0, "Blend": "Add" }, { @@ -78,12 +83,12 @@ }, { "Id": "ParamBrowRForm2", - "Value": 0, + "Value": 1, "Blend": "Add" }, { "Id": "ParamMouthForm", - "Value": 0, + "Value": 1, "Blend": "Add" }, { @@ -93,7 +98,7 @@ }, { "Id": "ParamMouthForm2", - "Value": 0, + "Value": 1, "Blend": "Add" }, { @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_02.exp3.json b/Samples/Resources/Natori/exp/exp_02.exp3.json index ff459e9..e3625f9 100644 --- a/Samples/Resources/Natori/exp/exp_02.exp3.json +++ b/Samples/Resources/Natori/exp/exp_02.exp3.json @@ -13,7 +13,7 @@ }, { "Id": "ParamEyeLForm", - "Value": 3, + "Value": 1, "Blend": "Add" }, { @@ -28,17 +28,22 @@ }, { "Id": "ParamEyeRForm", - "Value": 3, + "Value": 1, + "Blend": "Add" + }, + { + "Id": "ParamEyeBallForm", + "Value": 0, "Blend": "Add" }, { "Id": "ParamBrowLY", - "Value": -0.1, + "Value": 0.1, "Blend": "Add" }, { "Id": "ParamBrowRY", - "Value": -0.1, + "Value": 0.1, "Blend": "Add" }, { @@ -53,12 +58,12 @@ }, { "Id": "ParamBrowLAngle", - "Value": 0, + "Value": 0.1, "Blend": "Add" }, { "Id": "ParamBrowRAngle", - "Value": 0, + "Value": 0.1, "Blend": "Add" }, { @@ -93,12 +98,12 @@ }, { "Id": "ParamMouthForm2", - "Value": 1, + "Value": 0, "Blend": "Add" }, { "Id": "ParamTeethOn", - "Value": 0, + "Value": 1, "Blend": "Add" }, { @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_03.exp3.json b/Samples/Resources/Natori/exp/exp_03.exp3.json index 0e39b9e..8561301 100644 --- a/Samples/Resources/Natori/exp/exp_03.exp3.json +++ b/Samples/Resources/Natori/exp/exp_03.exp3.json @@ -13,7 +13,7 @@ }, { "Id": "ParamEyeLForm", - "Value": 1, + "Value": 0, "Blend": "Add" }, { @@ -28,17 +28,22 @@ }, { "Id": "ParamEyeRForm", - "Value": 1, + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamEyeBallForm", + "Value": 0, "Blend": "Add" }, { "Id": "ParamBrowLY", - "Value": 0.1, + "Value": 0, "Blend": "Add" }, { "Id": "ParamBrowRY", - "Value": 0.1, + "Value": 0, "Blend": "Add" }, { @@ -53,37 +58,37 @@ }, { "Id": "ParamBrowLAngle", - "Value": 0.1, + "Value": 0, "Blend": "Add" }, { "Id": "ParamBrowRAngle", - "Value": 0.1, + "Value": 0, "Blend": "Add" }, { "Id": "ParamBrowLForm", - "Value": 0, + "Value": -1, "Blend": "Add" }, { "Id": "ParamBrowLForm2", - "Value": 1, - "Blend": "Add" - }, - { - "Id": "ParamBrowRForm", "Value": 0, "Blend": "Add" }, + { + "Id": "ParamBrowRForm", + "Value": -1, + "Blend": "Add" + }, { "Id": "ParamBrowRForm2", - "Value": 1, + "Value": 0, "Blend": "Add" }, { "Id": "ParamMouthForm", - "Value": 1, + "Value": -2, "Blend": "Add" }, { @@ -93,12 +98,12 @@ }, { "Id": "ParamMouthForm2", - "Value": 0, + "Value": 1, "Blend": "Add" }, { "Id": "ParamTeethOn", - "Value": 1, + "Value": 0, "Blend": "Add" }, { @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_04.exp3.json b/Samples/Resources/Natori/exp/exp_04.exp3.json index 2729e8c..9606c56 100644 --- a/Samples/Resources/Natori/exp/exp_04.exp3.json +++ b/Samples/Resources/Natori/exp/exp_04.exp3.json @@ -3,7 +3,7 @@ "Parameters": [ { "Id": "ParamEyeLOpen", - "Value": 0, + "Value": 0.2, "Blend": "Add" }, { @@ -13,12 +13,12 @@ }, { "Id": "ParamEyeLForm", - "Value": -2, + "Value": 0, "Blend": "Add" }, { "Id": "ParamEyeROpen", - "Value": 0, + "Value": 0.2, "Blend": "Add" }, { @@ -28,42 +28,47 @@ }, { "Id": "ParamEyeRForm", - "Value": -2, + "Value": 0, + "Blend": "Add" + }, + { + "Id": "ParamEyeBallForm", + "Value": 0, "Blend": "Add" }, { "Id": "ParamBrowLY", - "Value": 0, + "Value": 0.2, "Blend": "Add" }, { "Id": "ParamBrowRY", - "Value": 0, + "Value": 0.2, "Blend": "Add" }, { "Id": "ParamBrowLX", - "Value": 0.3, + "Value": -0.1, "Blend": "Add" }, { "Id": "ParamBrowRX", - "Value": 0.3, + "Value": -0.1, "Blend": "Add" }, { "Id": "ParamBrowLAngle", - "Value": -0.4, + "Value": 0.1, "Blend": "Add" }, { "Id": "ParamBrowRAngle", - "Value": -0.4, + "Value": 0.1, "Blend": "Add" }, { "Id": "ParamBrowLForm", - "Value": -1, + "Value": 0, "Blend": "Add" }, { @@ -73,7 +78,7 @@ }, { "Id": "ParamBrowRForm", - "Value": -1, + "Value": 0, "Blend": "Add" }, { @@ -83,7 +88,7 @@ }, { "Id": "ParamMouthForm", - "Value": -2, + "Value": -3, "Blend": "Add" }, { @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_05.exp3.json b/Samples/Resources/Natori/exp/exp_05.exp3.json index cf62697..1e3f231 100644 --- a/Samples/Resources/Natori/exp/exp_05.exp3.json +++ b/Samples/Resources/Natori/exp/exp_05.exp3.json @@ -3,7 +3,7 @@ "Parameters": [ { "Id": "ParamEyeLOpen", - "Value": 0, + "Value": -1, "Blend": "Add" }, { @@ -18,7 +18,7 @@ }, { "Id": "ParamEyeROpen", - "Value": 0, + "Value": -1, "Blend": "Add" }, { @@ -31,6 +31,11 @@ "Value": 0, "Blend": "Add" }, + { + "Id": "ParamEyeBallForm", + "Value": 0, + "Blend": "Add" + }, { "Id": "ParamBrowLY", "Value": 0, @@ -63,7 +68,7 @@ }, { "Id": "ParamBrowLForm", - "Value": -1, + "Value": 1, "Blend": "Add" }, { @@ -73,7 +78,7 @@ }, { "Id": "ParamBrowRForm", - "Value": -1, + "Value": 1, "Blend": "Add" }, { @@ -83,7 +88,7 @@ }, { "Id": "ParamMouthForm", - "Value": -2, + "Value": -3, "Blend": "Add" }, { @@ -125,11 +130,6 @@ "Id": "ParamGrassHighlightMove", "Value": 0, "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/exp/exp_09.exp3.json b/Samples/Resources/Natori/exp/exp_09.exp3.json deleted file mode 100644 index 38a8ce7..0000000 --- a/Samples/Resources/Natori/exp/exp_09.exp3.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "Type": "Live2D Expression", - "Parameters": [ - { - "Id": "ParamEyeLOpen", - "Value": 1.2, - "Blend": "Multiply" - }, - { - "Id": "ParamEyeLSmile", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamEyeLForm", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamEyeROpen", - "Value": 1.2, - "Blend": "Multiply" - }, - { - "Id": "ParamEyeRSmile", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamEyeRForm", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamBrowLY", - "Value": 0.2, - "Blend": "Add" - }, - { - "Id": "ParamBrowRY", - "Value": 0.2, - "Blend": "Add" - }, - { - "Id": "ParamBrowLX", - "Value": -0.1, - "Blend": "Add" - }, - { - "Id": "ParamBrowRX", - "Value": -0.1, - "Blend": "Add" - }, - { - "Id": "ParamBrowLAngle", - "Value": 0.1, - "Blend": "Add" - }, - { - "Id": "ParamBrowRAngle", - "Value": 0.1, - "Blend": "Add" - }, - { - "Id": "ParamBrowLForm", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamBrowLForm2", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamBrowRForm", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamBrowRForm2", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamMouthForm", - "Value": -3, - "Blend": "Add" - }, - { - "Id": "ParamMouthOpenY", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamMouthForm2", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamTeethOn", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamCheek", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamGlassUD", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamGrassWhite", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamGrassHighlight", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamGrassHighlightMove", - "Value": 0, - "Blend": "Add" - }, - { - "Id": "ParamEyeBallForm", - "Value": 0, - "Blend": "Add" - } - ] -} \ No newline at end of file diff --git a/Samples/Resources/Natori/motions/mtn_00.motion3.json b/Samples/Resources/Natori/motions/mtn_00.motion3.json index 8b245d3..7525576 100644 --- a/Samples/Resources/Natori/motions/mtn_00.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_00.motion3.json @@ -1,17 +1,599 @@ { "Version": 3, "Meta": { - "Duration": 3.967, + "Duration": 7.97, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 1, - "TotalSegmentCount": 4, - "TotalPointCount": 13, + "CurveCount": 96, + "TotalSegmentCount": 105, + "TotalPointCount": 389, "UserDataCount": 0, "TotalUserDataSize": 0 }, "Curves": [ + { + "Target": "Parameter", + "Id": "ParamAngleX", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamAngleY", + "Segments": [ + 0, + 0, + 1, + 0.611, + 0, + 1.222, + 5, + 1.833, + 5, + 1, + 2.4, + 5, + 2.967, + 0, + 3.533, + 0, + 1, + 4.278, + 0, + 5.022, + 4, + 5.767, + 4, + 1, + 6.5, + 4, + 7.233, + 0.119, + 7.967, + 0.003 + ] + }, + { + "Target": "Parameter", + "Id": "ParamAngleZ", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeLOpen", + "Segments": [ + 0, + 1, + 1, + 2.656, + 1, + 5.311, + 1, + 7.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeLSmile", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeLForm", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeROpen", + "Segments": [ + 0, + 1, + 1, + 2.656, + 1, + 5.311, + 1, + 7.967, + 1 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeRSmile", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeRForm", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeBallX", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeBallY", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamEyeBallForm", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowLY", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowRY", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowLX", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowRX", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowLAngle", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowRAngle", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowLForm", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowLForm2", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowRForm", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBrowRForm2", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamMouthForm", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamMouthOpenY", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamMouthForm2", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamTeethOn", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamCheek", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamGlassUD", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamGrassWhite", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamGrassHighlight", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamGrassHighlightMove", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBodyAngleX", + "Segments": [ + 0, + 1, + 1, + 0.589, + 1, + 1.178, + -1, + 1.767, + -1, + 1, + 2.333, + -1, + 2.9, + 1, + 3.467, + 1, + 1, + 4.2, + 1, + 4.933, + -1, + 5.667, + -1, + 1, + 6.433, + -1, + 7.2, + 0.943, + 7.967, + 0.999 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBodyAngleY", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBodyAngleZ", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWaistAngleZ", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBodyPosition", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, { "Target": "Parameter", "Id": "ParamBreath", @@ -19,34 +601,877 @@ 0, 0, 1, - 0.089, + 0.6, 0, - 0.178, + 1.2, + 1, + 1.8, + 1, + 1, + 2.367, + 1, + 2.933, 0, - 0.267, + 3.5, 0, 1, - 0.756, + 4.244, 0, - 1.244, + 4.989, 1, - 1.733, + 5.733, 1, 1, - 1.844, + 6.478, 1, - 1.956, - 1, - 2.067, - 1, - 1, - 2.7, - 1, - 3.333, - 0.034, - 3.967, + 7.222, + 0.029, + 7.967, 0.001 ] + }, + { + "Target": "Parameter", + "Id": "ParamLeftShoulderUp", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamRightShoulderUp", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamAllX", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamAllY", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamAllRotate", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamHairFront", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamHairSide", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamHairBack", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamHairFrontFuwa", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamHairSideFuwa", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamHairBackFuwa", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamJacket", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamChainWaist", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchSwingA1", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchSwingA2", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchAX", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchBSwitch", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchBOpen", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchBX", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAL01", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAL02", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAL03", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAL04", + "FadeInTime": 0.2, + "Segments": [ + 0, + 0, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAR01", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAR02", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAR03", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmAR04", + "FadeInTime": 0.2, + "Segments": [ + 0, + 0, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBR01", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBR02", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBR03", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBRHand01Roll", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBRHand05Roll1", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBRHand05Roll2", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBRHand05Roll3", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmCR01", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmCR02", + "Segments": [ + 0, + -30, + 1, + 2.656, + -30, + 5.311, + -0.25, + 7.967, + -0.002 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmCR03", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmCLHandRoll1", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmDL01", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmDL02", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmDL03", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmDLHand03Roll", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmER01", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmER02", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmER03", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmER04", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmERHand04Roll1", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmERHand04Roll2", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmERHand06", + "Segments": [ + 0, + 0, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmERHand06Roll1", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmERHand06Roll2", + "Segments": [ + 0, + 0, + 1, + 2.656, + 0, + 5.311, + 0, + 7.967, + 0 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartWatchA", + "Segments": [ + 0, + 1, + 0, + 7.97, + 1 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartWatchB", + "Segments": [ + 0, + 0, + 0, + 7.97, + 0 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartArmAL", + "Segments": [ + 0, + 1, + 0, + 7.97, + 1 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartArmAR", + "Segments": [ + 0, + 1, + 0, + 7.97, + 1 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartArmBR", + "Segments": [ + 0, + 0, + 0, + 7.97, + 0 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartArmCL", + "Segments": [ + 0, + 0, + 0, + 7.97, + 0 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartArmDL", + "Segments": [ + 0, + 0, + 0, + 7.97, + 0 + ] + }, + { + "Target": "PartOpacity", + "Id": "PartArmER", + "Segments": [ + 0, + 0, + 0, + 7.97, + 0 + ] } ] } \ No newline at end of file diff --git a/Samples/Resources/Natori/motions/mtn_01.motion3.json b/Samples/Resources/Natori/motions/mtn_01.motion3.json index 7525576..e537aaa 100644 --- a/Samples/Resources/Natori/motions/mtn_01.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_01.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 7.97, + "Duration": 5, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 96, - "TotalSegmentCount": 105, - "TotalPointCount": 389, + "CurveCount": 97, + "TotalSegmentCount": 228, + "TotalPointCount": 587, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -19,12 +19,36 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.511, + 0, + 0.856, + 0, + 1.2, + 0, + 1, + 1.856, + 0, + 2.511, + -0.883, + 3.167, + -4, + 1, + 3.578, + -5.955, + 3.989, + -8.02, + 4.4, + -8.02, + 0, + 5, + -8.02 ] }, { @@ -34,33 +58,50 @@ 0, 0, 1, - 0.611, + 0.056, 0, - 1.222, - 5, - 1.833, - 5, - 1, - 2.4, - 5, - 2.967, + 0.111, 0, - 3.533, + 0.167, 0, 1, - 4.278, + 0.189, + 0, + 0.211, + 0, + 0.233, 0, - 5.022, - 4, - 5.767, - 4, 1, - 6.5, - 4, - 7.233, - 0.119, - 7.967, - 0.003 + 0.378, + 0, + 0.522, + 2.709, + 0.667, + 4.062, + 1, + 0.856, + 5.832, + 1.044, + 6, + 1.233, + 6, + 1, + 1.878, + 6, + 2.522, + -12, + 3.167, + -12, + 1, + 3.589, + -12, + 4.011, + -9, + 4.433, + -9, + 0, + 5, + -9 ] }, { @@ -70,12 +111,50 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.222, + 0, + 0.278, + 0, + 0.333, + 0, + 1, + 0.611, + 0, + 0.889, + 8, + 1.167, + 8, + 1, + 1.178, + 8, + 1.189, + 8, + 1.2, + 8, + 1, + 1.856, + 8, + 2.511, + -14, + 3.167, + -14, + 1, + 3.467, + -14, + 3.767, + -13, + 4.067, + -13, + 0, + 5, + -13 ] }, { @@ -85,12 +164,43 @@ 0, 1, 1, - 2.656, + 0.056, 1, - 5.311, + 0.111, 1, - 7.967, - 1 + 0.167, + 1, + 1, + 0.722, + 1, + 1.278, + 1, + 1.833, + 1, + 1, + 1.933, + 1, + 2.033, + 0, + 2.133, + 0, + 1, + 2.478, + 0, + 2.822, + 0, + 3.167, + 0, + 1, + 3.322, + 0, + 3.478, + 0.7, + 3.633, + 0.7, + 0, + 5, + 0.7 ] }, { @@ -99,12 +209,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -114,12 +220,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -130,12 +232,43 @@ 0, 1, 1, - 2.656, + 0.056, 1, - 5.311, + 0.111, 1, - 7.967, - 1 + 0.167, + 1, + 1, + 0.722, + 1, + 1.278, + 1, + 1.833, + 1, + 1, + 1.933, + 1, + 2.033, + 0, + 2.133, + 0, + 1, + 2.478, + 0, + 2.822, + 0, + 3.167, + 0, + 1, + 3.322, + 0, + 3.478, + 0.7, + 3.633, + 0.7, + 0, + 5, + 0.7 ] }, { @@ -144,12 +277,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -159,12 +288,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -175,12 +300,36 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.233, + 0, + 0.3, + 0, + 0.367, + 0, + 1, + 0.656, + 0, + 0.944, + 0, + 1.233, + 0, + 1, + 1.878, + 0, + 2.522, + -0.3, + 3.167, + -0.3, + 0, + 5, + -0.3 ] }, { @@ -190,12 +339,36 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.233, + 0, + 0.3, + 0, + 0.367, + 0, + 1, + 0.656, + 0, + 0.944, + -0.2, + 1.233, + -0.2, + 1, + 1.878, + -0.2, + 2.522, + -0.2, + 3.167, + -0.2, + 0, + 5, + -0.2 ] }, { @@ -205,11 +378,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -219,12 +395,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -234,12 +406,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -249,12 +417,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -264,12 +428,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -279,12 +439,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -294,12 +450,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -309,12 +461,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -324,12 +472,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -339,12 +483,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -354,12 +494,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -369,12 +505,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -384,12 +516,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -399,12 +527,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -414,12 +538,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -429,12 +549,8 @@ "Segments": [ 0, 0, - 1, - 2.656, 0, - 5.311, - 0, - 7.967, + 5, 0 ] }, @@ -445,11 +561,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -460,11 +579,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -475,11 +597,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -490,11 +615,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -503,35 +631,31 @@ "Id": "ParamBodyAngleX", "Segments": [ 0, - 1, - 1, - 0.589, - 1, - 1.178, - -1, - 1.767, -1, 1, - 2.333, + 0.056, -1, - 2.9, - 1, - 3.467, - 1, - 1, - 4.2, - 1, - 4.933, + 0.111, -1, - 5.667, + 0.167, -1, 1, - 6.433, + 0.489, -1, - 7.2, - 0.943, - 7.967, - 0.999 + 0.811, + 0, + 1.133, + 0, + 1, + 1.778, + 0, + 2.422, + -3, + 3.067, + -3, + 0, + 5, + -3 ] }, { @@ -541,12 +665,50 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.256, + 0, + 0.344, + 1.011, + 0.433, + 1.616, + 1, + 0.6, + 2.751, + 0.767, + 3, + 0.933, + 3, + 1, + 1, + 3, + 1.067, + 3, + 1.133, + 3, + 1, + 1.778, + 3, + 2.422, + -2, + 3.067, + -2, + 1, + 3.511, + -2, + 3.956, + -1.5, + 4.4, + -1.5, + 0, + 5, + -1.5 ] }, { @@ -556,11 +718,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -571,11 +736,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -586,11 +754,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -601,33 +772,36 @@ 0, 0, 1, - 0.6, + 0.056, 0, - 1.2, - 1, - 1.8, - 1, - 1, - 2.367, - 1, - 2.933, + 0.111, 0, - 3.5, + 0.167, 0, 1, - 4.244, + 0.467, 0, - 4.989, + 0.767, 1, - 5.733, + 1.067, 1, 1, - 6.478, + 1.089, 1, - 7.222, - 0.029, - 7.967, - 0.001 + 1.111, + 1, + 1.133, + 1, + 1, + 1.911, + 1, + 2.689, + 0, + 3.467, + 0, + 0, + 5, + 0 ] }, { @@ -637,12 +811,29 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.489, + 0, + 0.811, + 0, + 1.133, + 0, + 1, + 1.778, + 0, + 2.422, + -9, + 3.067, + -9, + 0, + 5, + -9 ] }, { @@ -652,12 +843,29 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.489, + 0, + 0.811, + 0, + 1.133, + 0, + 1, + 1.778, + 0, + 2.422, + 8, + 3.067, + 8, + 0, + 5, + 8 ] }, { @@ -667,11 +875,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -682,11 +893,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -697,11 +911,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -712,11 +929,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -727,11 +947,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -742,11 +965,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -757,11 +983,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -772,11 +1001,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -787,11 +1019,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -802,11 +1037,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -817,11 +1055,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -832,11 +1073,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -847,11 +1091,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -862,11 +1109,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -877,11 +1127,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -892,11 +1145,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -907,11 +1163,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -922,11 +1181,28 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 1, + 0.544, + 0, + 0.922, + 1, + 1.3, + 1, + 1, + 1.911, + 1, + 2.522, + 0, + 3.133, + 0, + 0, + 5, 0 ] }, @@ -937,11 +1213,28 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 1, + 0.556, + 0, + 0.944, + -1, + 1.333, + -1, + 1, + 1.944, + -1, + 2.556, + 0, + 3.167, + 0, + 0, + 5, 0 ] }, @@ -952,12 +1245,29 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.556, + 0, + 0.944, + 0, + 1.333, + 0, + 1, + 1.944, + 0, + 2.556, + -3, + 3.167, + -3, + 0, + 5, + -3 ] }, { @@ -968,7 +1278,7 @@ 0, 0, 0, - 7.967, + 5, 0 ] }, @@ -979,11 +1289,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -992,14 +1305,17 @@ "Id": "ParamArmAR02", "Segments": [ 0, - 0, + -40, 1, - 2.656, + 0.056, + -40, + 0.111, + -40, + 0.167, + -40, 0, - 5.311, - 0, - 7.967, - 0 + 5, + -40 ] }, { @@ -1007,14 +1323,17 @@ "Id": "ParamArmAR03", "Segments": [ 0, - 0, + -9, 1, - 2.656, + 0.056, + -9, + 0.111, + -9, + 0.167, + -9, 0, - 5.311, - 0, - 7.967, - 0 + 5, + -9 ] }, { @@ -1025,7 +1344,7 @@ 0, 0, 0, - 7.967, + 5, 0 ] }, @@ -1036,11 +1355,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1051,11 +1373,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1066,11 +1391,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1081,11 +1409,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1096,11 +1427,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1111,11 +1445,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1126,11 +1463,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1141,11 +1481,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1154,14 +1497,17 @@ "Id": "ParamArmCR02", "Segments": [ 0, - -30, + 0, 1, - 2.656, - -30, - 5.311, - -0.25, - 7.967, - -0.002 + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1171,11 +1517,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1186,11 +1535,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1201,11 +1553,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1216,11 +1571,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1231,11 +1589,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1246,11 +1607,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1261,12 +1625,36 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.2, + 0, + 0.233, + 0, + 0.267, + 0, + 1, + 0.6, + 0, + 0.933, + 6, + 1.267, + 6, + 1, + 1.9, + 6, + 2.533, + -2, + 3.167, + -2, + 0, + 5, + -2 ] }, { @@ -1276,12 +1664,36 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.544, + 0, + 0.922, + 3, + 1.3, + 3, + 1, + 1.933, + 3, + 2.567, + -2, + 3.2, + -2, + 1, + 3.589, + -2, + 3.978, + -1, + 4.367, + -1, + 0, + 5, + -1 ] }, { @@ -1291,12 +1703,43 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.211, + 0, + 0.256, + 0.2, + 0.3, + 0.2, + 1, + 0.633, + 0.2, + 0.967, + 0, + 1.3, + 0, + 1, + 1.933, + 0, + 2.567, + 2, + 3.2, + 2, + 1, + 3.589, + 2, + 3.978, + 1, + 4.367, + 1, + 0, + 5, + 1 ] }, { @@ -1306,12 +1749,48 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, - 0 + 0.167, + 0, + 1, + 0.533, + 0, + 0.9, + 0, + 1.267, + 0, + 1, + 1.9, + 0, + 2.533, + 2, + 3.167, + 2, + 0, + 5, + 2 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmERHand04", + "FadeInTime": 0.2, + "Segments": [ + 0, + 1, + 1, + 0.056, + 1, + 0.111, + 1, + 0.167, + 1, + 0, + 5, + 1 ] }, { @@ -1319,14 +1798,31 @@ "Id": "ParamArmERHand04Roll1", "Segments": [ 0, - 0, + 9, 1, - 2.656, + 0.056, + 9, + 0.111, + 9, + 0.167, + 9, + 1, + 0.556, + 9, + 0.944, + 11, + 1.333, + 11, + 1, + 2.067, + 11, + 2.8, + -23, + 3.533, + -23, 0, - 5.311, - 0, - 7.967, - 0 + 5, + -23 ] }, { @@ -1334,24 +1830,49 @@ "Id": "ParamArmERHand04Roll2", "Segments": [ 0, - 0, + 9, 1, - 2.656, + 0.056, + 9, + 0.111, + 9, + 0.167, + 9, + 1, + 0.556, + 9, + 0.944, + 14, + 1.333, + 14, + 1, + 2.067, + 14, + 2.8, + -14, + 3.533, + -14, 0, - 5.311, - 0, - 7.967, - 0 + 5, + -14 ] }, { "Target": "Parameter", "Id": "ParamArmERHand06", + "FadeInTime": 0.2, "Segments": [ 0, 0, + 1, + 0.056, 0, - 7.967, + 0.111, + 0, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1362,11 +1883,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1377,11 +1901,14 @@ 0, 0, 1, - 2.656, + 0.056, 0, - 5.311, + 0.111, 0, - 7.967, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1392,7 +1919,7 @@ 0, 1, 0, - 7.97, + 5, 1 ] }, @@ -1403,7 +1930,7 @@ 0, 0, 0, - 7.97, + 5, 0 ] }, @@ -1414,7 +1941,7 @@ 0, 1, 0, - 7.97, + 5, 1 ] }, @@ -1423,10 +1950,10 @@ "Id": "PartArmAR", "Segments": [ 0, - 1, 0, - 7.97, - 1 + 0, + 5, + 0 ] }, { @@ -1436,7 +1963,7 @@ 0, 0, 0, - 7.97, + 5, 0 ] }, @@ -1447,7 +1974,7 @@ 0, 0, 0, - 7.97, + 5, 0 ] }, @@ -1458,7 +1985,7 @@ 0, 0, 0, - 7.97, + 5, 0 ] }, @@ -1467,10 +1994,10 @@ "Id": "PartArmER", "Segments": [ 0, + 1, 0, - 0, - 7.97, - 0 + 5, + 1 ] } ] diff --git a/Samples/Resources/Natori/motions/mtn_02.motion3.json b/Samples/Resources/Natori/motions/mtn_02.motion3.json index e537aaa..401b59a 100644 --- a/Samples/Resources/Natori/motions/mtn_02.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_02.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 5, + "Duration": 5.5, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 97, - "TotalSegmentCount": 228, - "TotalPointCount": 587, + "CurveCount": 96, + "TotalSegmentCount": 262, + "TotalPointCount": 690, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,87 +26,20 @@ 0.167, 0, 1, - 0.511, + 0.822, 0, - 0.856, + 1.478, 0, - 1.2, + 2.133, 0, - 1, - 1.856, 0, - 2.511, - -0.883, - 3.167, - -4, - 1, - 3.578, - -5.955, - 3.989, - -8.02, - 4.4, - -8.02, - 0, - 5, - -8.02 + 5.5, + 0 ] }, { "Target": "Parameter", "Id": "ParamAngleY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.189, - 0, - 0.211, - 0, - 0.233, - 0, - 1, - 0.378, - 0, - 0.522, - 2.709, - 0.667, - 4.062, - 1, - 0.856, - 5.832, - 1.044, - 6, - 1.233, - 6, - 1, - 1.878, - 6, - 2.522, - -12, - 3.167, - -12, - 1, - 3.589, - -12, - 4.011, - -9, - 4.433, - -9, - 0, - 5, - -9 - ] - }, - { - "Target": "Parameter", - "Id": "ParamAngleZ", "Segments": [ 0, 0, @@ -125,36 +58,68 @@ 0.333, 0, 1, - 0.611, + 0.544, 0, - 0.889, - 8, - 1.167, - 8, + 0.756, + 10.2, + 0.967, + 10.2, 1, - 1.178, - 8, - 1.189, - 8, - 1.2, - 8, + 1.356, + 10.2, + 1.744, + -30, + 2.133, + -30, 1, - 1.856, - 8, - 2.511, - -14, - 3.167, - -14, + 2.267, + -30, + 2.4, + -27.952, + 2.533, + -27.952, 1, - 3.467, - -14, - 3.767, - -13, - 4.067, - -13, + 2.867, + -27.952, + 3.2, + -30, + 3.533, + -30, + 1, + 3.822, + -30, + 4.111, + 2.617, + 4.4, + 2.617, + 1, + 4.533, + 2.617, + 4.667, 0, - 5, - -13 + 4.8, + 0, + 0, + 5.5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamAngleZ", + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, + 0 ] }, { @@ -171,36 +136,36 @@ 0.167, 1, 1, - 0.722, + 0.567, 1, - 1.278, + 0.967, 1, - 1.833, + 1.367, 1, 1, - 1.933, + 1.478, 1, - 2.033, + 1.589, 0, - 2.133, + 1.7, 0, 1, - 2.478, + 2.4, 0, - 2.822, + 3.1, 0, - 3.167, + 3.8, 0, 1, - 3.322, + 3.944, 0, - 3.478, - 0.7, - 3.633, - 0.7, + 4.089, + 1, + 4.233, + 1, 0, - 5, - 0.7 + 5.5, + 1 ] }, { @@ -209,8 +174,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -220,8 +192,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -239,36 +218,36 @@ 0.167, 1, 1, - 0.722, + 0.567, 1, - 1.278, + 0.967, 1, - 1.833, + 1.367, 1, 1, - 1.933, + 1.478, 1, - 2.033, + 1.589, 0, - 2.133, + 1.7, 0, 1, - 2.478, + 2.4, 0, - 2.822, + 3.1, 0, - 3.167, + 3.8, 0, 1, - 3.322, + 3.944, 0, - 3.478, - 0.7, - 3.633, - 0.7, + 4.089, + 1, + 4.233, + 1, 0, - 5, - 0.7 + 5.5, + 1 ] }, { @@ -277,8 +256,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -288,8 +274,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -306,30 +299,9 @@ 0, 0.167, 0, - 1, - 0.233, 0, - 0.3, - 0, - 0.367, - 0, - 1, - 0.656, - 0, - 0.944, - 0, - 1.233, - 0, - 1, - 1.878, - 0, - 2.522, - -0.3, - 3.167, - -0.3, - 0, - 5, - -0.3 + 5.5, + 0 ] }, { @@ -345,30 +317,9 @@ 0, 0.167, 0, - 1, - 0.233, 0, - 0.3, - 0, - 0.367, - 0, - 1, - 0.656, - 0, - 0.944, - -0.2, - 1.233, - -0.2, - 1, - 1.878, - -0.2, - 2.522, - -0.2, - 3.167, - -0.2, - 0, - 5, - -0.2 + 5.5, + 0 ] }, { @@ -385,7 +336,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -395,8 +346,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -406,8 +364,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -417,8 +382,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -428,8 +400,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -439,8 +418,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -450,8 +436,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -461,8 +454,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -472,8 +472,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -483,8 +490,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -494,8 +508,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -505,8 +526,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -516,8 +544,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -527,8 +562,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -538,8 +580,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -549,8 +598,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, 0 ] }, @@ -568,7 +624,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -586,7 +642,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -604,7 +660,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -622,7 +678,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -631,31 +687,45 @@ "Id": "ParamBodyAngleX", "Segments": [ 0, - -1, + 0, 1, 0.056, - -1, + 0, 0.111, - -1, + 0, 0.167, - -1, - 1, - 0.489, - -1, - 0.811, - 0, - 1.133, 0, 1, - 1.778, + 0.411, 0, - 2.422, - -3, - 3.067, - -3, + 0.656, + 1.24, + 0.9, + 1.24, + 1, + 1.3, + 1.24, + 1.7, + -5, + 2.1, + -5.92, + 1, + 2.533, + -6.917, + 2.967, + -6.78, + 3.4, + -6.78, + 1, + 3.856, + -6.78, + 4.311, 0, - 5, - -3 + 4.767, + 0, + 0, + 5.5, + 0 ] }, { @@ -671,44 +741,9 @@ 0, 0.167, 0, - 1, - 0.256, 0, - 0.344, - 1.011, - 0.433, - 1.616, - 1, - 0.6, - 2.751, - 0.767, - 3, - 0.933, - 3, - 1, - 1, - 3, - 1.067, - 3, - 1.133, - 3, - 1, - 1.778, - 3, - 2.422, - -2, - 3.067, - -2, - 1, - 3.511, - -2, - 3.956, - -1.5, - 4.4, - -1.5, - 0, - 5, - -1.5 + 5.5, + 0 ] }, { @@ -724,8 +759,36 @@ 0, 0.167, 0, + 1, + 0.411, 0, - 5, + 0.656, + 1, + 0.9, + 1, + 1, + 1.311, + 1, + 1.722, + -1.464, + 2.133, + -2, + 1, + 2.567, + -2.564, + 3, + -2.5, + 3.433, + -2.5, + 1, + 3.878, + -2.5, + 4.322, + 0, + 4.767, + 0, + 0, + 5.5, 0 ] }, @@ -742,8 +805,36 @@ 0, 0.167, 0, + 1, + 0.422, 0, - 5, + 0.678, + 2, + 0.933, + 2, + 1, + 1.333, + 2, + 1.733, + -1.026, + 2.133, + -2, + 1, + 2.567, + -3.055, + 3, + -3, + 3.433, + -3, + 1, + 3.878, + -3, + 4.322, + 0, + 4.767, + 0, + 0, + 5.5, 0 ] }, @@ -760,8 +851,50 @@ 0, 0.167, 0, + 1, + 0.411, 0, - 5, + 0.656, + -1, + 0.9, + -1, + 1, + 1.289, + -1, + 1.678, + 9.133, + 2.067, + 9.133, + 1, + 2.178, + 9.133, + 2.289, + 9, + 2.4, + 9, + 1, + 2.656, + 9, + 2.911, + 9, + 3.167, + 9, + 1, + 3.478, + 9, + 3.789, + -0.5, + 4.1, + -0.5, + 1, + 4.422, + -0.5, + 4.744, + 0, + 5.067, + 0, + 0, + 5.5, 0 ] }, @@ -779,28 +912,35 @@ 0.167, 0, 1, - 0.467, + 0.411, 0, - 0.767, + 0.656, 1, - 1.067, + 0.9, 1, 1, - 1.089, + 1.733, 1, - 1.111, - 1, - 1.133, - 1, - 1, - 1.911, - 1, - 2.689, + 2.567, 0, - 3.467, + 3.4, + 0, + 1, + 3.633, + 0, + 3.867, + 0.6, + 4.1, + 0.6, + 1, + 4.333, + 0.6, + 4.567, + 0, + 4.8, 0, 0, - 5, + 5.5, 0 ] }, @@ -818,22 +958,29 @@ 0.167, 0, 1, - 0.489, + 0.422, 0, - 0.811, + 0.678, 0, - 1.133, + 0.933, 0, 1, - 1.778, + 1.322, 0, - 2.422, + 1.711, -9, - 3.067, + 2.1, -9, + 1, + 2.989, + -9, + 3.878, 0, - 5, - -9 + 4.767, + 0, + 0, + 5.5, + 0 ] }, { @@ -850,22 +997,29 @@ 0.167, 0, 1, - 0.489, + 0.422, 0, - 0.811, + 0.678, 0, - 1.133, + 0.933, 0, 1, - 1.778, + 1.322, 0, - 2.422, + 1.711, 8, - 3.067, + 2.1, 8, + 1, + 2.989, + 8, + 3.878, 0, - 5, - 8 + 4.767, + 0, + 0, + 5.5, + 0 ] }, { @@ -882,7 +1036,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -900,7 +1054,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -918,7 +1072,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -936,7 +1090,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -954,7 +1108,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -972,7 +1126,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -990,7 +1144,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1008,7 +1162,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1026,7 +1180,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1044,7 +1198,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1062,7 +1216,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1080,7 +1234,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1098,7 +1252,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1116,7 +1270,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1134,7 +1288,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1152,7 +1306,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1170,7 +1324,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1187,22 +1341,8 @@ 0, 0.167, 0, - 1, - 0.544, 0, - 0.922, - 1, - 1.3, - 1, - 1, - 1.911, - 1, - 2.522, - 0, - 3.133, - 0, - 0, - 5, + 5.5, 0 ] }, @@ -1211,31 +1351,17 @@ "Id": "ParamArmAL02", "Segments": [ 0, - 0, + -28, 1, 0.056, - 0, + -28, 0.111, - 0, + -28, 0.167, + -28, 0, - 1, - 0.556, - 0, - 0.944, - -1, - 1.333, - -1, - 1, - 1.944, - -1, - 2.556, - 0, - 3.167, - 0, - 0, - 5, - 0 + 5.5, + -28 ] }, { @@ -1243,31 +1369,17 @@ "Id": "ParamArmAL03", "Segments": [ 0, - 0, + 19, 1, 0.056, - 0, + 19, 0.111, - 0, + 19, 0.167, + 19, 0, - 1, - 0.556, - 0, - 0.944, - 0, - 1.333, - 0, - 1, - 1.944, - 0, - 2.556, - -3, - 3.167, - -3, - 0, - 5, - -3 + 5.5, + 19 ] }, { @@ -1278,7 +1390,7 @@ 0, 0, 0, - 5, + 5.5, 0 ] }, @@ -1295,8 +1407,43 @@ 0, 0.167, 0, + 1, + 0.422, 0, - 5, + 0.678, + 0.8, + 0.933, + 0.8, + 1, + 1.322, + 0.8, + 1.711, + -3, + 2.1, + -3, + 1, + 2.556, + -3, + 3.011, + -3, + 3.467, + -3, + 1, + 3.789, + -3, + 4.111, + 0.8, + 4.433, + 0.8, + 1, + 4.589, + 0.8, + 4.744, + 0, + 4.9, + 0, + 0, + 5.5, 0 ] }, @@ -1305,17 +1452,52 @@ "Id": "ParamArmAR02", "Segments": [ 0, - -40, + 0, 1, 0.056, - -40, - 0.111, - -40, - 0.167, - -40, 0, - 5, - -40 + 0.111, + 0, + 0.167, + 0, + 1, + 0.433, + 0, + 0.7, + 0.8, + 0.967, + 0.8, + 1, + 1.356, + 0.8, + 1.744, + -6, + 2.133, + -6, + 1, + 2.589, + -6, + 3.044, + -6, + 3.5, + -6, + 1, + 3.822, + -6, + 4.144, + 1, + 4.467, + 1, + 1, + 4.622, + 1, + 4.778, + 0, + 4.933, + 0, + 0, + 5.5, + 0 ] }, { @@ -1323,17 +1505,52 @@ "Id": "ParamArmAR03", "Segments": [ 0, - -9, + 0, 1, 0.056, - -9, - 0.111, - -9, - 0.167, - -9, 0, - 5, - -9 + 0.111, + 0, + 0.167, + 0, + 1, + 0.433, + 0, + 0.7, + 0, + 0.967, + 0, + 1, + 1.356, + 0, + 1.744, + -10, + 2.133, + -10, + 1, + 2.589, + -10, + 3.044, + -10, + 3.5, + -10, + 1, + 3.822, + -10, + 4.144, + 1, + 4.467, + 1, + 1, + 4.622, + 1, + 4.778, + 0, + 4.933, + 0, + 0, + 5.5, + 0 ] }, { @@ -1343,8 +1560,43 @@ "Segments": [ 0, 0, + 1, + 0.311, 0, - 5, + 0.622, + 0, + 0.933, + 0, + 1, + 0.944, + 0, + 0.956, + -1, + 0.967, + -1, + 1, + 2.111, + -1, + 3.256, + -1, + 4.4, + -1, + 1, + 4.411, + -1, + 4.422, + 0, + 4.433, + 0, + 1, + 4.733, + 0, + 5.033, + 0, + 5.333, + 0, + 0, + 5.5, 0 ] }, @@ -1362,7 +1614,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1380,7 +1632,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1398,7 +1650,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1416,7 +1668,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1434,7 +1686,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1452,7 +1704,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1470,7 +1722,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1479,17 +1731,45 @@ "Id": "ParamArmCR01", "Segments": [ 0, - 0, + 3, 1, 0.056, - 0, + 3, 0.111, - 0, + 3, 0.167, - 0, - 0, + 3, + 1, + 0.422, + 3, + 0.678, 5, - 0 + 0.933, + 5, + 1, + 1.311, + 5, + 1.689, + -6, + 2.067, + -6, + 1, + 2.522, + -6, + 2.978, + -6, + 3.433, + -6, + 1, + 3.922, + -6, + 4.411, + 3, + 4.9, + 3, + 0, + 5.5, + 3 ] }, { @@ -1497,17 +1777,45 @@ "Id": "ParamArmCR02", "Segments": [ 0, - 0, + -29, 1, 0.056, - 0, + -29, 0.111, - 0, + -29, 0.167, + -29, + 1, + 0.444, + -29, + 0.722, + -30, + 1, + -30, + 1, + 1.367, + -30, + 1.733, + -21, + 2.1, + -21, + 1, + 2.556, + -21, + 3.011, + -21, + 3.467, + -21, + 1, + 3.956, + -21, + 4.444, + -29, + 4.933, + -29, 0, - 0, - 5, - 0 + 5.5, + -29 ] }, { @@ -1515,17 +1823,45 @@ "Id": "ParamArmCR03", "Segments": [ 0, - 0, + 11, 1, 0.056, - 0, + 11, 0.111, - 0, + 11, 0.167, + 11, + 1, + 0.444, + 11, + 0.722, + 9, + 1, + 9, + 1, + 1.367, + 9, + 1.733, + 28, + 2.1, + 28, + 1, + 2.556, + 28, + 3.011, + 28, + 3.467, + 28, + 1, + 3.956, + 28, + 4.444, + 11, + 4.933, + 11, 0, - 0, - 5, - 0 + 5.5, + 11 ] }, { @@ -1533,17 +1869,45 @@ "Id": "ParamArmCLHandRoll1", "Segments": [ 0, - 0, + -18, 1, 0.056, - 0, + -18, 0.111, - 0, + -18, 0.167, + -18, + 1, + 0.456, + -18, + 0.744, + -18.077, + 1.033, + -21, + 1, + 1.411, + -24.822, + 1.789, + -30, + 2.167, + -30, + 1, + 2.622, + -30, + 3.078, + -30, + 3.533, + -30, + 1, + 4, + -30, + 4.467, + -18, + 4.933, + -18, 0, - 0, - 5, - 0 + 5.5, + -18 ] }, { @@ -1560,7 +1924,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1578,7 +1942,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1596,7 +1960,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1614,7 +1978,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1631,30 +1995,9 @@ 0, 0.167, 0, - 1, - 0.2, 0, - 0.233, - 0, - 0.267, - 0, - 1, - 0.6, - 0, - 0.933, - 6, - 1.267, - 6, - 1, - 1.9, - 6, - 2.533, - -2, - 3.167, - -2, - 0, - 5, - -2 + 5.5, + 0 ] }, { @@ -1670,30 +2013,9 @@ 0, 0.167, 0, - 1, - 0.544, 0, - 0.922, - 3, - 1.3, - 3, - 1, - 1.933, - 3, - 2.567, - -2, - 3.2, - -2, - 1, - 3.589, - -2, - 3.978, - -1, - 4.367, - -1, - 0, - 5, - -1 + 5.5, + 0 ] }, { @@ -1709,37 +2031,9 @@ 0, 0.167, 0, - 1, - 0.211, 0, - 0.256, - 0.2, - 0.3, - 0.2, - 1, - 0.633, - 0.2, - 0.967, - 0, - 1.3, - 0, - 1, - 1.933, - 0, - 2.567, - 2, - 3.2, - 2, - 1, - 3.589, - 2, - 3.978, - 1, - 4.367, - 1, - 0, - 5, - 1 + 5.5, + 0 ] }, { @@ -1755,29 +2049,14 @@ 0, 0.167, 0, - 1, - 0.533, 0, - 0.9, - 0, - 1.267, - 0, - 1, - 1.9, - 0, - 2.533, - 2, - 3.167, - 2, - 0, - 5, - 2 + 5.5, + 0 ] }, { "Target": "Parameter", "Id": "ParamArmERHand04", - "FadeInTime": 0.2, "Segments": [ 0, 1, @@ -1789,7 +2068,7 @@ 0.167, 1, 0, - 5, + 5.5, 1 ] }, @@ -1798,69 +2077,22 @@ "Id": "ParamArmERHand04Roll1", "Segments": [ 0, - 9, + 0, 1, 0.056, - 9, - 0.111, - 9, - 0.167, - 9, - 1, - 0.556, - 9, - 0.944, - 11, - 1.333, - 11, - 1, - 2.067, - 11, - 2.8, - -23, - 3.533, - -23, 0, - 5, - -23 + 0.111, + 0, + 0.167, + 0, + 0, + 5.5, + 0 ] }, { "Target": "Parameter", "Id": "ParamArmERHand04Roll2", - "Segments": [ - 0, - 9, - 1, - 0.056, - 9, - 0.111, - 9, - 0.167, - 9, - 1, - 0.556, - 9, - 0.944, - 14, - 1.333, - 14, - 1, - 2.067, - 14, - 2.8, - -14, - 3.533, - -14, - 0, - 5, - -14 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmERHand06", - "FadeInTime": 0.2, "Segments": [ 0, 0, @@ -1872,7 +2104,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1890,7 +2122,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1908,7 +2140,7 @@ 0.167, 0, 0, - 5, + 5.5, 0 ] }, @@ -1919,7 +2151,7 @@ 0, 1, 0, - 5, + 5.5, 1 ] }, @@ -1930,7 +2162,7 @@ 0, 0, 0, - 5, + 5.5, 0 ] }, @@ -1939,10 +2171,10 @@ "Id": "PartArmAL", "Segments": [ 0, - 1, 0, - 5, - 1 + 0, + 5.5, + 0 ] }, { @@ -1950,10 +2182,10 @@ "Id": "PartArmAR", "Segments": [ 0, + 1, 0, - 0, - 5, - 0 + 5.5, + 1 ] }, { @@ -1963,7 +2195,7 @@ 0, 0, 0, - 5, + 5.5, 0 ] }, @@ -1972,10 +2204,10 @@ "Id": "PartArmCL", "Segments": [ 0, + 1, 0, - 0, - 5, - 0 + 5.5, + 1 ] }, { @@ -1985,7 +2217,7 @@ 0, 0, 0, - 5, + 5.5, 0 ] }, @@ -1994,10 +2226,10 @@ "Id": "PartArmER", "Segments": [ 0, - 1, 0, - 5, - 1 + 0, + 5.5, + 0 ] } ] diff --git a/Samples/Resources/Natori/motions/mtn_03.motion3.json b/Samples/Resources/Natori/motions/mtn_03.motion3.json index 401b59a..169798a 100644 --- a/Samples/Resources/Natori/motions/mtn_03.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_03.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 5.5, + "Duration": 5, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 96, - "TotalSegmentCount": 262, - "TotalPointCount": 690, + "CurveCount": 101, + "TotalSegmentCount": 318, + "TotalPointCount": 853, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,14 +26,35 @@ 0.167, 0, 1, - 0.822, + 0.322, 0, - 1.478, + 0.478, 0, - 2.133, + 0.633, + 0, + 1, + 1.089, + 0, + 1.544, + -10.65, + 2, + -14, + 1, + 2.211, + -15.553, + 2.422, + -15, + 2.633, + -15, + 1, + 2.844, + -15, + 3.056, + 0, + 3.267, 0, 0, - 5.5, + 5, 0 ] }, @@ -51,56 +72,42 @@ 0.167, 0, 1, - 0.222, - 0, 0.278, 0, - 0.333, - 0, + 0.389, 1, - 0.544, - 0, - 0.756, - 10.2, - 0.967, - 10.2, + 0.5, + 1, + 1, + 0.744, + 1, + 0.989, + -16.215, + 1.233, + -16.215, + 1, + 1.433, + -16.215, + 1.633, + -11.8, + 1.833, + -11.8, 1, - 1.356, - 10.2, - 1.744, - -30, 2.133, - -30, + -11.8, + 2.433, + -14.898, + 2.733, + -14.898, 1, - 2.267, - -30, - 2.4, - -27.952, - 2.533, - -27.952, - 1, - 2.867, - -27.952, - 3.2, - -30, - 3.533, - -30, - 1, - 3.822, - -30, - 4.111, - 2.617, - 4.4, - 2.617, - 1, - 4.533, - 2.617, - 4.667, + 3.056, + -14.898, + 3.378, 0, - 4.8, + 3.7, 0, 0, - 5.5, + 5, 0 ] }, @@ -111,14 +118,35 @@ 0, 0, 1, - 0.056, + 0.189, 0, - 0.111, + 0.378, 0, - 0.167, + 0.567, + 0, + 1, + 0.867, + 0, + 1.167, + 10, + 1.467, + 10, + 1, + 1.8, + 10, + 2.133, + 10, + 2.467, + 10, + 1, + 2.733, + 10, + 3, + 0, + 3.267, 0, 0, - 5.5, + 5, 0 ] }, @@ -136,35 +164,63 @@ 0.167, 1, 1, - 0.567, + 0.378, 1, + 0.589, + 1, + 0.8, + 1, + 1, + 0.833, + 1, + 0.867, + 0, + 0.9, + 0, + 1, + 0.922, + 0, + 0.944, + 0, 0.967, - 1, - 1.367, - 1, - 1, - 1.478, - 1, - 1.589, - 0, - 1.7, 0, 1, - 2.4, + 1.044, 0, - 3.1, + 1.122, + 1, + 1.2, + 1, + 1, + 1.711, + 1, + 2.222, + 1, + 2.733, + 1, + 1, + 2.767, + 1, + 2.8, 0, - 3.8, + 2.833, 0, 1, - 3.944, + 2.856, + 0, + 2.878, + 0, + 2.9, 0, - 4.089, 1, - 4.233, + 2.978, + 0, + 3.056, + 1, + 3.133, 1, 0, - 5.5, + 5, 1 ] }, @@ -182,7 +238,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -200,7 +256,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -218,35 +274,63 @@ 0.167, 1, 1, - 0.567, + 0.378, 1, + 0.589, + 1, + 0.8, + 1, + 1, + 0.833, + 1, + 0.867, + 0, + 0.9, + 0, + 1, + 0.922, + 0, + 0.944, + 0, 0.967, - 1, - 1.367, - 1, - 1, - 1.478, - 1, - 1.589, - 0, - 1.7, 0, 1, - 2.4, + 1.044, 0, - 3.1, + 1.122, + 1, + 1.2, + 1, + 1, + 1.711, + 1, + 2.222, + 1, + 2.733, + 1, + 1, + 2.767, + 1, + 2.8, 0, - 3.8, + 2.833, 0, 1, - 3.944, + 2.856, + 0, + 2.878, + 0, + 2.9, 0, - 4.089, 1, - 4.233, + 2.978, + 0, + 3.056, + 1, + 3.133, 1, 0, - 5.5, + 5, 1 ] }, @@ -264,7 +348,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -282,7 +366,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -299,8 +383,36 @@ 0, 0.167, 0, + 1, + 0.322, 0, - 5.5, + 0.478, + 0, + 0.633, + 0, + 1, + 0.833, + 0, + 1.033, + -0.5, + 1.233, + -0.5, + 1, + 1.7, + -0.5, + 2.167, + -0.5, + 2.633, + -0.5, + 1, + 2.833, + -0.5, + 3.033, + 0, + 3.233, + 0, + 0, + 5, 0 ] }, @@ -317,8 +429,36 @@ 0, 0.167, 0, + 1, + 0.322, 0, - 5.5, + 0.478, + 0, + 0.633, + 0, + 1, + 0.833, + 0, + 1.033, + -0.2, + 1.233, + -0.2, + 1, + 1.7, + -0.2, + 2.167, + -0.2, + 2.633, + -0.2, + 1, + 2.833, + -0.2, + 3.033, + 0, + 3.233, + 0, + 0, + 5, 0 ] }, @@ -336,7 +476,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -345,17 +485,17 @@ "Id": "ParamBrowLY", "Segments": [ 0, - 0, + -0.1, 1, 0.056, - 0, + -0.1, 0.111, - 0, + -0.1, 0.167, + -0.1, 0, - 0, - 5.5, - 0 + 5, + -0.1 ] }, { @@ -363,17 +503,17 @@ "Id": "ParamBrowRY", "Segments": [ 0, - 0, + -0.1, 1, 0.056, - 0, + -0.1, 0.111, - 0, + -0.1, 0.167, + -0.1, 0, - 0, - 5.5, - 0 + 5, + -0.1 ] }, { @@ -390,7 +530,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -408,7 +548,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -426,7 +566,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -444,7 +584,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -453,17 +593,17 @@ "Id": "ParamBrowLForm", "Segments": [ 0, - 0, + 1, 1, 0.056, - 0, + 1, 0.111, - 0, + 1, 0.167, + 1, 0, - 0, - 5.5, - 0 + 5, + 1 ] }, { @@ -471,17 +611,17 @@ "Id": "ParamBrowLForm2", "Segments": [ 0, - 0, + 1, 1, 0.056, - 0, + 1, 0.111, - 0, + 1, 0.167, + 1, 0, - 0, - 5.5, - 0 + 5, + 1 ] }, { @@ -489,17 +629,17 @@ "Id": "ParamBrowRForm", "Segments": [ 0, - 0, + 1, 1, 0.056, - 0, + 1, 0.111, - 0, + 1, 0.167, + 1, 0, - 0, - 5.5, - 0 + 5, + 1 ] }, { @@ -507,17 +647,17 @@ "Id": "ParamBrowRForm2", "Segments": [ 0, - 0, + 1, 1, 0.056, - 0, + 1, 0.111, - 0, + 1, 0.167, + 1, 0, - 0, - 5.5, - 0 + 5, + 1 ] }, { @@ -534,7 +674,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -552,7 +692,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -570,7 +710,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -588,7 +728,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -606,7 +746,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -624,7 +764,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -642,7 +782,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -660,7 +800,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -670,15 +810,8 @@ "Segments": [ 0, 0, - 1, - 0.056, 0, - 0.111, - 0, - 0.167, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -696,35 +829,35 @@ 0.167, 0, 1, - 0.411, + 0.333, 0, - 0.656, - 1.24, - 0.9, - 1.24, + 0.5, + 0.5, + 0.667, + 0.5, 1, - 1.3, - 1.24, - 1.7, - -5, - 2.1, - -5.92, + 0.922, + 0.5, + 1.178, + -3, + 1.433, + -3, 1, - 2.533, - -6.917, - 2.967, - -6.78, - 3.4, - -6.78, + 1.789, + -3, + 2.144, + -3, + 2.5, + -3, 1, - 3.856, - -6.78, - 4.311, + 2.722, + -3, + 2.944, 0, - 4.767, + 3.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -741,8 +874,36 @@ 0, 0.167, 0, + 1, + 0.333, 0, - 5.5, + 0.5, + -0.538, + 0.667, + -1, + 1, + 0.878, + -1.585, + 1.089, + -1.707, + 1.3, + -1.707, + 1, + 1.711, + -1.707, + 2.122, + 0.274, + 2.533, + 0.274, + 1, + 2.767, + 0.274, + 3, + 0, + 3.233, + 0, + 0, + 5, 0 ] }, @@ -759,36 +920,8 @@ 0, 0.167, 0, - 1, - 0.411, 0, - 0.656, - 1, - 0.9, - 1, - 1, - 1.311, - 1, - 1.722, - -1.464, - 2.133, - -2, - 1, - 2.567, - -2.564, - 3, - -2.5, - 3.433, - -2.5, - 1, - 3.878, - -2.5, - 4.322, - 0, - 4.767, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -805,36 +938,8 @@ 0, 0.167, 0, - 1, - 0.422, 0, - 0.678, - 2, - 0.933, - 2, - 1, - 1.333, - 2, - 1.733, - -1.026, - 2.133, - -2, - 1, - 2.567, - -3.055, - 3, - -3, - 3.433, - -3, - 1, - 3.878, - -3, - 4.322, - 0, - 4.767, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -852,49 +957,21 @@ 0.167, 0, 1, - 0.411, + 0.356, 0, - 0.656, - -1, - 0.9, - -1, - 1, - 1.289, - -1, - 1.678, - 9.133, - 2.067, - 9.133, - 1, - 2.178, - 9.133, - 2.289, - 9, - 2.4, - 9, - 1, - 2.656, - 9, - 2.911, - 9, - 3.167, - 9, - 1, - 3.478, - 9, - 3.789, - -0.5, - 4.1, - -0.5, - 1, - 4.422, - -0.5, - 4.744, + 0.544, 0, - 5.067, + 0.733, + 0, + 1, + 1.489, + 0, + 2.244, + 0, + 3, 0, 0, - 5.5, + 5, 0 ] }, @@ -912,35 +989,35 @@ 0.167, 0, 1, - 0.411, + 0.333, 0, - 0.656, - 1, - 0.9, - 1, - 1, - 1.733, - 1, - 2.567, + 0.5, 0, - 3.4, + 0.667, 0, 1, - 3.633, + 0.944, 0, - 3.867, + 1.222, + 0.42, + 1.5, + 0.5, + 1, + 1.867, + 0.605, + 2.233, 0.6, - 4.1, + 2.6, 0.6, 1, - 4.333, + 3.111, 0.6, - 4.567, + 3.622, 0, - 4.8, + 4.133, 0, 0, - 5.5, + 5, 0 ] }, @@ -958,28 +1035,35 @@ 0.167, 0, 1, - 0.422, + 0.333, 0, - 0.678, + 0.5, 0, - 0.933, + 0.667, 0, 1, - 1.322, + 0.922, 0, - 1.711, - -9, - 2.1, + 1.178, + -8.227, + 1.433, -9, 1, + 1.789, + -10.076, + 2.144, + -10, + 2.5, + -10, + 1, + 2.744, + -10, 2.989, - -9, - 3.878, 0, - 4.767, + 3.233, 0, 0, - 5.5, + 5, 0 ] }, @@ -988,38 +1072,59 @@ "Id": "ParamRightShoulderUp", "Segments": [ 0, - 0, + 8, 1, 0.056, - 0, + 8, 0.111, - 0, + 8, 0.167, - 0, - 1, - 0.422, - 0, - 0.678, - 0, - 0.933, - 0, - 1, - 1.322, - 0, - 1.711, - 8, - 2.1, 8, 1, - 2.989, + 0.267, 8, - 3.878, + 0.367, + 8, + 0.467, + 8, + 1, + 0.533, + 8, + 0.6, + 4, + 0.667, + 4, + 1, + 0.767, + 4, + 0.867, + 9, + 0.967, + 9, + 1, + 1.5, + 9, + 2.033, + 9, + 2.567, + 9, + 1, + 2.722, + 9, + 2.878, 0, - 4.767, + 3.033, 0, + 1, + 3.267, 0, - 5.5, - 0 + 3.5, + 8, + 3.733, + 8, + 0, + 5, + 8 ] }, { @@ -1036,7 +1141,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1054,7 +1159,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1072,7 +1177,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1090,7 +1195,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1108,7 +1213,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1126,7 +1231,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1144,7 +1249,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1162,7 +1267,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1180,7 +1285,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1198,7 +1303,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1216,7 +1321,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1234,7 +1339,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1252,7 +1357,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1270,7 +1375,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1287,8 +1392,36 @@ 0, 0.167, 0, + 1, + 0.3, 0, - 5.5, + 0.433, + 0, + 0.567, + 0, + 1, + 0.611, + 0, + 0.656, + -1, + 0.7, + -1, + 1, + 0.733, + -1, + 0.767, + 0, + 0.8, + 0, + 1, + 1.667, + 0, + 2.533, + 0, + 3.4, + 0, + 0, + 5, 0 ] }, @@ -1305,8 +1438,96 @@ 0, 0.167, 0, + 1, + 1.011, 0, - 5.5, + 1.856, + 0, + 2.7, + 0, + 1, + 2.756, + 0, + 2.811, + 16, + 2.867, + 16, + 1, + 2.889, + 16, + 2.911, + 16, + 2.933, + 16, + 1, + 3.089, + 16, + 3.244, + 0, + 3.4, + 0, + 0, + 5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchBOpen2", + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 1, + 0.344, + 0, + 0.522, + 0, + 0.7, + 0, + 1, + 0.744, + 0, + 0.789, + 30, + 0.833, + 30, + 1, + 1.456, + 30, + 2.078, + 30, + 2.7, + 30, + 1, + 2.756, + 30, + 2.811, + 16, + 2.867, + 16, + 1, + 2.889, + 16, + 2.911, + 16, + 2.933, + 16, + 1, + 3.089, + 16, + 3.244, + 0, + 3.4, + 0, + 0, + 5, 0 ] }, @@ -1323,11 +1544,219 @@ 0, 0.167, 0, + 1, + 0.3, 0, - 5.5, + 0.433, + 0, + 0.567, + 0, + 1, + 0.7, + 0, + 0.833, + -6.9, + 0.967, + -6.9, + 1, + 1.544, + -6.9, + 2.122, + -6.9, + 2.7, + -6.9, + 1, + 2.756, + -6.9, + 2.811, + 0, + 2.867, + 0, + 1, + 2.889, + 0, + 2.911, + 0, + 2.933, + 0, + 1, + 3.089, + 0, + 3.244, + 0, + 3.4, + 0, + 0, + 5, 0 ] }, + { + "Target": "Parameter", + "Id": "ParamWatchBRoll", + "Segments": [ + 0, + -12, + 1, + 0.056, + -12, + 0.111, + -12, + 0.167, + -12, + 1, + 0.3, + -12, + 0.433, + -12, + 0.567, + -12, + 1, + 0.611, + -12, + 0.656, + -9, + 0.7, + -9, + 1, + 1.367, + -9, + 2.033, + -9, + 2.7, + -9, + 1, + 2.756, + -9, + 2.811, + -12, + 2.867, + -12, + 1, + 2.889, + -12, + 2.911, + -12, + 2.933, + -12, + 1, + 3.089, + -12, + 3.244, + -12, + 3.4, + -12, + 0, + 5, + -12 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchBLR", + "Segments": [ + 0, + 2, + 1, + 0.056, + 2, + 0.111, + 2, + 0.167, + 2, + 1, + 0.3, + 2, + 0.433, + 2, + 0.567, + 2, + 1, + 0.7, + 2, + 0.833, + -3.4, + 0.967, + -3.4, + 1, + 1.544, + -3.4, + 2.122, + -3.331, + 2.7, + -3.144, + 1, + 2.756, + -3.126, + 2.811, + 0, + 2.867, + 0, + 1, + 2.889, + 0, + 2.911, + 0, + 2.933, + 0, + 1, + 3.089, + 0, + 3.244, + 2, + 3.4, + 2, + 0, + 5, + 2 + ] + }, + { + "Target": "Parameter", + "Id": "ParamWatchBUD", + "Segments": [ + 0, + -2, + 1, + 0.056, + -2, + 0.111, + -2, + 0.167, + -2, + 1, + 1.011, + -2, + 1.856, + 1.06, + 2.7, + 1.06, + 1, + 2.756, + 1.06, + 2.811, + 0.241, + 2.867, + 0, + 1, + 2.889, + -0.096, + 2.911, + 0.01, + 2.933, + -0.11, + 1, + 3.089, + -0.955, + 3.244, + -2, + 3.4, + -2, + 0, + 5, + -2 + ] + }, { "Target": "Parameter", "Id": "ParamArmAL01", @@ -1342,7 +1771,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1351,17 +1780,17 @@ "Id": "ParamArmAL02", "Segments": [ 0, - -28, + 0, 1, 0.056, - -28, - 0.111, - -28, - 0.167, - -28, 0, - 5.5, - -28 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1369,17 +1798,17 @@ "Id": "ParamArmAL03", "Segments": [ 0, - 19, + 0, 1, 0.056, - 19, - 0.111, - 19, - 0.167, - 19, 0, - 5.5, - 19 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1390,7 +1819,7 @@ 0, 0, 0, - 5.5, + 5, 0 ] }, @@ -1400,50 +1829,8 @@ "Segments": [ 0, 0, - 1, - 0.056, 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.422, - 0, - 0.678, - 0.8, - 0.933, - 0.8, - 1, - 1.322, - 0.8, - 1.711, - -3, - 2.1, - -3, - 1, - 2.556, - -3, - 3.011, - -3, - 3.467, - -3, - 1, - 3.789, - -3, - 4.111, - 0.8, - 4.433, - 0.8, - 1, - 4.589, - 0.8, - 4.744, - 0, - 4.9, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -1453,50 +1840,8 @@ "Segments": [ 0, 0, - 1, - 0.056, 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.433, - 0, - 0.7, - 0.8, - 0.967, - 0.8, - 1, - 1.356, - 0.8, - 1.744, - -6, - 2.133, - -6, - 1, - 2.589, - -6, - 3.044, - -6, - 3.5, - -6, - 1, - 3.822, - -6, - 4.144, - 1, - 4.467, - 1, - 1, - 4.622, - 1, - 4.778, - 0, - 4.933, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -1506,50 +1851,8 @@ "Segments": [ 0, 0, - 1, - 0.056, 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.433, - 0, - 0.7, - 0, - 0.967, - 0, - 1, - 1.356, - 0, - 1.744, - -10, - 2.133, - -10, - 1, - 2.589, - -10, - 3.044, - -10, - 3.5, - -10, - 1, - 3.822, - -10, - 4.144, - 1, - 4.467, - 1, - 1, - 4.622, - 1, - 4.778, - 0, - 4.933, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -1560,43 +1863,8 @@ "Segments": [ 0, 0, - 1, - 0.311, 0, - 0.622, - 0, - 0.933, - 0, - 1, - 0.944, - 0, - 0.956, - -1, - 0.967, - -1, - 1, - 2.111, - -1, - 3.256, - -1, - 4.4, - -1, - 1, - 4.411, - -1, - 4.422, - 0, - 4.433, - 0, - 1, - 4.733, - 0, - 5.033, - 0, - 5.333, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -1605,17 +1873,59 @@ "Id": "ParamArmBR01", "Segments": [ 0, - 0, + -7, 1, 0.056, - 0, + -7, 0.111, - 0, + -7, 0.167, + -7, + 1, + 0.378, + -7, + 0.589, + -7, + 0.8, + -7, + 1, + 0.989, + -7, + 1.178, + -5, + 1.367, + -5, + 1, + 1.744, + -5, + 2.122, + -5, + 2.5, + -5, + 1, + 2.589, + -5, + 2.678, + -6, + 2.767, + -6, + 1, + 2.789, + -6, + 2.811, + -6, + 2.833, + -6, + 1, + 3.022, + -6, + 3.211, + -7, + 3.4, + -7, 0, - 0, - 5.5, - 0 + 5, + -7 ] }, { @@ -1623,17 +1933,59 @@ "Id": "ParamArmBR02", "Segments": [ 0, - 0, + 18, 1, 0.056, - 0, + 18, 0.111, - 0, + 18, 0.167, + 18, + 1, + 0.444, + 18, + 0.722, + 18, + 1, + 18, + 1, + 1.356, + 18, + 1.711, + 16.881, + 2.067, + 15, + 1, + 2.211, + 14.236, + 2.356, + 14, + 2.5, + 14, + 1, + 2.589, + 14, + 2.678, + 16.023, + 2.767, + 18, + 1, + 2.811, + 18.988, + 2.856, + 19, + 2.9, + 19, + 1, + 3.067, + 19, + 3.233, + 18, + 3.4, + 18, 0, - 0, - 5.5, - 0 + 5, + 18 ] }, { @@ -1649,8 +2001,83 @@ 0, 0.167, 0, + 1, + 0.3, 0, - 5.5, + 0.433, + -6, + 0.567, + -6, + 1, + 0.611, + -6, + 0.656, + 9, + 0.7, + 9, + 1, + 0.8, + 9, + 0.9, + 0.266, + 1, + 0, + 1, + 1.322, + -0.858, + 1.644, + -1, + 1.967, + -1, + 1, + 2.211, + -1, + 2.456, + -1, + 2.7, + -1, + 1, + 2.744, + -1, + 2.789, + 14, + 2.833, + 14, + 1, + 2.867, + 14, + 2.9, + 14, + 2.933, + 14, + 1, + 3.078, + 14, + 3.222, + 0, + 3.367, + 0, + 0, + 5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmBRHand01", + "FadeInTime": 0.2, + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 0, + 5, 0 ] }, @@ -1668,10 +2095,29 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, + { + "Target": "Parameter", + "Id": "ParamArmBRHand05", + "FadeInTime": 0.2, + "Segments": [ + 0, + 1, + 1, + 0.056, + 1, + 0.111, + 1, + 0.167, + 1, + 0, + 5, + 1 + ] + }, { "Target": "Parameter", "Id": "ParamArmBRHand05Roll1", @@ -1685,8 +2131,36 @@ 0, 0.167, 0, + 1, + 1.011, 0, - 5.5, + 1.856, + 0, + 2.7, + 0, + 1, + 2.756, + 0, + 2.811, + 30, + 2.867, + 30, + 1, + 2.889, + 30, + 2.911, + 30, + 2.933, + 30, + 1, + 3.089, + 30, + 3.244, + 0, + 3.4, + 0, + 0, + 5, 0 ] }, @@ -1703,8 +2177,57 @@ 0, 0.167, 0, + 1, + 0.3, 0, - 5.5, + 0.433, + 0, + 0.567, + 0, + 1, + 0.611, + 0, + 0.656, + 7.5, + 0.7, + 7.5, + 1, + 0.811, + 7.5, + 0.922, + 0, + 1.033, + 0, + 1, + 1.589, + 0, + 2.144, + 0, + 2.7, + 0, + 1, + 2.756, + 0, + 2.811, + 21, + 2.867, + 21, + 1, + 2.889, + 21, + 2.911, + 21, + 2.933, + 21, + 1, + 3.089, + 21, + 3.244, + 0, + 3.4, + 0, + 0, + 5, 0 ] }, @@ -1721,8 +2244,36 @@ 0, 0.167, 0, + 1, + 1.011, 0, - 5.5, + 1.856, + 0, + 2.7, + 0, + 1, + 2.756, + 0, + 2.811, + 30, + 2.867, + 30, + 1, + 2.889, + 30, + 2.911, + 30, + 2.933, + 30, + 1, + 3.089, + 30, + 3.244, + 0, + 3.4, + 0, + 0, + 5, 0 ] }, @@ -1731,45 +2282,17 @@ "Id": "ParamArmCR01", "Segments": [ 0, - 3, + 0, 1, 0.056, - 3, - 0.111, - 3, - 0.167, - 3, - 1, - 0.422, - 3, - 0.678, - 5, - 0.933, - 5, - 1, - 1.311, - 5, - 1.689, - -6, - 2.067, - -6, - 1, - 2.522, - -6, - 2.978, - -6, - 3.433, - -6, - 1, - 3.922, - -6, - 4.411, - 3, - 4.9, - 3, 0, - 5.5, - 3 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1777,45 +2300,17 @@ "Id": "ParamArmCR02", "Segments": [ 0, - -29, + 0, 1, 0.056, - -29, - 0.111, - -29, - 0.167, - -29, - 1, - 0.444, - -29, - 0.722, - -30, - 1, - -30, - 1, - 1.367, - -30, - 1.733, - -21, - 2.1, - -21, - 1, - 2.556, - -21, - 3.011, - -21, - 3.467, - -21, - 1, - 3.956, - -21, - 4.444, - -29, - 4.933, - -29, 0, - 5.5, - -29 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1823,45 +2318,17 @@ "Id": "ParamArmCR03", "Segments": [ 0, - 11, + 0, 1, 0.056, - 11, - 0.111, - 11, - 0.167, - 11, - 1, - 0.444, - 11, - 0.722, - 9, - 1, - 9, - 1, - 1.367, - 9, - 1.733, - 28, - 2.1, - 28, - 1, - 2.556, - 28, - 3.011, - 28, - 3.467, - 28, - 1, - 3.956, - 28, - 4.444, - 11, - 4.933, - 11, 0, - 5.5, - 11 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1869,45 +2336,17 @@ "Id": "ParamArmCLHandRoll1", "Segments": [ 0, - -18, + 0, 1, 0.056, - -18, - 0.111, - -18, - 0.167, - -18, - 1, - 0.456, - -18, - 0.744, - -18.077, - 1.033, - -21, - 1, - 1.411, - -24.822, - 1.789, - -30, - 2.167, - -30, - 1, - 2.622, - -30, - 3.078, - -30, - 3.533, - -30, - 1, - 4, - -30, - 4.467, - -18, - 4.933, - -18, 0, - 5.5, - -18 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1924,7 +2363,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1942,7 +2381,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1960,7 +2399,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1978,7 +2417,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -1996,7 +2435,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -2014,7 +2453,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -2024,15 +2463,8 @@ "Segments": [ 0, 0, - 1, - 0.056, 0, - 0.111, - 0, - 0.167, - 0, - 0, - 5.5, + 5, 0 ] }, @@ -2050,28 +2482,10 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, - { - "Target": "Parameter", - "Id": "ParamArmERHand04", - "Segments": [ - 0, - 1, - 1, - 0.056, - 1, - 0.111, - 1, - 0.167, - 1, - 0, - 5.5, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamArmERHand04Roll1", @@ -2086,7 +2500,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -2104,7 +2518,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -2122,7 +2536,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -2140,7 +2554,7 @@ 0.167, 0, 0, - 5.5, + 5, 0 ] }, @@ -2149,10 +2563,10 @@ "Id": "PartWatchA", "Segments": [ 0, - 1, 0, - 5.5, - 1 + 0, + 5, + 0 ] }, { @@ -2160,10 +2574,10 @@ "Id": "PartWatchB", "Segments": [ 0, + 1, 0, - 0, - 5.5, - 0 + 5, + 1 ] }, { @@ -2171,10 +2585,10 @@ "Id": "PartArmAL", "Segments": [ 0, + 1, 0, - 0, - 5.5, - 0 + 5, + 1 ] }, { @@ -2182,10 +2596,10 @@ "Id": "PartArmAR", "Segments": [ 0, - 1, 0, - 5.5, - 1 + 0, + 5, + 0 ] }, { @@ -2193,10 +2607,10 @@ "Id": "PartArmBR", "Segments": [ 0, + 1, 0, - 0, - 5.5, - 0 + 5, + 1 ] }, { @@ -2204,10 +2618,10 @@ "Id": "PartArmCL", "Segments": [ 0, - 1, 0, - 5.5, - 1 + 0, + 5, + 0 ] }, { @@ -2217,7 +2631,7 @@ 0, 0, 0, - 5.5, + 5, 0 ] }, @@ -2228,7 +2642,7 @@ 0, 0, 0, - 5.5, + 5, 0 ] } diff --git a/Samples/Resources/Natori/motions/mtn_04.motion3.json b/Samples/Resources/Natori/motions/mtn_04.motion3.json index 169798a..08a29e9 100644 --- a/Samples/Resources/Natori/motions/mtn_04.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_04.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 5, + "Duration": 3.33, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, "CurveCount": 101, - "TotalSegmentCount": 318, - "TotalPointCount": 853, + "TotalSegmentCount": 278, + "TotalPointCount": 733, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,41 +26,101 @@ 0.167, 0, 1, - 0.322, + 0.189, 0, - 0.478, + 0.211, 0, - 0.633, + 0.233, 0, 1, - 1.089, + 0.3, + 0, + 0.367, + 0, + 0.433, 0, - 1.544, - -10.65, - 2, - -14, 1, - 2.211, - -15.553, - 2.422, - -15, - 2.633, - -15, + 0.667, + 0, + 0.9, + 4.019, + 1.133, + 4.019, 1, - 2.844, - -15, - 3.056, + 1.444, + 4.019, + 1.756, 0, - 3.267, + 2.067, 0, 0, - 5, + 3.333, 0 ] }, { "Target": "Parameter", "Id": "ParamAngleY", + "Segments": [ + 0, + -9.011, + 1, + 0.056, + -9.011, + 0.111, + -9.011, + 0.167, + -9.011, + 1, + 0.222, + -9.011, + 0.278, + -9.011, + 0.333, + -9.011, + 1, + 0.544, + -9.011, + 0.756, + -30, + 0.967, + -30, + 1, + 1.089, + -30, + 1.211, + -30, + 1.333, + -30, + 1, + 1.567, + -30, + 1.8, + 0, + 2.033, + 0, + 1, + 2.067, + 0, + 2.1, + 0, + 2.133, + 0, + 1, + 2.356, + 0, + 2.578, + -5, + 2.8, + -5, + 0, + 3.333, + -5 + ] + }, + { + "Target": "Parameter", + "Id": "ParamAngleZ", "Segments": [ 0, 0, @@ -72,82 +132,29 @@ 0.167, 0, 1, - 0.278, + 0.233, 0, - 0.389, - 1, - 0.5, - 1, - 1, - 0.744, - 1, - 0.989, - -16.215, - 1.233, - -16.215, - 1, - 1.433, - -16.215, - 1.633, - -11.8, - 1.833, - -11.8, - 1, - 2.133, - -11.8, - 2.433, - -14.898, - 2.733, - -14.898, - 1, - 3.056, - -14.898, - 3.378, - 0, - 3.7, - 0, - 0, - 5, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamAngleZ", - "Segments": [ + 0.3, 0, + 0.367, 0, 1, - 0.189, - 0, - 0.378, - 0, - 0.567, + 0.622, 0, + 0.878, + -4, + 1.133, + -4, 1, - 0.867, - 0, - 1.167, - 10, - 1.467, - 10, + 1.533, + -4, + 1.933, 1, - 1.8, - 10, - 2.133, - 10, - 2.467, - 10, + 2.333, 1, - 2.733, - 10, - 3, 0, - 3.267, - 0, - 0, - 5, - 0 + 3.333, + 1 ] }, { @@ -164,63 +171,35 @@ 0.167, 1, 1, - 0.378, + 0.311, 1, - 0.589, + 0.456, 1, - 0.8, + 0.6, 1, 1, - 0.833, + 0.689, 1, + 0.778, + 0, 0.867, 0, - 0.9, + 1, + 1.133, + 0, + 1.4, + 0, + 1.667, 0, 1, - 0.922, - 0, - 0.944, - 0, - 0.967, + 1.756, 0, + 1.844, 1, - 1.044, - 0, - 1.122, - 1, - 1.2, - 1, - 1, - 1.711, - 1, - 2.222, - 1, - 2.733, - 1, - 1, - 2.767, - 1, - 2.8, - 0, - 2.833, - 0, - 1, - 2.856, - 0, - 2.878, - 0, - 2.9, - 0, - 1, - 2.978, - 0, - 3.056, - 1, - 3.133, + 1.933, 1, 0, - 5, + 3.333, 1 ] }, @@ -238,7 +217,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -256,7 +235,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -274,63 +253,35 @@ 0.167, 1, 1, - 0.378, + 0.311, 1, - 0.589, + 0.456, 1, - 0.8, + 0.6, 1, 1, - 0.833, + 0.689, 1, + 0.778, + 0, 0.867, 0, - 0.9, + 1, + 1.133, + 0, + 1.4, + 0, + 1.667, 0, 1, - 0.922, - 0, - 0.944, - 0, - 0.967, + 1.756, 0, + 1.844, 1, - 1.044, - 0, - 1.122, - 1, - 1.2, - 1, - 1, - 1.711, - 1, - 2.222, - 1, - 2.733, - 1, - 1, - 2.767, - 1, - 2.8, - 0, - 2.833, - 0, - 1, - 2.856, - 0, - 2.878, - 0, - 2.9, - 0, - 1, - 2.978, - 0, - 3.056, - 1, - 3.133, + 1.933, 1, 0, - 5, + 3.333, 1 ] }, @@ -348,7 +299,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -366,7 +317,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -384,35 +335,35 @@ 0.167, 0, 1, - 0.322, + 0.311, 0, - 0.478, + 0.456, 0, - 0.633, + 0.6, 0, 1, - 0.833, + 0.689, 0, - 1.033, - -0.5, - 1.233, - -0.5, + 0.778, + 0.2, + 0.867, + 0.2, 1, - 1.7, - -0.5, - 2.167, - -0.5, - 2.633, - -0.5, + 1.133, + 0.2, + 1.4, + 0.2, + 1.667, + 0.2, 1, - 2.833, - -0.5, - 3.033, + 1.756, + 0.2, + 1.844, 0, - 3.233, + 1.933, 0, 0, - 5, + 3.333, 0 ] }, @@ -430,35 +381,35 @@ 0.167, 0, 1, - 0.322, + 0.311, 0, - 0.478, + 0.456, 0, - 0.633, + 0.6, 0, 1, - 0.833, + 0.689, 0, - 1.033, - -0.2, - 1.233, - -0.2, + 0.778, + -0.8, + 0.867, + -0.8, 1, - 1.7, - -0.2, - 2.167, - -0.2, - 2.633, - -0.2, + 1.133, + -0.8, + 1.4, + -0.8, + 1.667, + -0.8, 1, - 2.833, - -0.2, - 3.033, + 1.756, + -0.8, + 1.844, 0, - 3.233, + 1.933, 0, 0, - 5, + 3.333, 0 ] }, @@ -476,7 +427,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -485,17 +436,17 @@ "Id": "ParamBrowLY", "Segments": [ 0, - -0.1, + 0, 1, 0.056, - -0.1, - 0.111, - -0.1, - 0.167, - -0.1, 0, - 5, - -0.1 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -503,17 +454,17 @@ "Id": "ParamBrowRY", "Segments": [ 0, - -0.1, + 0, 1, 0.056, - -0.1, - 0.111, - -0.1, - 0.167, - -0.1, 0, - 5, - -0.1 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -530,7 +481,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -548,7 +499,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -566,7 +517,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -584,7 +535,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -593,17 +544,17 @@ "Id": "ParamBrowLForm", "Segments": [ 0, - 1, + 0, 1, 0.056, - 1, - 0.111, - 1, - 0.167, - 1, 0, - 5, - 1 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -611,17 +562,17 @@ "Id": "ParamBrowLForm2", "Segments": [ 0, - 1, + 0, 1, 0.056, - 1, - 0.111, - 1, - 0.167, - 1, 0, - 5, - 1 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -629,17 +580,17 @@ "Id": "ParamBrowRForm", "Segments": [ 0, - 1, + 0, 1, 0.056, - 1, - 0.111, - 1, - 0.167, - 1, 0, - 5, - 1 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -647,17 +598,17 @@ "Id": "ParamBrowRForm2", "Segments": [ 0, - 1, + 0, 1, 0.056, - 1, - 0.111, - 1, - 0.167, - 1, 0, - 5, - 1 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -674,7 +625,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -692,7 +643,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -710,7 +661,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -728,7 +679,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -746,7 +697,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -763,8 +714,43 @@ 0, 0.167, 0, + 1, + 0.222, 0, - 5, + 0.278, + 0, + 0.333, + 0, + 1, + 0.544, + 0, + 0.756, + -10, + 0.967, + -10, + 1, + 1.044, + -10, + 1.122, + 10, + 1.2, + 10, + 1, + 1.222, + 10, + 1.244, + 10, + 1.267, + 10, + 1, + 1.333, + 10, + 1.4, + 0, + 1.467, + 0, + 0, + 3.333, 0 ] }, @@ -781,8 +767,29 @@ 0, 0.167, 0, + 1, + 0.433, 0, - 5, + 0.7, + 0, + 0.967, + 0, + 1, + 1.067, + 0, + 1.167, + 0.4, + 1.267, + 0.4, + 1, + 1.367, + 0.4, + 1.467, + 0, + 1.567, + 0, + 0, + 3.333, 0 ] }, @@ -799,8 +806,36 @@ 0, 0.167, 0, + 1, + 0.422, 0, - 5, + 0.678, + 0, + 0.933, + 0, + 1, + 1.011, + 0, + 1.089, + 1, + 1.167, + 1, + 1, + 1.2, + 1, + 1.233, + 1, + 1.267, + 1, + 1, + 1.4, + 1, + 1.533, + 0, + 1.667, + 0, + 0, + 3.333, 0 ] }, @@ -809,10 +844,31 @@ "Id": "ParamGrassHighlightMove", "Segments": [ 0, + -30, + 1, + 0.056, + -30, + 0.111, + -30, + 0.167, + -30, + 1, + 0.444, + -30, + 0.722, + -30, + 1, + -30, + 1, + 1.189, + -30, + 1.378, + 30, + 1.567, + 30, 0, - 0, - 5, - 0 + 3.333, + 30 ] }, { @@ -829,35 +885,42 @@ 0.167, 0, 1, - 0.333, + 0.189, + 0, + 0.211, + 0, + 0.233, 0, - 0.5, - 0.5, - 0.667, - 0.5, 1, - 0.922, - 0.5, - 1.178, - -3, - 1.433, - -3, + 0.289, + 0, + 0.344, + 0, + 0.4, + 0, 1, - 1.789, - -3, - 2.144, - -3, - 2.5, - -3, + 0.611, + 0, + 0.822, + 2, + 1.033, + 2, 1, - 2.722, - -3, - 2.944, + 1.078, + 2, + 1.122, + 2, + 1.167, + 2, + 1, + 1.422, + 2, + 1.678, 0, - 3.167, + 1.933, 0, 0, - 5, + 3.333, 0 ] }, @@ -875,35 +938,14 @@ 0.167, 0, 1, - 0.333, + 0.189, 0, - 0.5, - -0.538, - 0.667, - -1, - 1, - 0.878, - -1.585, - 1.089, - -1.707, - 1.3, - -1.707, - 1, - 1.711, - -1.707, - 2.122, - 0.274, - 2.533, - 0.274, - 1, - 2.767, - 0.274, - 3, + 0.211, 0, - 3.233, + 0.233, 0, 0, - 5, + 3.333, 0 ] }, @@ -921,7 +963,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -939,7 +981,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -957,21 +999,28 @@ 0.167, 0, 1, - 0.356, + 0.256, 0, - 0.544, + 0.344, 0, - 0.733, + 0.433, 0, 1, - 1.489, + 0.633, 0, - 2.244, + 0.833, + 2, + 1.033, + 2, + 1, + 1.244, + 2, + 1.456, 0, - 3, + 1.667, 0, 0, - 5, + 3.333, 0 ] }, @@ -989,36 +1038,29 @@ 0.167, 0, 1, - 0.333, + 0.233, 0, - 0.5, + 0.3, 0, - 0.667, + 0.367, 0, 1, - 0.944, + 0.722, 0, - 1.222, - 0.42, - 1.5, - 0.5, + 1.078, 1, - 1.867, - 0.605, - 2.233, - 0.6, - 2.6, - 0.6, + 1.433, + 1, + 1, + 1.667, + 1, + 1.9, + 1, + 2.133, 1, - 3.111, - 0.6, - 3.622, 0, - 4.133, - 0, - 0, - 5, - 0 + 3.333, + 1 ] }, { @@ -1034,36 +1076,8 @@ 0, 0.167, 0, - 1, - 0.333, 0, - 0.5, - 0, - 0.667, - 0, - 1, - 0.922, - 0, - 1.178, - -8.227, - 1.433, - -9, - 1, - 1.789, - -10.076, - 2.144, - -10, - 2.5, - -10, - 1, - 2.744, - -10, - 2.989, - 0, - 3.233, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -1072,59 +1086,52 @@ "Id": "ParamRightShoulderUp", "Segments": [ 0, - 8, + 0, 1, 0.056, - 8, + 0, 0.111, - 8, + 0, 0.167, - 8, + 0, 1, - 0.267, - 8, - 0.367, - 8, - 0.467, - 8, + 0.189, + 0, + 0.211, + 0, + 0.233, + 0, 1, - 0.533, - 8, - 0.6, - 4, - 0.667, - 4, - 1, - 0.767, - 4, - 0.867, - 9, + 0.478, + 0, + 0.722, + 2.225, 0.967, 9, 1, - 1.5, - 9, - 2.033, - 9, - 2.567, - 9, + 1.056, + 11.464, + 1.144, + 15, + 1.233, + 15, 1, - 2.722, - 9, - 2.878, - 0, - 3.033, - 0, + 1.589, + 15, + 1.944, + -6, + 2.3, + -6, 1, - 3.267, + 2.489, + -6, + 2.678, + -3, + 2.867, + -3, 0, - 3.5, - 8, - 3.733, - 8, - 0, - 5, - 8 + 3.333, + -3 ] }, { @@ -1141,7 +1148,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1159,7 +1166,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1177,7 +1184,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1195,7 +1202,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1213,7 +1220,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1231,7 +1238,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1249,7 +1256,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1267,7 +1274,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1285,7 +1292,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1303,7 +1310,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1321,7 +1328,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1339,7 +1346,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1357,7 +1364,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1375,7 +1382,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1392,36 +1399,8 @@ 0, 0.167, 0, - 1, - 0.3, 0, - 0.433, - 0, - 0.567, - 0, - 1, - 0.611, - 0, - 0.656, - -1, - 0.7, - -1, - 1, - 0.733, - -1, - 0.767, - 0, - 0.8, - 0, - 1, - 1.667, - 0, - 2.533, - 0, - 3.4, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -1438,36 +1417,8 @@ 0, 0.167, 0, - 1, - 1.011, 0, - 1.856, - 0, - 2.7, - 0, - 1, - 2.756, - 0, - 2.811, - 16, - 2.867, - 16, - 1, - 2.889, - 16, - 2.911, - 16, - 2.933, - 16, - 1, - 3.089, - 16, - 3.244, - 0, - 3.4, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -1484,50 +1435,8 @@ 0, 0.167, 0, - 1, - 0.344, 0, - 0.522, - 0, - 0.7, - 0, - 1, - 0.744, - 0, - 0.789, - 30, - 0.833, - 30, - 1, - 1.456, - 30, - 2.078, - 30, - 2.7, - 30, - 1, - 2.756, - 30, - 2.811, - 16, - 2.867, - 16, - 1, - 2.889, - 16, - 2.911, - 16, - 2.933, - 16, - 1, - 3.089, - 16, - 3.244, - 0, - 3.4, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -1544,50 +1453,8 @@ 0, 0.167, 0, - 1, - 0.3, 0, - 0.433, - 0, - 0.567, - 0, - 1, - 0.7, - 0, - 0.833, - -6.9, - 0.967, - -6.9, - 1, - 1.544, - -6.9, - 2.122, - -6.9, - 2.7, - -6.9, - 1, - 2.756, - -6.9, - 2.811, - 0, - 2.867, - 0, - 1, - 2.889, - 0, - 2.911, - 0, - 2.933, - 0, - 1, - 3.089, - 0, - 3.244, - 0, - 3.4, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -1596,59 +1463,17 @@ "Id": "ParamWatchBRoll", "Segments": [ 0, - -12, + 0, 1, 0.056, - -12, - 0.111, - -12, - 0.167, - -12, - 1, - 0.3, - -12, - 0.433, - -12, - 0.567, - -12, - 1, - 0.611, - -12, - 0.656, - -9, - 0.7, - -9, - 1, - 1.367, - -9, - 2.033, - -9, - 2.7, - -9, - 1, - 2.756, - -9, - 2.811, - -12, - 2.867, - -12, - 1, - 2.889, - -12, - 2.911, - -12, - 2.933, - -12, - 1, - 3.089, - -12, - 3.244, - -12, - 3.4, - -12, 0, - 5, - -12 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -1656,59 +1481,17 @@ "Id": "ParamWatchBLR", "Segments": [ 0, - 2, + 0, 1, 0.056, - 2, + 0, 0.111, - 2, + 0, 0.167, - 2, - 1, - 0.3, - 2, - 0.433, - 2, - 0.567, - 2, - 1, - 0.7, - 2, - 0.833, - -3.4, - 0.967, - -3.4, - 1, - 1.544, - -3.4, - 2.122, - -3.331, - 2.7, - -3.144, - 1, - 2.756, - -3.126, - 2.811, 0, - 2.867, 0, - 1, - 2.889, - 0, - 2.911, - 0, - 2.933, - 0, - 1, - 3.089, - 0, - 3.244, - 2, - 3.4, - 2, - 0, - 5, - 2 + 3.333, + 0 ] }, { @@ -1716,45 +1499,17 @@ "Id": "ParamWatchBUD", "Segments": [ 0, - -2, + 0, 1, 0.056, - -2, + 0, 0.111, - -2, + 0, 0.167, - -2, - 1, - 1.011, - -2, - 1.856, - 1.06, - 2.7, - 1.06, - 1, - 2.756, - 1.06, - 2.811, - 0.241, - 2.867, 0, - 1, - 2.889, - -0.096, - 2.911, - 0.01, - 2.933, - -0.11, - 1, - 3.089, - -0.955, - 3.244, - -2, - 3.4, - -2, 0, - 5, - -2 + 3.333, + 0 ] }, { @@ -1771,7 +1526,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1789,7 +1544,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1807,7 +1562,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1819,7 +1574,7 @@ 0, 0, 0, - 5, + 3.333, 0 ] }, @@ -1829,8 +1584,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, 0 ] }, @@ -1840,8 +1602,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, 0 ] }, @@ -1851,8 +1620,15 @@ "Segments": [ 0, 0, + 1, + 0.056, 0, - 5, + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, 0 ] }, @@ -1864,7 +1640,7 @@ 0, 0, 0, - 5, + 3.333, 0 ] }, @@ -1873,59 +1649,17 @@ "Id": "ParamArmBR01", "Segments": [ 0, - -7, + 0, 1, 0.056, - -7, - 0.111, - -7, - 0.167, - -7, - 1, - 0.378, - -7, - 0.589, - -7, - 0.8, - -7, - 1, - 0.989, - -7, - 1.178, - -5, - 1.367, - -5, - 1, - 1.744, - -5, - 2.122, - -5, - 2.5, - -5, - 1, - 2.589, - -5, - 2.678, - -6, - 2.767, - -6, - 1, - 2.789, - -6, - 2.811, - -6, - 2.833, - -6, - 1, - 3.022, - -6, - 3.211, - -7, - 3.4, - -7, 0, - 5, - -7 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -1933,59 +1667,17 @@ "Id": "ParamArmBR02", "Segments": [ 0, - 18, + 0, 1, 0.056, - 18, - 0.111, - 18, - 0.167, - 18, - 1, - 0.444, - 18, - 0.722, - 18, - 1, - 18, - 1, - 1.356, - 18, - 1.711, - 16.881, - 2.067, - 15, - 1, - 2.211, - 14.236, - 2.356, - 14, - 2.5, - 14, - 1, - 2.589, - 14, - 2.678, - 16.023, - 2.767, - 18, - 1, - 2.811, - 18.988, - 2.856, - 19, - 2.9, - 19, - 1, - 3.067, - 19, - 3.233, - 18, - 3.4, - 18, 0, - 5, - 18 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -2001,83 +1693,8 @@ 0, 0.167, 0, - 1, - 0.3, 0, - 0.433, - -6, - 0.567, - -6, - 1, - 0.611, - -6, - 0.656, - 9, - 0.7, - 9, - 1, - 0.8, - 9, - 0.9, - 0.266, - 1, - 0, - 1, - 1.322, - -0.858, - 1.644, - -1, - 1.967, - -1, - 1, - 2.211, - -1, - 2.456, - -1, - 2.7, - -1, - 1, - 2.744, - -1, - 2.789, - 14, - 2.833, - 14, - 1, - 2.867, - 14, - 2.9, - 14, - 2.933, - 14, - 1, - 3.078, - 14, - 3.222, - 0, - 3.367, - 0, - 0, - 5, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBRHand01", - "FadeInTime": 0.2, - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -2095,29 +1712,10 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, - { - "Target": "Parameter", - "Id": "ParamArmBRHand05", - "FadeInTime": 0.2, - "Segments": [ - 0, - 1, - 1, - 0.056, - 1, - 0.111, - 1, - 0.167, - 1, - 0, - 5, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamArmBRHand05Roll1", @@ -2131,36 +1729,8 @@ 0, 0.167, 0, - 1, - 1.011, 0, - 1.856, - 0, - 2.7, - 0, - 1, - 2.756, - 0, - 2.811, - 30, - 2.867, - 30, - 1, - 2.889, - 30, - 2.911, - 30, - 2.933, - 30, - 1, - 3.089, - 30, - 3.244, - 0, - 3.4, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -2177,57 +1747,8 @@ 0, 0.167, 0, - 1, - 0.3, 0, - 0.433, - 0, - 0.567, - 0, - 1, - 0.611, - 0, - 0.656, - 7.5, - 0.7, - 7.5, - 1, - 0.811, - 7.5, - 0.922, - 0, - 1.033, - 0, - 1, - 1.589, - 0, - 2.144, - 0, - 2.7, - 0, - 1, - 2.756, - 0, - 2.811, - 21, - 2.867, - 21, - 1, - 2.889, - 21, - 2.911, - 21, - 2.933, - 21, - 1, - 3.089, - 21, - 3.244, - 0, - 3.4, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -2244,36 +1765,8 @@ 0, 0.167, 0, - 1, - 1.011, 0, - 1.856, - 0, - 2.7, - 0, - 1, - 2.756, - 0, - 2.811, - 30, - 2.867, - 30, - 1, - 2.889, - 30, - 2.911, - 30, - 2.933, - 30, - 1, - 3.089, - 30, - 3.244, - 0, - 3.4, - 0, - 0, - 5, + 3.333, 0 ] }, @@ -2291,7 +1784,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2309,7 +1802,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2327,7 +1820,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2345,7 +1838,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2363,7 +1856,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2381,7 +1874,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2399,7 +1892,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2417,7 +1910,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2426,17 +1919,38 @@ "Id": "ParamArmER01", "Segments": [ 0, - 0, + 16, 1, 0.056, - 0, + 16, 0.111, - 0, + 16, 0.167, + 16, + 1, + 0.311, + 16, + 0.456, + 16, + 0.6, + 16, + 1, + 1.033, + 16, + 1.467, + 16, + 1.9, + 16, + 1, + 2.044, + 16, + 2.189, + 18, + 2.333, + 18, 0, - 0, - 5, - 0 + 3.333, + 18 ] }, { @@ -2444,17 +1958,52 @@ "Id": "ParamArmER02", "Segments": [ 0, - 0, + 11, 1, 0.056, - 0, + 11, 0.111, - 0, + 11, 0.167, + 11, + 1, + 0.311, + 11, + 0.456, + 14.565, + 0.6, + 18, + 1, + 0.711, + 20.643, + 0.822, + 21, + 0.933, + 21, + 1, + 1.267, + 21, + 1.6, + 13.953, + 1.933, 0, + 1, + 2.078, + -6.046, + 2.222, + -9, + 2.367, + -9, + 1, + 2.544, + -9, + 2.722, + -8, + 2.9, + -8, 0, - 5, - 0 + 3.333, + -8 ] }, { @@ -2462,15 +2011,111 @@ "Id": "ParamArmER03", "Segments": [ 0, + 1, + 1, + 0.056, + 1, + 0.111, + 1, + 0.167, + 1, + 1, + 0.189, + 1, + 0.211, + 1, + 0.233, + 1, + 1, + 0.356, + 1, + 0.478, + 1, + 0.6, + 1, + 1, + 0.711, + 1, + 0.822, + -5.698, + 0.933, + -7, + 1, + 1.033, + -8.171, + 1.133, + -8.083, + 1.233, + -9, + 1, + 1.389, + -10.427, + 1.544, + -11.838, + 1.7, + -11.838, + 1, + 1.933, + -11.838, + 2.167, + 19, + 2.4, + 19, + 1, + 2.578, + 19, + 2.756, + 15.092, + 2.933, + 15.092, 0, - 0, - 5, - 0 + 3.333, + 15.092 ] }, { "Target": "Parameter", "Id": "ParamArmER04", + "Segments": [ + 0, + 30, + 1, + 0.056, + 30, + 0.111, + 30, + 0.167, + 30, + 1, + 0.422, + 30, + 0.678, + 30, + 0.933, + 30, + 1, + 1.089, + 30, + 1.244, + 30, + 1.4, + 30, + 1, + 1.744, + 30, + 2.089, + 9, + 2.433, + 9, + 0, + 3.333, + 9 + ] + }, + { + "Target": "Parameter", + "Id": "ParamArmERHand04", + "FadeInTime": 0.2, "Segments": [ 0, 0, @@ -2482,7 +2127,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2500,7 +2145,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2518,10 +2163,36 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, + { + "Target": "Parameter", + "Id": "ParamArmERHand06", + "FadeInTime": 0.2, + "Segments": [ + 0, + 1, + 1, + 0.056, + 1, + 0.111, + 1, + 0.167, + 1, + 1, + 0.311, + 1, + 0.456, + 1, + 0.6, + 1, + 0, + 3.333, + 1 + ] + }, { "Target": "Parameter", "Id": "ParamArmERHand06Roll1", @@ -2535,9 +2206,37 @@ 0, 0.167, 0, + 1, + 0.311, 0, - 5, - 0 + 0.456, + 0, + 0.6, + 0, + 1, + 0.711, + 0, + 0.822, + 12.92, + 0.933, + 14, + 1, + 1.278, + 17.347, + 1.622, + 18, + 1.967, + 18, + 1, + 2.144, + 18, + 2.322, + 3, + 2.5, + 3, + 0, + 3.333, + 3 ] }, { @@ -2553,9 +2252,30 @@ 0, 0.167, 0, + 1, + 0.411, 0, - 5, - 0 + 0.656, + -30, + 0.9, + -30, + 1, + 1.167, + -30, + 1.433, + -30, + 1.7, + -30, + 1, + 1.956, + -30, + 2.211, + -24, + 2.467, + -24, + 0, + 3.333, + -24 ] }, { @@ -2563,10 +2283,10 @@ "Id": "PartWatchA", "Segments": [ 0, + 1, 0, - 0, - 5, - 0 + 3.33, + 1 ] }, { @@ -2574,10 +2294,10 @@ "Id": "PartWatchB", "Segments": [ 0, - 1, 0, - 5, - 1 + 0, + 3.33, + 0 ] }, { @@ -2587,7 +2307,7 @@ 0, 1, 0, - 5, + 3.33, 1 ] }, @@ -2598,7 +2318,7 @@ 0, 0, 0, - 5, + 3.33, 0 ] }, @@ -2607,10 +2327,10 @@ "Id": "PartArmBR", "Segments": [ 0, - 1, 0, - 5, - 1 + 0, + 3.33, + 0 ] }, { @@ -2620,7 +2340,7 @@ 0, 0, 0, - 5, + 3.33, 0 ] }, @@ -2631,7 +2351,7 @@ 0, 0, 0, - 5, + 3.33, 0 ] }, @@ -2640,10 +2360,10 @@ "Id": "PartArmER", "Segments": [ 0, + 1, 0, - 0, - 5, - 0 + 3.33, + 1 ] } ] diff --git a/Samples/Resources/Natori/motions/mtn_05.motion3.json b/Samples/Resources/Natori/motions/mtn_05.motion3.json index b65a73e..76fc817 100644 --- a/Samples/Resources/Natori/motions/mtn_05.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_05.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 3.33, + "Duration": 5, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, - "CurveCount": 101, - "TotalSegmentCount": 278, - "TotalPointCount": 733, + "CurveCount": 99, + "TotalSegmentCount": 283, + "TotalPointCount": 752, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,36 +26,43 @@ 0.167, 0, 1, - 0.189, + 0.4, 0, - 0.211, + 0.633, 0, - 0.233, + 0.867, 0, 1, - 0.3, - 0, - 0.367, - 0, - 0.433, + 1.167, 0, + 1.467, + 13.505, + 1.767, + 16, 1, - 0.667, - 0, - 0.9, - 4.019, - 1.133, - 4.019, + 2.011, + 18.033, + 2.256, + 17.623, + 2.5, + 17.623, 1, - 1.444, - 4.019, - 1.756, + 2.856, + 17.623, + 3.211, + -4.813, + 3.567, + -6, + 1, + 3.8, + -6.779, + 4.033, + -6.496, + 4.267, + -6.496, 0, - 2.067, - 0, - 0, - 3.333, - 0 + 5, + -6.496 ] }, { @@ -63,59 +70,73 @@ "Id": "ParamAngleY", "Segments": [ 0, - -9.011, + 0.017, 1, 0.056, - -9.011, + 0.017, 0.111, - -9.011, + 0.017, 0.167, - -9.011, + 0.017, 1, - 0.222, - -9.011, - 0.278, - -9.011, - 0.333, - -9.011, + 0.456, + 0.017, + 0.744, + 0.229, + 1.033, 1, - 0.544, - -9.011, - 0.756, - -30, - 0.967, - -30, 1, - 1.089, - -30, 1.211, - -30, - 1.333, - -30, - 1, + 1.475, + 1.389, + 2, 1.567, - -30, - 1.8, - 0, - 2.033, - 0, + 2, 1, - 2.067, + 1.744, + 2, + 1.922, 0, 2.1, 0, - 2.133, - 0, 1, - 2.356, + 2.4, 0, - 2.578, - -5, - 2.8, - -5, + 2.7, + 3, + 3, + 3, + 1, + 3.211, + 3, + 3.422, + -5.586, + 3.633, + -5.586, + 1, + 3.644, + -5.586, + 3.656, + -5.586, + 3.667, + -5.586, + 1, + 3.822, + -5.586, + 3.978, + 1, + 4.133, + 1, + 1, + 4.389, + 1, + 4.644, 0, - 3.333, - -5 + 4.9, + 0, + 0, + 5, + 0 ] }, { @@ -132,29 +153,43 @@ 0.167, 0, 1, - 0.233, - 0, - 0.3, - 0, - 0.367, + 0.433, 0, + 0.7, + -3, + 0.967, + -3, 1, - 0.622, + 1.256, + -3, + 1.544, + 4.968, + 1.833, + 6, + 1, + 2.156, + 7.151, + 2.478, + 7, + 2.8, + 7, + 1, + 3, + 7, + 3.2, + -2, + 3.4, + -2, + 1, + 3.578, + -2, + 3.756, 0, - 0.878, - -4, - 1.133, - -4, - 1, - 1.533, - -4, - 1.933, - 1, - 2.333, - 1, + 3.933, 0, - 3.333, - 1 + 0, + 5, + 0 ] }, { @@ -171,35 +206,63 @@ 0.167, 1, 1, - 0.311, + 0.589, 1, - 0.456, + 1.011, 1, - 0.6, + 1.433, 1, 1, - 0.689, + 1.467, 1, - 0.778, + 1.5, 0, - 0.867, + 1.533, 0, 1, - 1.133, + 1.556, 0, - 1.4, + 1.578, 0, - 1.667, + 1.6, 0, 1, + 1.678, + 0, 1.756, - 0, - 1.844, 1, - 1.933, + 1.833, + 1, + 1, + 2.344, + 1, + 2.856, + 1, + 3.367, + 1, + 1, + 3.4, + 1, + 3.433, + 0, + 3.467, + 0, + 1, + 3.489, + 0, + 3.511, + 0, + 3.533, + 0, + 1, + 3.611, + 0, + 3.689, + 1, + 3.767, 1, 0, - 3.333, + 5, 1 ] }, @@ -217,7 +280,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -235,7 +298,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -253,35 +316,63 @@ 0.167, 1, 1, - 0.311, + 0.589, 1, - 0.456, + 1.011, 1, - 0.6, + 1.433, 1, 1, - 0.689, + 1.467, 1, - 0.778, + 1.5, 0, - 0.867, + 1.533, 0, 1, - 1.133, + 1.556, 0, - 1.4, + 1.578, 0, - 1.667, + 1.6, 0, 1, + 1.678, + 0, 1.756, - 0, - 1.844, 1, - 1.933, + 1.833, + 1, + 1, + 2.344, + 1, + 2.856, + 1, + 3.367, + 1, + 1, + 3.4, + 1, + 3.433, + 0, + 3.467, + 0, + 1, + 3.489, + 0, + 3.511, + 0, + 3.533, + 0, + 1, + 3.611, + 0, + 3.689, + 1, + 3.767, 1, 0, - 3.333, + 5, 1 ] }, @@ -299,7 +390,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -317,7 +408,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -335,35 +426,35 @@ 0.167, 0, 1, - 0.311, + 0.578, 0, - 0.456, + 0.989, 0, - 0.6, - 0, - 1, - 0.689, - 0, - 0.778, - 0.2, - 0.867, - 0.2, - 1, - 1.133, - 0.2, 1.4, - 0.2, - 1.667, - 0.2, + 0, 1, - 1.756, - 0.2, - 1.844, + 1.544, 0, - 1.933, + 1.689, + 0.542, + 1.833, + 0.542, + 1, + 2.056, + 0.542, + 2.278, + 0.542, + 2.5, + 0.542, + 1, + 2.789, + 0.542, + 3.078, + 0, + 3.367, 0, 0, - 3.333, + 5, 0 ] }, @@ -381,35 +472,35 @@ 0.167, 0, 1, - 0.311, + 0.578, 0, - 0.456, + 0.989, 0, - 0.6, - 0, - 1, - 0.689, - 0, - 0.778, - -0.8, - 0.867, - -0.8, - 1, - 1.133, - -0.8, 1.4, - -0.8, - 1.667, - -0.8, + 0, 1, - 1.756, - -0.8, - 1.844, + 1.544, 0, - 1.933, + 1.689, + -0.386, + 1.833, + -0.386, + 1, + 2.056, + -0.386, + 2.278, + -0.386, + 2.5, + -0.386, + 1, + 2.789, + -0.386, + 3.078, + 0, + 3.367, 0, 0, - 3.333, + 5, 0 ] }, @@ -427,7 +518,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -445,7 +536,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -463,7 +554,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -481,7 +572,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -499,7 +590,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -517,7 +608,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -535,7 +626,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -553,7 +644,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -571,7 +662,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -589,7 +680,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -607,7 +698,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -625,7 +716,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -643,7 +734,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -661,7 +752,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -679,7 +770,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -697,7 +788,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -714,49 +805,195 @@ 0, 0.167, 0, - 1, - 0.222, 0, - 0.278, - 0, - 0.333, - 0, - 1, - 0.544, - 0, - 0.756, - -10, - 0.967, - -10, - 1, - 1.044, - -10, - 1.122, - 10, - 1.2, - 10, - 1, - 1.222, - 10, - 1.244, - 10, - 1.267, - 10, - 1, - 1.333, - 10, - 1.4, - 0, - 1.467, - 0, - 0, - 3.333, + 5, 0 ] }, { "Target": "Parameter", "Id": "ParamGrassWhite", + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamGrassHighlight", + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamGrassHighlightMove", + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBodyAngleX", + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 1, + 0.356, + 0, + 0.544, + -1, + 0.733, + -1, + 1, + 1.044, + -1, + 1.356, + 4.155, + 1.667, + 5, + 1, + 1.911, + 5.664, + 2.156, + 5.5, + 2.4, + 5.5, + 1, + 2.656, + 5.5, + 2.911, + -1.168, + 3.167, + -2, + 1, + 3.5, + -3.085, + 3.833, + -3, + 4.167, + -3, + 0, + 5, + -3 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBodyAngleY", + "Segments": [ + 0, + 0, + 1, + 0.056, + 0, + 0.111, + 0, + 0.167, + 0, + 1, + 0.356, + 0, + 0.544, + 1.915, + 0.733, + 2, + 1, + 0.878, + 2.065, + 1.022, + 2.028, + 1.167, + 2.088, + 1, + 1.344, + 2.162, + 1.522, + 2.904, + 1.7, + 2.904, + 1, + 1.867, + 2.904, + 2.033, + 2, + 2.2, + 2, + 1, + 2.356, + 2, + 2.511, + 2.5, + 2.667, + 2.5, + 1, + 2.978, + 2.5, + 3.289, + -1.006, + 3.6, + -1.006, + 1, + 3.8, + -1.006, + 4, + 0.139, + 4.2, + 0.139, + 1, + 4.378, + 0.139, + 4.556, + 0, + 4.733, + 0, + 0, + 5, + 0 + ] + }, + { + "Target": "Parameter", + "Id": "ParamBodyAngleZ", "Segments": [ 0, 0, @@ -775,196 +1012,22 @@ 0.967, 0, 1, - 1.067, + 1.222, 0, - 1.167, - 0.4, - 1.267, - 0.4, + 1.478, 1, - 1.367, - 0.4, - 1.467, - 0, - 1.567, - 0, - 0, - 3.333, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamGrassHighlight", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.422, - 0, - 0.678, - 0, - 0.933, - 0, - 1, - 1.011, - 0, - 1.089, - 1, - 1.167, + 1.733, 1, 1, - 1.2, + 2.456, 1, - 1.233, + 3.178, 1, - 1.267, + 3.9, 1, - 1, - 1.4, - 1, - 1.533, 0, - 1.667, - 0, - 0, - 3.333, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamGrassHighlightMove", - "Segments": [ - 0, - -30, - 1, - 0.056, - -30, - 0.111, - -30, - 0.167, - -30, - 1, - 0.444, - -30, - 0.667, - -30, - 1, - -30, - 1, - 1.189, - -30, - 1.378, - 30, - 1.567, - 30, - 0, - 3.333, - 30 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBodyAngleX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.189, - 0, - 0.211, - 0, - 0.233, - 0, - 1, - 0.289, - 0, - 0.344, - 0, - 0.4, - 0, - 1, - 0.611, - 0, - 0.822, - 2, - 1.033, - 2, - 1, - 1.078, - 2, - 1.122, - 2, - 1.167, - 2, - 1, - 1.422, - 2, - 1.678, - 0, - 1.933, - 0, - 0, - 3.333, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBodyAngleY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.189, - 0, - 0.211, - 0, - 0.233, - 0, - 0, - 3.333, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBodyAngleZ", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 3.333, - 0 + 5, + 1 ] }, { @@ -972,16 +1035,44 @@ "Id": "ParamWaistAngleZ", "Segments": [ 0, - 0, + 0.124, 1, 0.056, - 0, + 0.124, 0.111, - 0, + 0.124, 0.167, + 0.124, + 1, + 0.478, + 0.124, + 0.789, + 2, + 1.1, + 2, + 1, + 1.3, + 2, + 1.5, + -1, + 1.7, + -1, + 1, + 2.2, + -1, + 2.7, + -1, + 3.2, + -1, + 1, + 3.456, + -1, + 3.711, + 0, + 3.967, 0, 0, - 3.333, + 5, 0 ] }, @@ -999,28 +1090,14 @@ 0.167, 0, 1, - 0.256, + 1.656, 0, - 0.344, + 3.144, 0, - 0.433, - 0, - 1, - 0.633, - 0, - 0.833, - 2, - 1.033, - 2, - 1, - 1.244, - 2, - 1.456, - 0, - 1.667, + 4.633, 0, 0, - 3.333, + 5, 0 ] }, @@ -1038,29 +1115,43 @@ 0.167, 0, 1, - 0.233, + 0.411, 0, - 0.3, + 0.656, 0, - 0.367, + 0.9, 0, 1, - 0.722, + 1.411, 0, - 1.078, + 1.922, + 0.501, + 2.433, + 0.501, 1, - 1.433, - 1, - 1, - 1.667, - 1, - 1.9, - 1, - 2.133, + 2.511, + 0.501, + 2.589, + 0.501, + 2.667, + 0.501, 1, + 3.178, + 0.501, + 3.689, 0, - 3.333, - 1 + 4.2, + 0, + 1, + 4.322, + 0, + 4.444, + 0, + 4.567, + 0, + 0, + 5, + 0 ] }, { @@ -1076,9 +1167,30 @@ 0, 0.167, 0, + 1, + 0.356, 0, - 3.333, - 0 + 0.544, + -6, + 0.733, + -6, + 1, + 0.933, + -6, + 1.133, + 6, + 1.333, + 6, + 1, + 1.522, + 6, + 1.711, + 2, + 1.9, + 2, + 0, + 5, + 2 ] }, { @@ -1095,43 +1207,15 @@ 0.167, 0, 1, - 0.189, + 0.289, 0, - 0.211, + 0.411, 0, - 0.233, + 0.533, 0, - 1, - 0.478, 0, - 0.722, - 2.225, - 0.967, - 9, - 1, - 1.056, - 11.464, - 1.144, - 15, - 1.233, - 15, - 1, - 1.589, - 15, - 1.944, - -6, - 2.3, - -6, - 1, - 2.489, - -6, - 2.678, - -3, - 2.867, - -3, - 0, - 3.333, - -3 + 5, + 0 ] }, { @@ -1148,7 +1232,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1166,7 +1250,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1184,7 +1268,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1202,7 +1286,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1220,7 +1304,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1238,7 +1322,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1256,7 +1340,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1274,7 +1358,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1292,7 +1376,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1310,7 +1394,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1328,7 +1412,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1346,7 +1430,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1364,7 +1448,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1382,7 +1466,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1400,7 +1484,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1418,7 +1502,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1436,7 +1520,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1454,7 +1538,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1472,7 +1556,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1490,7 +1574,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1508,7 +1592,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1517,17 +1601,17 @@ "Id": "ParamArmAL01", "Segments": [ 0, - 0, + 0.232, 1, 0.056, - 0, + 0.232, 0.111, - 0, + 0.232, 0.167, + 0.232, 0, - 0, - 3.333, - 0 + 5, + 0.232 ] }, { @@ -1535,17 +1619,17 @@ "Id": "ParamArmAL02", "Segments": [ 0, - 0, + -0.373, 1, 0.056, - 0, + -0.373, 0.111, - 0, + -0.373, 0.167, + -0.373, 0, - 0, - 3.333, - 0 + 5, + -0.373 ] }, { @@ -1553,17 +1637,17 @@ "Id": "ParamArmAL03", "Segments": [ 0, - 0, + -0.305, 1, 0.056, - 0, + -0.305, 0.111, - 0, + -0.305, 0.167, + -0.305, 0, - 0, - 3.333, - 0 + 5, + -0.305 ] }, { @@ -1574,7 +1658,7 @@ 0, 0, 0, - 3.333, + 5, 0 ] }, @@ -1591,8 +1675,36 @@ 0, 0.167, 0, + 1, + 0.333, 0, - 3.333, + 0.5, + 0, + 0.667, + 0, + 1, + 1, + 0, + 1.333, + 1, + 1.667, + 1, + 1, + 1.889, + 1, + 2.111, + 1, + 2.333, + 1, + 1, + 2.689, + 1, + 3.044, + 0, + 3.4, + 0, + 0, + 5, 0 ] }, @@ -1609,8 +1721,36 @@ 0, 0.167, 0, + 1, + 0.333, 0, - 3.333, + 0.5, + 0, + 0.667, + 0, + 1, + 1.011, + 0, + 1.356, + -3, + 1.7, + -3, + 1, + 1.922, + -3, + 2.144, + -3, + 2.367, + -3, + 1, + 2.722, + -3, + 3.078, + 0, + 3.433, + 0, + 0, + 5, 0 ] }, @@ -1627,8 +1767,15 @@ 0, 0.167, 0, + 1, + 0.333, 0, - 3.333, + 0.5, + 0, + 0.667, + 0, + 0, + 5, 0 ] }, @@ -1640,7 +1787,7 @@ 0, 0, 0, - 3.333, + 5, 0 ] }, @@ -1658,7 +1805,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1676,7 +1823,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1694,7 +1841,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1712,7 +1859,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1730,7 +1877,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1748,7 +1895,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1766,7 +1913,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1784,7 +1931,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1802,7 +1949,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1820,7 +1967,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1838,7 +1985,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -1847,16 +1994,44 @@ "Id": "ParamArmDL01", "Segments": [ 0, - 0, + -0.938, 1, 0.056, - 0, + -0.938, 0.111, - 0, + -0.938, 0.167, + -0.938, + 1, + 0.322, + -0.938, + 0.478, + -0.938, + 0.633, + -0.938, + 1, + 0.956, + -0.938, + 1.278, + -4, + 1.6, + -4, + 1, + 1.944, + -4, + 2.289, + 4, + 2.633, + 4, + 1, + 3.033, + 4, + 3.433, + 0, + 3.833, 0, 0, - 3.333, + 5, 0 ] }, @@ -1865,17 +2040,45 @@ "Id": "ParamArmDL02", "Segments": [ 0, - 0, + -1.719, 1, 0.056, - 0, + -1.719, 0.111, - 0, + -1.719, 0.167, + -1.719, + 1, + 0.322, + -1.719, + 0.478, + -1.719, + 0.633, + -1.719, + 1, + 0.967, + -1.719, + 1.3, + 4.142, + 1.633, + 7, + 1, + 1.978, + 9.953, + 2.322, + 10, + 2.667, + 10, + 1, + 3.111, + 10, + 3.556, + 6, + 4, + 6, 0, - 0, - 3.333, - 0 + 5, + 6 ] }, { @@ -1883,17 +2086,45 @@ "Id": "ParamArmDL03", "Segments": [ 0, - 0, + -4.688, 1, 0.056, - 0, + -4.688, 0.111, - 0, + -4.688, 0.167, + -4.688, + 1, + 0.322, + -4.688, + 0.478, + -4.688, + 0.633, + -4.688, + 1, + 0.978, + -4.688, + 1.322, + 14.713, + 1.667, + 18, + 1, + 2.022, + 21.393, + 2.378, + 21, + 2.733, + 21, + 1, + 2.967, + 21, + 3.2, + 13, + 3.433, + 13, 0, - 0, - 3.333, - 0 + 5, + 13 ] }, { @@ -1909,8 +2140,26 @@ 0, 0.167, 0, + 1, + 1.044, 0, - 3.333, + 1.922, + -30, + 2.8, + -30, + 1, + 3.2, + -30, + 3.6, + -5.084, + 4, + -2, + 1, + 4.333, + 0.57, + 4.667, + 0, + 5, 0 ] }, @@ -1919,38 +2168,17 @@ "Id": "ParamArmER01", "Segments": [ 0, - 16, + 0, 1, 0.056, - 16, - 0.111, - 16, - 0.167, - 16, - 1, - 0.311, - 16, - 0.456, - 16, - 0.6, - 16, - 1, - 1.033, - 16, - 1.467, - 16, - 1.9, - 16, - 1, - 2.044, - 16, - 2.189, - 18, - 2.333, - 18, 0, - 3.333, - 18 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { @@ -1958,52 +2186,17 @@ "Id": "ParamArmER02", "Segments": [ 0, - 11, + 0, 1, 0.056, - 11, + 0, 0.111, - 11, + 0, 0.167, - 11, - 1, - 0.311, - 11, - 0.456, - 14.565, - 0.6, - 18, - 1, - 0.711, - 20.643, - 0.822, - 21, - 0.933, - 21, - 1, - 1.267, - 21, - 1.6, - 13.953, - 1.933, 0, - 1, - 2.078, - -6.046, - 2.222, - -9, - 2.367, - -9, - 1, - 2.544, - -9, - 2.722, - -8, - 2.9, - -8, 0, - 3.333, - -8 + 5, + 0 ] }, { @@ -2011,111 +2204,22 @@ "Id": "ParamArmER03", "Segments": [ 0, - 1, + 0, 1, 0.056, - 1, - 0.111, - 1, - 0.167, - 1, - 1, - 0.189, - 1, - 0.211, - 1, - 0.233, - 1, - 1, - 0.356, - 1, - 0.478, - 1, - 0.6, - 1, - 1, - 0.711, - 1, - 0.822, - -5.698, - 0.933, - -7, - 1, - 1.033, - -8.171, - 1.133, - -8.083, - 1.233, - -9, - 1, - 1.389, - -10.427, - 1.544, - -11.838, - 1.7, - -11.838, - 1, - 1.933, - -11.838, - 2.167, - 19, - 2.4, - 19, - 1, - 2.578, - 19, - 2.756, - 15.092, - 2.933, - 15.092, 0, - 3.333, - 15.092 + 0.111, + 0, + 0.167, + 0, + 0, + 5, + 0 ] }, { "Target": "Parameter", "Id": "ParamArmER04", - "Segments": [ - 0, - 30, - 1, - 0.056, - 30, - 0.111, - 30, - 0.167, - 30, - 1, - 0.422, - 30, - 0.678, - 30, - 0.933, - 30, - 1, - 1.089, - 30, - 1.244, - 30, - 1.4, - 30, - 1, - 1.744, - 30, - 2.089, - 9, - 2.433, - 9, - 0, - 3.333, - 9 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmERHand04", - "FadeInTime": 0.2, "Segments": [ 0, 0, @@ -2127,7 +2231,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -2145,7 +2249,7 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, @@ -2163,36 +2267,10 @@ 0.167, 0, 0, - 3.333, + 5, 0 ] }, - { - "Target": "Parameter", - "Id": "ParamArmERHand06", - "FadeInTime": 0.2, - "Segments": [ - 0, - 1, - 1, - 0.056, - 1, - 0.111, - 1, - 0.167, - 1, - 1, - 0.311, - 1, - 0.456, - 1, - 0.6, - 1, - 0, - 3.333, - 1 - ] - }, { "Target": "Parameter", "Id": "ParamArmERHand06Roll1", @@ -2206,37 +2284,9 @@ 0, 0.167, 0, - 1, - 0.311, 0, - 0.456, - 0, - 0.6, - 0, - 1, - 0.711, - 0, - 0.822, - 12.92, - 0.933, - 14, - 1, - 1.278, - 17.347, - 1.622, - 18, - 1.967, - 18, - 1, - 2.144, - 18, - 2.322, - 3, - 2.5, - 3, - 0, - 3.333, - 3 + 5, + 0 ] }, { @@ -2252,30 +2302,9 @@ 0, 0.167, 0, - 1, - 0.411, 0, - 0.656, - -30, - 0.9, - -30, - 1, - 1.167, - -30, - 1.433, - -30, - 1.7, - -30, - 1, - 1.956, - -30, - 2.211, - -24, - 2.467, - -24, - 0, - 3.333, - -24 + 5, + 0 ] }, { @@ -2285,7 +2314,7 @@ 0, 1, 0, - 3.33, + 5, 1 ] }, @@ -2296,7 +2325,7 @@ 0, 0, 0, - 3.33, + 5, 0 ] }, @@ -2305,10 +2334,10 @@ "Id": "PartArmAL", "Segments": [ 0, - 1, 0, - 3.33, - 1 + 0, + 5, + 0 ] }, { @@ -2316,10 +2345,10 @@ "Id": "PartArmAR", "Segments": [ 0, + 1, 0, - 0, - 3.33, - 0 + 5, + 1 ] }, { @@ -2329,7 +2358,7 @@ 0, 0, 0, - 3.33, + 5, 0 ] }, @@ -2340,7 +2369,7 @@ 0, 0, 0, - 3.33, + 5, 0 ] }, @@ -2349,10 +2378,10 @@ "Id": "PartArmDL", "Segments": [ 0, + 1, 0, - 0, - 3.33, - 0 + 5, + 1 ] }, { @@ -2360,10 +2389,10 @@ "Id": "PartArmER", "Segments": [ 0, - 1, 0, - 3.33, - 1 + 0, + 5, + 0 ] } ] diff --git a/Samples/Resources/Natori/motions/mtn_06.motion3.json b/Samples/Resources/Natori/motions/mtn_06.motion3.json index 76fc817..d03aac6 100644 --- a/Samples/Resources/Natori/motions/mtn_06.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_06.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 5, + "Duration": 3.33, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, "CurveCount": 99, - "TotalSegmentCount": 283, - "TotalPointCount": 752, + "TotalSegmentCount": 246, + "TotalPointCount": 639, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,43 +26,22 @@ 0.167, 0, 1, - 0.4, + 0.256, 0, - 0.633, + 0.344, 0, - 0.867, + 0.433, 0, 1, - 1.167, + 0.622, 0, - 1.467, - 13.505, - 1.767, - 16, + 0.811, + 10, 1, - 2.011, - 18.033, - 2.256, - 17.623, - 2.5, - 17.623, - 1, - 2.856, - 17.623, - 3.211, - -4.813, - 3.567, - -6, - 1, - 3.8, - -6.779, - 4.033, - -6.496, - 4.267, - -6.496, + 10, 0, - 5, - -6.496 + 3.333, + 10 ] }, { @@ -70,73 +49,59 @@ "Id": "ParamAngleY", "Segments": [ 0, - 0.017, + 0, 1, 0.056, - 0.017, + 0, 0.111, - 0.017, + 0, 0.167, - 0.017, + 0, + 1, + 0.178, + 0, + 0.189, + 0, + 0.2, + 0, + 1, + 0.267, + 0, + 0.333, + 1.753, + 0.4, + 3.095, + 1, + 0.444, + 3.989, + 0.489, + 3.997, + 0.533, + 3.997, 1, - 0.456, - 0.017, 0.744, - 0.229, - 1.033, + 3.997, + 0.956, + -27.096, + 1.167, + -27.096, 1, + 1.256, + -27.096, + 1.344, + -25.324, + 1.433, + -25.065, 1, - 1.211, - 1.475, - 1.389, - 2, - 1.567, - 2, - 1, - 1.744, - 2, - 1.922, + 1.811, + -23.961, + 2.189, + -23.671, + 2.567, + -23.671, 0, - 2.1, - 0, - 1, - 2.4, - 0, - 2.7, - 3, - 3, - 3, - 1, - 3.211, - 3, - 3.422, - -5.586, - 3.633, - -5.586, - 1, - 3.644, - -5.586, - 3.656, - -5.586, - 3.667, - -5.586, - 1, - 3.822, - -5.586, - 3.978, - 1, - 4.133, - 1, - 1, - 4.389, - 1, - 4.644, - 0, - 4.9, - 0, - 0, - 5, - 0 + 3.333, + -23.671 ] }, { @@ -153,43 +118,36 @@ 0.167, 0, 1, - 0.433, + 0.211, 0, + 0.256, + 0, + 0.3, + 0, + 1, + 0.378, + 0, + 0.456, + 0.319, + 0.533, + -1.334, + 1, 0.7, - -3, - 0.967, - -3, + -4.877, + 0.867, + -11, + 1.033, + -11, 1, - 1.256, - -3, + 1.289, + -11, 1.544, - 4.968, - 1.833, - 6, - 1, - 2.156, - 7.151, - 2.478, - 7, - 2.8, - 7, - 1, - 3, - 7, - 3.2, - -2, - 3.4, - -2, - 1, - 3.578, - -2, - 3.756, + -10, + 1.8, + -10, 0, - 3.933, - 0, - 0, - 5, - 0 + 3.333, + -10 ] }, { @@ -206,63 +164,35 @@ 0.167, 1, 1, - 0.589, + 0.344, 1, - 1.011, + 0.522, 1, - 1.433, + 0.7, 1, 1, - 1.467, + 0.744, 1, - 1.5, + 0.789, 0, + 0.833, + 0, + 1, + 0.989, + 0, + 1.144, + 0, + 1.3, + 0, + 1, + 1.378, + 0, + 1.456, + 1, 1.533, - 0, - 1, - 1.556, - 0, - 1.578, - 0, - 1.6, - 0, - 1, - 1.678, - 0, - 1.756, - 1, - 1.833, - 1, - 1, - 2.344, - 1, - 2.856, - 1, - 3.367, - 1, - 1, - 3.4, - 1, - 3.433, - 0, - 3.467, - 0, - 1, - 3.489, - 0, - 3.511, - 0, - 3.533, - 0, - 1, - 3.611, - 0, - 3.689, - 1, - 3.767, 1, 0, - 5, + 3.333, 1 ] }, @@ -280,7 +210,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -298,7 +228,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -316,63 +246,35 @@ 0.167, 1, 1, - 0.589, + 0.344, 1, - 1.011, + 0.522, 1, - 1.433, + 0.7, 1, 1, - 1.467, + 0.744, 1, - 1.5, + 0.789, 0, + 0.833, + 0, + 1, + 0.989, + 0, + 1.144, + 0, + 1.3, + 0, + 1, + 1.378, + 0, + 1.456, + 1, 1.533, - 0, - 1, - 1.556, - 0, - 1.578, - 0, - 1.6, - 0, - 1, - 1.678, - 0, - 1.756, - 1, - 1.833, - 1, - 1, - 2.344, - 1, - 2.856, - 1, - 3.367, - 1, - 1, - 3.4, - 1, - 3.433, - 0, - 3.467, - 0, - 1, - 3.489, - 0, - 3.511, - 0, - 3.533, - 0, - 1, - 3.611, - 0, - 3.689, - 1, - 3.767, 1, 0, - 5, + 3.333, 1 ] }, @@ -390,7 +292,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -408,7 +310,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -426,36 +328,22 @@ 0.167, 0, 1, - 0.578, - 0, - 0.989, - 0, - 1.4, + 0.389, 0, + 0.611, + 0.1, + 0.833, + 0.1, 1, - 1.544, + 1.067, + 0.1, + 1.3, + -0.4, + 1.533, + -0.4, 0, - 1.689, - 0.542, - 1.833, - 0.542, - 1, - 2.056, - 0.542, - 2.278, - 0.542, - 2.5, - 0.542, - 1, - 2.789, - 0.542, - 3.078, - 0, - 3.367, - 0, - 0, - 5, - 0 + 3.333, + -0.4 ] }, { @@ -472,36 +360,22 @@ 0.167, 0, 1, - 0.578, - 0, - 0.989, - 0, - 1.4, + 0.389, 0, + 0.611, + -0.2, + 0.833, + -0.2, 1, - 1.544, + 1.067, + -0.2, + 1.3, + 0.7, + 1.533, + 0.7, 0, - 1.689, - -0.386, - 1.833, - -0.386, - 1, - 2.056, - -0.386, - 2.278, - -0.386, - 2.5, - -0.386, - 1, - 2.789, - -0.386, - 3.078, - 0, - 3.367, - 0, - 0, - 5, - 0 + 3.333, + 0.7 ] }, { @@ -518,7 +392,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -536,7 +410,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -554,7 +428,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -572,7 +446,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -590,7 +464,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -608,7 +482,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -626,7 +500,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -644,7 +518,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -662,7 +536,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -680,7 +554,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -698,7 +572,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -716,7 +590,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -734,7 +608,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -752,7 +626,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -770,7 +644,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -788,7 +662,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -806,7 +680,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -824,7 +698,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -842,7 +716,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -860,7 +734,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -878,43 +752,29 @@ 0.167, 0, 1, - 0.356, + 0.244, 0, - 0.544, - -1, - 0.733, - -1, + 0.322, + -0.5, + 0.4, + -0.5, 1, - 1.044, - -1, - 1.356, - 4.155, - 1.667, + 0.622, + -0.5, + 0.844, + 6, + 1.067, + 6, + 1, + 1.3, + 6, + 1.533, + 5, + 1.767, 5, - 1, - 1.911, - 5.664, - 2.156, - 5.5, - 2.4, - 5.5, - 1, - 2.656, - 5.5, - 2.911, - -1.168, - 3.167, - -2, - 1, - 3.5, - -3.085, - 3.833, - -3, - 4.167, - -3, 0, - 5, - -3 + 3.333, + 5 ] }, { @@ -931,64 +791,29 @@ 0.167, 0, 1, - 0.356, + 0.244, 0, - 0.544, - 1.915, - 0.733, - 2, + 0.322, + 0.625, + 0.4, + 0.625, 1, - 0.878, - 2.065, - 1.022, - 2.028, - 1.167, - 2.088, + 0.633, + 0.625, + 0.867, + -4.741, + 1.1, + -4.741, 1, - 1.344, - 2.162, - 1.522, - 2.904, - 1.7, - 2.904, - 1, - 1.867, - 2.904, - 2.033, - 2, - 2.2, - 2, - 1, - 2.356, - 2, - 2.511, - 2.5, - 2.667, - 2.5, - 1, - 2.978, - 2.5, - 3.289, - -1.006, - 3.6, - -1.006, - 1, - 3.8, - -1.006, - 4, - 0.139, - 4.2, - 0.139, - 1, - 4.378, - 0.139, - 4.556, + 1.333, + -4.741, + 1.567, + -4, + 1.8, + -4, 0, - 4.733, - 0, - 0, - 5, - 0 + 3.333, + -4 ] }, { @@ -1005,29 +830,22 @@ 0.167, 0, 1, + 0.256, + 0, + 0.344, + 0, 0.433, 0, - 0.7, + 1, + 0.611, 0, + 0.789, + -3, 0.967, + -3, 0, - 1, - 1.222, - 0, - 1.478, - 1, - 1.733, - 1, - 1, - 2.456, - 1, - 3.178, - 1, - 3.9, - 1, - 0, - 5, - 1 + 3.333, + -3 ] }, { @@ -1035,45 +853,31 @@ "Id": "ParamWaistAngleZ", "Segments": [ 0, - 0.124, + 0, 1, 0.056, - 0.124, + 0, 0.111, - 0.124, + 0, 0.167, - 0.124, + 0, 1, - 0.478, - 0.124, + 0.256, + 0, + 0.344, + 0, + 0.433, + 0, + 1, + 0.611, + 0, 0.789, - 2, - 1.1, - 2, - 1, - 1.3, - 2, - 1.5, - -1, - 1.7, - -1, - 1, - 2.2, - -1, - 2.7, - -1, - 3.2, - -1, - 1, - 3.456, - -1, - 3.711, + -5, + 0.967, + -5, 0, - 3.967, - 0, - 0, - 5, - 0 + 3.333, + -5 ] }, { @@ -1090,15 +894,29 @@ 0.167, 0, 1, - 1.656, + 0.244, 0, - 3.144, + 0.322, + -3, + 0.4, + -3, + 1, + 0.544, + -3, + 0.689, + 0.972, + 0.833, + 3.4, + 1, + 1.144, + 8.63, + 1.456, + 10, + 1.767, + 10, 0, - 4.633, - 0, - 0, - 5, - 0 + 3.333, + 10 ] }, { @@ -1115,42 +933,14 @@ 0.167, 0, 1, - 0.411, + 0.178, 0, - 0.656, + 0.189, 0, - 0.9, - 0, - 1, - 1.411, - 0, - 1.922, - 0.501, - 2.433, - 0.501, - 1, - 2.511, - 0.501, - 2.589, - 0.501, - 2.667, - 0.501, - 1, - 3.178, - 0.501, - 3.689, - 0, - 4.2, - 0, - 1, - 4.322, - 0, - 4.444, - 0, - 4.567, + 0.2, 0, 0, - 5, + 3.333, 0 ] }, @@ -1168,29 +958,29 @@ 0.167, 0, 1, - 0.356, + 0.244, 0, - 0.544, - -6, - 0.733, - -6, + 0.322, + 1.58, + 0.4, + 4, 1, - 0.933, - -6, - 1.133, - 6, - 1.333, - 6, + 0.589, + 9.878, + 0.778, + 16.122, + 0.967, + 21, 1, - 1.522, - 6, - 1.711, - 2, - 1.9, - 2, + 1.222, + 27.599, + 1.478, + 30, + 1.733, + 30, 0, - 5, - 2 + 3.333, + 30 ] }, { @@ -1207,15 +997,29 @@ 0.167, 0, 1, - 0.289, + 0.244, 0, - 0.411, + 0.322, + 2, + 0.4, + 2, + 1, + 0.589, + 2, + 0.778, + -19, + 0.967, + -19, + 1, + 1.222, + -19, + 1.478, + -13, + 1.733, + -13, 0, - 0.533, - 0, - 0, - 5, - 0 + 3.333, + -13 ] }, { @@ -1232,7 +1036,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1250,7 +1054,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1268,7 +1072,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1286,7 +1090,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1304,7 +1108,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1322,7 +1126,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1340,7 +1144,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1358,7 +1162,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1376,7 +1180,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1394,7 +1198,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1412,7 +1216,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1430,7 +1234,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1448,7 +1252,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1466,7 +1270,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1484,7 +1288,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1502,7 +1306,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1520,7 +1324,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1538,7 +1342,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1556,7 +1360,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1574,7 +1378,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1592,7 +1396,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1601,17 +1405,31 @@ "Id": "ParamArmAL01", "Segments": [ 0, - 0.232, + 0.7, 1, 0.056, - 0.232, + 0.7, 0.111, - 0.232, + 0.7, 0.167, - 0.232, + 0.7, + 1, + 0.422, + 0.7, + 0.678, + 0.191, + 0.933, + -0.5, + 1, + 1.211, + -1.251, + 1.489, + -1.5, + 1.767, + -1.5, 0, - 5, - 0.232 + 3.333, + -1.5 ] }, { @@ -1619,17 +1437,31 @@ "Id": "ParamArmAL02", "Segments": [ 0, - -0.373, + -8, 1, 0.056, - -0.373, + -8, 0.111, - -0.373, + -8, 0.167, - -0.373, + -8, + 1, + 0.433, + -8, + 0.7, + -8, + 0.967, + -8, + 1, + 1.233, + -8, + 1.5, + -8, + 1.767, + -8, 0, - 5, - -0.373 + 3.333, + -8 ] }, { @@ -1637,17 +1469,31 @@ "Id": "ParamArmAL03", "Segments": [ 0, - -0.305, + -3, 1, 0.056, - -0.305, + -3, 0.111, - -0.305, + -3, 0.167, - -0.305, + -3, + 1, + 0.433, + -3, + 0.7, + -3, + 0.967, + -3, + 1, + 1.233, + -3, + 1.5, 0, - 5, - -0.305 + 1.767, + 0, + 0, + 3.333, + 0 ] }, { @@ -1656,10 +1502,17 @@ "FadeInTime": 0.2, "Segments": [ 0, + -1, + 1, + 0.056, + -1, + 0.111, + -1, + 0.167, + -1, 0, - 0, - 5, - 0 + 3.333, + -1 ] }, { @@ -1667,45 +1520,31 @@ "Id": "ParamArmAR01", "Segments": [ 0, - 0, + 0.7, 1, 0.056, - 0, + 0.7, 0.111, - 0, + 0.7, 0.167, + 0.7, + 1, + 0.422, + 0.7, + 0.678, + 0.191, + 0.933, + -0.5, + 1, + 1.211, + -1.251, + 1.489, + -1.5, + 1.767, + -1.5, 0, - 1, - 0.333, - 0, - 0.5, - 0, - 0.667, - 0, - 1, - 1, - 0, - 1.333, - 1, - 1.667, - 1, - 1, - 1.889, - 1, - 2.111, - 1, - 2.333, - 1, - 1, - 2.689, - 1, - 3.044, - 0, - 3.4, - 0, - 0, - 5, - 0 + 3.333, + -1.5 ] }, { @@ -1713,45 +1552,31 @@ "Id": "ParamArmAR02", "Segments": [ 0, - 0, + -8, 1, 0.056, - 0, + -8, 0.111, - 0, + -8, 0.167, - 0, + -8, 1, - 0.333, - 0, - 0.5, - 0, - 0.667, - 0, + 0.433, + -8, + 0.7, + -8, + 0.967, + -8, 1, - 1.011, + 1.233, + -8, + 1.5, + -7, + 1.767, + -7, 0, - 1.356, - -3, - 1.7, - -3, - 1, - 1.922, - -3, - 2.144, - -3, - 2.367, - -3, - 1, - 2.722, - -3, - 3.078, - 0, - 3.433, - 0, - 0, - 5, - 0 + 3.333, + -7 ] }, { @@ -1759,24 +1584,31 @@ "Id": "ParamArmAR03", "Segments": [ 0, - 0, + -3, 1, 0.056, - 0, + -3, 0.111, - 0, + -3, 0.167, - 0, + -3, 1, - 0.333, + 0.433, + -3, + 0.7, + -3, + 0.967, + -3, + 1, + 1.233, + -3, + 1.5, + -10, + 1.767, + -10, 0, - 0.5, - 0, - 0.667, - 0, - 0, - 5, - 0 + 3.333, + -10 ] }, { @@ -1785,10 +1617,17 @@ "FadeInTime": 0.2, "Segments": [ 0, + -1, + 1, + 0.056, + -1, + 0.111, + -1, + 0.167, + -1, 0, - 0, - 5, - 0 + 3.333, + -1 ] }, { @@ -1805,7 +1644,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1823,7 +1662,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1841,7 +1680,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1859,7 +1698,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1877,7 +1716,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1895,7 +1734,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1913,7 +1752,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1931,7 +1770,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1949,7 +1788,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1967,7 +1806,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1985,7 +1824,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -1994,44 +1833,16 @@ "Id": "ParamArmDL01", "Segments": [ 0, - -0.938, + 0, 1, 0.056, - -0.938, + 0, 0.111, - -0.938, + 0, 0.167, - -0.938, - 1, - 0.322, - -0.938, - 0.478, - -0.938, - 0.633, - -0.938, - 1, - 0.956, - -0.938, - 1.278, - -4, - 1.6, - -4, - 1, - 1.944, - -4, - 2.289, - 4, - 2.633, - 4, - 1, - 3.033, - 4, - 3.433, - 0, - 3.833, 0, 0, - 5, + 3.333, 0 ] }, @@ -2040,45 +1851,17 @@ "Id": "ParamArmDL02", "Segments": [ 0, - -1.719, + 0, 1, 0.056, - -1.719, - 0.111, - -1.719, - 0.167, - -1.719, - 1, - 0.322, - -1.719, - 0.478, - -1.719, - 0.633, - -1.719, - 1, - 0.967, - -1.719, - 1.3, - 4.142, - 1.633, - 7, - 1, - 1.978, - 9.953, - 2.322, - 10, - 2.667, - 10, - 1, - 3.111, - 10, - 3.556, - 6, - 4, - 6, 0, - 5, - 6 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -2086,45 +1869,17 @@ "Id": "ParamArmDL03", "Segments": [ 0, - -4.688, + 0, 1, 0.056, - -4.688, - 0.111, - -4.688, - 0.167, - -4.688, - 1, - 0.322, - -4.688, - 0.478, - -4.688, - 0.633, - -4.688, - 1, - 0.978, - -4.688, - 1.322, - 14.713, - 1.667, - 18, - 1, - 2.022, - 21.393, - 2.378, - 21, - 2.733, - 21, - 1, - 2.967, - 21, - 3.2, - 13, - 3.433, - 13, 0, - 5, - 13 + 0.111, + 0, + 0.167, + 0, + 0, + 3.333, + 0 ] }, { @@ -2140,26 +1895,8 @@ 0, 0.167, 0, - 1, - 1.044, 0, - 1.922, - -30, - 2.8, - -30, - 1, - 3.2, - -30, - 3.6, - -5.084, - 4, - -2, - 1, - 4.333, - 0.57, - 4.667, - 0, - 5, + 3.333, 0 ] }, @@ -2177,7 +1914,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2195,7 +1932,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2213,7 +1950,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2231,7 +1968,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2249,7 +1986,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2267,7 +2004,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2285,7 +2022,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2303,7 +2040,7 @@ 0.167, 0, 0, - 5, + 3.333, 0 ] }, @@ -2314,7 +2051,7 @@ 0, 1, 0, - 5, + 3.33, 1 ] }, @@ -2325,7 +2062,7 @@ 0, 0, 0, - 5, + 3.33, 0 ] }, @@ -2334,10 +2071,10 @@ "Id": "PartArmAL", "Segments": [ 0, + 1, 0, - 0, - 5, - 0 + 3.33, + 1 ] }, { @@ -2347,7 +2084,7 @@ 0, 1, 0, - 5, + 3.33, 1 ] }, @@ -2358,7 +2095,7 @@ 0, 0, 0, - 5, + 3.33, 0 ] }, @@ -2369,7 +2106,7 @@ 0, 0, 0, - 5, + 3.33, 0 ] }, @@ -2378,10 +2115,10 @@ "Id": "PartArmDL", "Segments": [ 0, - 1, 0, - 5, - 1 + 0, + 3.33, + 0 ] }, { @@ -2391,7 +2128,7 @@ 0, 0, 0, - 5, + 3.33, 0 ] } diff --git a/Samples/Resources/Natori/motions/mtn_07.motion3.json b/Samples/Resources/Natori/motions/mtn_07.motion3.json index d03aac6..feb7c01 100644 --- a/Samples/Resources/Natori/motions/mtn_07.motion3.json +++ b/Samples/Resources/Natori/motions/mtn_07.motion3.json @@ -1,13 +1,13 @@ { "Version": 3, "Meta": { - "Duration": 3.33, + "Duration": 4, "Fps": 30.0, "Loop": true, "AreBeziersRestricted": true, "CurveCount": 99, - "TotalSegmentCount": 246, - "TotalPointCount": 639, + "TotalSegmentCount": 221, + "TotalPointCount": 564, "UserDataCount": 0, "TotalUserDataSize": 0 }, @@ -26,22 +26,43 @@ 0.167, 0, 1, - 0.256, + 0.333, 0, - 0.344, + 0.5, 0, - 0.433, + 0.667, 0, 1, - 0.622, + 0.767, 0, - 0.811, - 10, + 0.867, + -13, + 0.967, + -13, 1, - 10, + 1.067, + -13, + 1.167, + 11, + 1.267, + 11, + 1, + 1.4, + 11, + 1.533, + -8, + 1.667, + -8, + 1, + 1.833, + -8, + 2, 0, - 3.333, - 10 + 2.167, + 0, + 0, + 4, + 0 ] }, { @@ -58,50 +79,50 @@ 0.167, 0, 1, - 0.178, - 0, - 0.189, - 0, 0.2, 0, - 1, + 0.233, + 0, 0.267, 0, + 1, 0.333, - 1.753, - 0.4, - 3.095, - 1, - 0.444, - 3.989, - 0.489, - 3.997, - 0.533, - 3.997, - 1, - 0.744, - 3.997, - 0.956, - -27.096, - 1.167, - -27.096, - 1, - 1.256, - -27.096, - 1.344, - -25.324, - 1.433, - -25.065, - 1, - 1.811, - -23.961, - 2.189, - -23.671, - 2.567, - -23.671, 0, - 3.333, - -23.671 + 0.4, + 9, + 0.467, + 9, + 1, + 0.7, + 9, + 0.933, + -6, + 1.167, + -6, + 1, + 1.6, + -6, + 2.033, + -1, + 2.467, + -1, + 1, + 2.622, + -1, + 2.778, + -4, + 2.933, + -4, + 1, + 3.078, + -4, + 3.222, + 0, + 3.367, + 0, + 0, + 4, + 0 ] }, { @@ -118,36 +139,22 @@ 0.167, 0, 1, - 0.211, - 0, - 0.256, - 0, 0.3, 0, + 0.433, + 4, + 0.567, + 4, 1, - 0.378, + 0.978, + 4, + 1.389, 0, - 0.456, - 0.319, - 0.533, - -1.334, - 1, - 0.7, - -4.877, - 0.867, - -11, - 1.033, - -11, - 1, - 1.289, - -11, - 1.544, - -10, 1.8, - -10, 0, - 3.333, - -10 + 0, + 4, + 0 ] }, { @@ -164,35 +171,35 @@ 0.167, 1, 1, - 0.344, + 0.289, 1, - 0.522, + 0.411, 1, - 0.7, + 0.533, 1, 1, - 0.744, + 0.622, 1, - 0.789, + 0.711, 0, - 0.833, + 0.8, 0, 1, - 0.989, + 1.522, 0, - 1.144, + 2.244, 0, - 1.3, + 2.967, 0, 1, - 1.378, + 3.078, 0, - 1.456, + 3.189, 1, - 1.533, + 3.3, 1, 0, - 3.333, + 4, 1 ] }, @@ -210,7 +217,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -228,7 +235,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -246,35 +253,35 @@ 0.167, 1, 1, - 0.344, + 0.289, 1, - 0.522, + 0.411, 1, - 0.7, + 0.533, 1, 1, - 0.744, + 0.622, 1, - 0.789, + 0.711, 0, - 0.833, + 0.8, 0, 1, - 0.989, + 1.522, 0, - 1.144, + 2.244, 0, - 1.3, + 2.967, 0, 1, - 1.378, + 3.078, 0, - 1.456, + 3.189, 1, - 1.533, + 3.3, 1, 0, - 3.333, + 4, 1 ] }, @@ -292,7 +299,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -310,7 +317,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -327,23 +334,9 @@ 0, 0.167, 0, - 1, - 0.389, 0, - 0.611, - 0.1, - 0.833, - 0.1, - 1, - 1.067, - 0.1, - 1.3, - -0.4, - 1.533, - -0.4, - 0, - 3.333, - -0.4 + 4, + 0 ] }, { @@ -360,22 +353,29 @@ 0.167, 0, 1, - 0.389, + 0.289, 0, - 0.611, - -0.2, - 0.833, - -0.2, + 0.411, + -0.4, + 0.533, + -0.4, 1, - 1.067, - -0.2, - 1.3, - 0.7, - 1.533, - 0.7, + 1.344, + -0.4, + 2.156, + -0.4, + 2.967, + -0.4, + 1, + 3.078, + -0.4, + 3.189, 0, - 3.333, - 0.7 + 3.3, + 0, + 0, + 4, + 0 ] }, { @@ -392,7 +392,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -410,7 +410,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -428,7 +428,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -446,7 +446,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -464,7 +464,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -482,7 +482,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -500,7 +500,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -518,7 +518,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -536,7 +536,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -554,7 +554,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -572,7 +572,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -590,7 +590,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -608,7 +608,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -626,7 +626,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -644,7 +644,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -662,7 +662,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -680,7 +680,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -698,7 +698,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -716,7 +716,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -734,7 +734,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -751,30 +751,9 @@ 0, 0.167, 0, - 1, - 0.244, 0, - 0.322, - -0.5, - 0.4, - -0.5, - 1, - 0.622, - -0.5, - 0.844, - 6, - 1.067, - 6, - 1, - 1.3, - 6, - 1.533, - 5, - 1.767, - 5, - 0, - 3.333, - 5 + 4, + 0 ] }, { @@ -791,29 +770,22 @@ 0.167, 0, 1, - 0.244, + 0.256, 0, - 0.322, - 0.625, - 0.4, - 0.625, + 0.344, + 2.02, + 0.433, + 2.02, 1, - 0.633, - 0.625, - 0.867, - -4.741, - 1.1, - -4.741, - 1, - 1.333, - -4.741, - 1.567, - -4, - 1.8, - -4, + 0.856, + 2.02, + 1.278, 0, - 3.333, - -4 + 1.7, + 0, + 0, + 4, + 0 ] }, { @@ -829,23 +801,9 @@ 0, 0.167, 0, - 1, - 0.256, 0, - 0.344, - 0, - 0.433, - 0, - 1, - 0.611, - 0, - 0.789, - -3, - 0.967, - -3, - 0, - 3.333, - -3 + 4, + 0 ] }, { @@ -861,23 +819,9 @@ 0, 0.167, 0, - 1, - 0.256, 0, - 0.344, - 0, - 0.433, - 0, - 1, - 0.611, - 0, - 0.789, - -5, - 0.967, - -5, - 0, - 3.333, - -5 + 4, + 0 ] }, { @@ -893,30 +837,9 @@ 0, 0.167, 0, - 1, - 0.244, 0, - 0.322, - -3, - 0.4, - -3, - 1, - 0.544, - -3, - 0.689, - 0.972, - 0.833, - 3.4, - 1, - 1.144, - 8.63, - 1.456, - 10, - 1.767, - 10, - 0, - 3.333, - 10 + 4, + 0 ] }, { @@ -933,14 +856,28 @@ 0.167, 0, 1, - 0.178, - 0, - 0.189, + 0.256, 0, + 0.344, + 0.5, + 0.433, + 0.5, + 1, + 0.633, + 0.5, + 0.833, + 0.279, + 1.033, 0.2, + 1, + 1.467, + 0.029, + 1.9, + 0, + 2.333, 0, 0, - 3.333, + 4, 0 ] }, @@ -958,29 +895,22 @@ 0.167, 0, 1, - 0.244, + 0.278, + 0, + 0.389, + 10, + 0.5, + 10, + 1, + 0.633, + 10, + 0.767, + -5, + 0.9, + -5, 0, - 0.322, - 1.58, - 0.4, 4, - 1, - 0.589, - 9.878, - 0.778, - 16.122, - 0.967, - 21, - 1, - 1.222, - 27.599, - 1.478, - 30, - 1.733, - 30, - 0, - 3.333, - 30 + -5 ] }, { @@ -997,29 +927,22 @@ 0.167, 0, 1, - 0.244, + 0.278, 0, - 0.322, - 2, - 0.4, - 2, + 0.389, + 10, + 0.5, + 10, 1, - 0.589, - 2, - 0.778, - -19, - 0.967, - -19, - 1, - 1.222, - -19, - 1.478, - -13, - 1.733, - -13, + 0.633, + 10, + 0.767, + -5, + 0.9, + -5, 0, - 3.333, - -13 + 4, + -5 ] }, { @@ -1036,7 +959,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1054,7 +977,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1072,7 +995,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1090,7 +1013,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1108,7 +1031,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1126,7 +1049,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1144,7 +1067,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1162,7 +1085,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1180,7 +1103,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1198,7 +1121,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1216,7 +1139,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1234,7 +1157,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1252,7 +1175,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1270,7 +1193,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1288,7 +1211,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1306,7 +1229,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1324,7 +1247,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1342,7 +1265,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1360,7 +1283,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1378,7 +1301,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1396,7 +1319,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1405,31 +1328,17 @@ "Id": "ParamArmAL01", "Segments": [ 0, - 0.7, + 0, 1, 0.056, - 0.7, - 0.111, - 0.7, - 0.167, - 0.7, - 1, - 0.422, - 0.7, - 0.678, - 0.191, - 0.933, - -0.5, - 1, - 1.211, - -1.251, - 1.489, - -1.5, - 1.767, - -1.5, 0, - 3.333, - -1.5 + 0.111, + 0, + 0.167, + 0, + 0, + 4, + 0 ] }, { @@ -1437,31 +1346,17 @@ "Id": "ParamArmAL02", "Segments": [ 0, - -8, + 0, 1, 0.056, - -8, - 0.111, - -8, - 0.167, - -8, - 1, - 0.433, - -8, - 0.7, - -8, - 0.967, - -8, - 1, - 1.233, - -8, - 1.5, - -8, - 1.767, - -8, 0, - 3.333, - -8 + 0.111, + 0, + 0.167, + 0, + 0, + 4, + 0 ] }, { @@ -1469,30 +1364,16 @@ "Id": "ParamArmAL03", "Segments": [ 0, - -3, + 0, 1, 0.056, - -3, + 0, 0.111, - -3, + 0, 0.167, - -3, - 1, - 0.433, - -3, - 0.7, - -3, - 0.967, - -3, - 1, - 1.233, - -3, - 1.5, - 0, - 1.767, 0, 0, - 3.333, + 4, 0 ] }, @@ -1502,17 +1383,10 @@ "FadeInTime": 0.2, "Segments": [ 0, - -1, - 1, - 0.056, - -1, - 0.111, - -1, - 0.167, - -1, 0, - 3.333, - -1 + 0, + 4, + 0 ] }, { @@ -1520,31 +1394,17 @@ "Id": "ParamArmAR01", "Segments": [ 0, - 0.7, + 0, 1, 0.056, - 0.7, - 0.111, - 0.7, - 0.167, - 0.7, - 1, - 0.422, - 0.7, - 0.678, - 0.191, - 0.933, - -0.5, - 1, - 1.211, - -1.251, - 1.489, - -1.5, - 1.767, - -1.5, 0, - 3.333, - -1.5 + 0.111, + 0, + 0.167, + 0, + 0, + 4, + 0 ] }, { @@ -1552,31 +1412,17 @@ "Id": "ParamArmAR02", "Segments": [ 0, - -8, + 0, 1, 0.056, - -8, - 0.111, - -8, - 0.167, - -8, - 1, - 0.433, - -8, - 0.7, - -8, - 0.967, - -8, - 1, - 1.233, - -8, - 1.5, - -7, - 1.767, - -7, 0, - 3.333, - -7 + 0.111, + 0, + 0.167, + 0, + 0, + 4, + 0 ] }, { @@ -1584,31 +1430,17 @@ "Id": "ParamArmAR03", "Segments": [ 0, - -3, + 0, 1, 0.056, - -3, - 0.111, - -3, - 0.167, - -3, - 1, - 0.433, - -3, - 0.7, - -3, - 0.967, - -3, - 1, - 1.233, - -3, - 1.5, - -10, - 1.767, - -10, 0, - 3.333, - -10 + 0.111, + 0, + 0.167, + 0, + 0, + 4, + 0 ] }, { @@ -1617,17 +1449,10 @@ "FadeInTime": 0.2, "Segments": [ 0, - -1, - 1, - 0.056, - -1, - 0.111, - -1, - 0.167, - -1, 0, - 3.333, - -1 + 0, + 4, + 0 ] }, { @@ -1644,7 +1469,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1662,7 +1487,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1680,7 +1505,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1698,7 +1523,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1716,7 +1541,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1734,7 +1559,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1752,7 +1577,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1770,7 +1595,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1788,7 +1613,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1806,7 +1631,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1824,7 +1649,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1842,7 +1667,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1860,7 +1685,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1878,7 +1703,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1896,7 +1721,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1914,7 +1739,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1932,7 +1757,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1950,7 +1775,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1968,7 +1793,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -1986,7 +1811,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -2004,7 +1829,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -2022,7 +1847,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -2040,7 +1865,7 @@ 0.167, 0, 0, - 3.333, + 4, 0 ] }, @@ -2051,7 +1876,7 @@ 0, 1, 0, - 3.33, + 4, 1 ] }, @@ -2062,7 +1887,7 @@ 0, 0, 0, - 3.33, + 4, 0 ] }, @@ -2073,7 +1898,7 @@ 0, 1, 0, - 3.33, + 4, 1 ] }, @@ -2084,7 +1909,7 @@ 0, 1, 0, - 3.33, + 4, 1 ] }, @@ -2095,7 +1920,7 @@ 0, 0, 0, - 3.33, + 4, 0 ] }, @@ -2106,7 +1931,7 @@ 0, 0, 0, - 3.33, + 4, 0 ] }, @@ -2117,7 +1942,7 @@ 0, 0, 0, - 3.33, + 4, 0 ] }, @@ -2128,7 +1953,7 @@ 0, 0, 0, - 3.33, + 4, 0 ] } diff --git a/Samples/Resources/Natori/motions/mtn_08.motion3.json b/Samples/Resources/Natori/motions/mtn_08.motion3.json deleted file mode 100644 index feb7c01..0000000 --- a/Samples/Resources/Natori/motions/mtn_08.motion3.json +++ /dev/null @@ -1,1961 +0,0 @@ -{ - "Version": 3, - "Meta": { - "Duration": 4, - "Fps": 30.0, - "Loop": true, - "AreBeziersRestricted": true, - "CurveCount": 99, - "TotalSegmentCount": 221, - "TotalPointCount": 564, - "UserDataCount": 0, - "TotalUserDataSize": 0 - }, - "Curves": [ - { - "Target": "Parameter", - "Id": "ParamAngleX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.333, - 0, - 0.5, - 0, - 0.667, - 0, - 1, - 0.767, - 0, - 0.867, - -13, - 0.967, - -13, - 1, - 1.067, - -13, - 1.167, - 11, - 1.267, - 11, - 1, - 1.4, - 11, - 1.533, - -8, - 1.667, - -8, - 1, - 1.833, - -8, - 2, - 0, - 2.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamAngleY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.2, - 0, - 0.233, - 0, - 0.267, - 0, - 1, - 0.333, - 0, - 0.4, - 9, - 0.467, - 9, - 1, - 0.7, - 9, - 0.933, - -6, - 1.167, - -6, - 1, - 1.6, - -6, - 2.033, - -1, - 2.467, - -1, - 1, - 2.622, - -1, - 2.778, - -4, - 2.933, - -4, - 1, - 3.078, - -4, - 3.222, - 0, - 3.367, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamAngleZ", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.3, - 0, - 0.433, - 4, - 0.567, - 4, - 1, - 0.978, - 4, - 1.389, - 0, - 1.8, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeLOpen", - "Segments": [ - 0, - 1, - 1, - 0.056, - 1, - 0.111, - 1, - 0.167, - 1, - 1, - 0.289, - 1, - 0.411, - 1, - 0.533, - 1, - 1, - 0.622, - 1, - 0.711, - 0, - 0.8, - 0, - 1, - 1.522, - 0, - 2.244, - 0, - 2.967, - 0, - 1, - 3.078, - 0, - 3.189, - 1, - 3.3, - 1, - 0, - 4, - 1 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeLSmile", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeLForm", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeROpen", - "Segments": [ - 0, - 1, - 1, - 0.056, - 1, - 0.111, - 1, - 0.167, - 1, - 1, - 0.289, - 1, - 0.411, - 1, - 0.533, - 1, - 1, - 0.622, - 1, - 0.711, - 0, - 0.8, - 0, - 1, - 1.522, - 0, - 2.244, - 0, - 2.967, - 0, - 1, - 3.078, - 0, - 3.189, - 1, - 3.3, - 1, - 0, - 4, - 1 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeRSmile", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeRForm", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeBallX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeBallY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.289, - 0, - 0.411, - -0.4, - 0.533, - -0.4, - 1, - 1.344, - -0.4, - 2.156, - -0.4, - 2.967, - -0.4, - 1, - 3.078, - -0.4, - 3.189, - 0, - 3.3, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamEyeBallForm", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowLY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowRY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowLX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowRX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowLAngle", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowRAngle", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowLForm", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowLForm2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowRForm", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBrowRForm2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamMouthForm", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamMouthOpenY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamMouthForm2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamTeethOn", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamCheek", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamGlassUD", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamGrassWhite", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamGrassHighlight", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamGrassHighlightMove", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBodyAngleX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBodyAngleY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.256, - 0, - 0.344, - 2.02, - 0.433, - 2.02, - 1, - 0.856, - 2.02, - 1.278, - 0, - 1.7, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBodyAngleZ", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWaistAngleZ", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBodyPosition", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamBreath", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.256, - 0, - 0.344, - 0.5, - 0.433, - 0.5, - 1, - 0.633, - 0.5, - 0.833, - 0.279, - 1.033, - 0.2, - 1, - 1.467, - 0.029, - 1.9, - 0, - 2.333, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamLeftShoulderUp", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.278, - 0, - 0.389, - 10, - 0.5, - 10, - 1, - 0.633, - 10, - 0.767, - -5, - 0.9, - -5, - 0, - 4, - -5 - ] - }, - { - "Target": "Parameter", - "Id": "ParamRightShoulderUp", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 1, - 0.278, - 0, - 0.389, - 10, - 0.5, - 10, - 1, - 0.633, - 10, - 0.767, - -5, - 0.9, - -5, - 0, - 4, - -5 - ] - }, - { - "Target": "Parameter", - "Id": "ParamAllX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamAllY", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamAllRotate", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamHairFront", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamHairSide", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamHairBack", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamHairFrontFuwa", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamHairSideFuwa", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamHairBackFuwa", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamJacket", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamChainWaist", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchSwingA1", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchSwingA2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchAX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchBSwitch", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchBOpen", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchBOpen2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchBX", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchBRoll", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchBLR", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamWatchBUD", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAL01", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAL02", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAL03", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAL04", - "FadeInTime": 0.2, - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAR01", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAR02", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAR03", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmAR04", - "FadeInTime": 0.2, - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBR01", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBR02", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBR03", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBRHand01Roll", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBRHand05Roll1", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBRHand05Roll2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmBRHand05Roll3", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmCR01", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmCR02", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmCR03", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmCLHandRoll1", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmDL01", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmDL02", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmDL03", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmDLHand03Roll", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmER01", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmER02", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmER03", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmER04", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmERHand04Roll1", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmERHand04Roll2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmERHand06Roll1", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "Parameter", - "Id": "ParamArmERHand06Roll2", - "Segments": [ - 0, - 0, - 1, - 0.056, - 0, - 0.111, - 0, - 0.167, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartWatchA", - "Segments": [ - 0, - 1, - 0, - 4, - 1 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartWatchB", - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartArmAL", - "Segments": [ - 0, - 1, - 0, - 4, - 1 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartArmAR", - "Segments": [ - 0, - 1, - 0, - 4, - 1 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartArmBR", - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartArmCL", - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartArmDL", - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - }, - { - "Target": "PartOpacity", - "Id": "PartArmER", - "Segments": [ - 0, - 0, - 0, - 4, - 0 - ] - } - ] -} \ No newline at end of file diff --git a/Samples/Resources/Rice/Rice.model3.json b/Samples/Resources/Rice/Rice.model3.json index 5366717..dd86afa 100644 --- a/Samples/Resources/Rice/Rice.model3.json +++ b/Samples/Resources/Rice/Rice.model3.json @@ -11,7 +11,7 @@ "Motions": { "Idle": [ { - "File": "motions/mtn_00.motion3.json" + "File": "motions/idle.motion3.json" } ], "TapBody": [ @@ -48,4 +48,4 @@ "Name": "Body" } ] -} \ No newline at end of file +} diff --git a/Samples/Resources/Rice/motions/mtn_00.motion3.json b/Samples/Resources/Rice/motions/idle.motion3.json similarity index 100% rename from Samples/Resources/Rice/motions/mtn_00.motion3.json rename to Samples/Resources/Rice/motions/idle.motion3.json diff --git a/Samples/TypeScript/Demo/package-lock.json b/Samples/TypeScript/Demo/package-lock.json index 7b31bb6..5a3f635 100644 --- a/Samples/TypeScript/Demo/package-lock.json +++ b/Samples/TypeScript/Demo/package-lock.json @@ -8,140 +8,86 @@ "whatwg-fetch": "^3.6.2" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^4.16.1", - "@typescript-eslint/parser": "^4.16.1", - "eslint": "^7.21.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-prettier": "^3.3.1", - "prettier": "^2.2.1", + "@typescript-eslint/eslint-plugin": "^5.5.0", + "@typescript-eslint/parser": "^5.5.0", + "eslint": "^8.3.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-prettier": "^4.0.0", + "prettier": "^2.5.0", "rimraf": "^3.0.2", - "serve": "^11.3.2", - "ts-loader": "^8.0.17", - "typescript": "^4.2.2", - "webpack": "^5.24.3", - "webpack-cli": "^4.5.0", - "webpack-dev-server": "^3.11.2" - } - }, - "node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true - }, - "node_modules/@babel/highlight": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", - "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", - "dev": true, - "dependencies": { - "@babel/helper-validator-identifier": "^7.12.11", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" + "serve": "^13.0.2", + "ts-loader": "^9.2.6", + "typescript": "^4.5.2", + "webpack": "^5.64.4", + "webpack-cli": "^4.9.1", + "webpack-dev-server": "^4.6.0" } }, "node_modules/@discoveryjs/json-ext": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz", - "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", + "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==", "dev": true, "engines": { "node": ">=10.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz", - "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.4.tgz", + "integrity": "sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==", "dev": true, "dependencies": { "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^12.1.0", + "debug": "^4.3.2", + "espree": "^9.0.0", + "globals": "^13.9.0", "ignore": "^4.0.6", "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "minimatch": "^3.0.4", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@eslint/eslintrc/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", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/@eslint/eslintrc/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@eslint/eslintrc/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/@eslint/eslintrc/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/@eslint/eslintrc/node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 4" } }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz", + "integrity": "sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, "node_modules/@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", + "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.4", + "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" }, "engines": { @@ -149,21 +95,21 @@ } }, "node_modules/@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", + "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.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", + "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.4", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" }, "engines": { @@ -171,9 +117,9 @@ } }, "node_modules/@types/eslint": { - "version": "7.2.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.6.tgz", - "integrity": "sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.0.tgz", + "integrity": "sha512-74hbvsnc+7TEDa1z5YLSe4/q8hGYB3USNvCuzHUJrjPV6hXaq8IXcngCrHkuvFt0+8rFz7xYXrHgNayIX0UZvQ==", "dev": true, "dependencies": { "@types/estree": "*", @@ -181,9 +127,9 @@ } }, "node_modules/@types/eslint-scope": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz", - "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==", "dev": true, "dependencies": { "@types/eslint": "*", @@ -191,71 +137,63 @@ } }, "node_modules/@types/estree": { - "version": "0.0.46", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", - "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==", + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", "dev": true }, - "node_modules/@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "dev": true - }, - "node_modules/@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "node_modules/@types/http-proxy": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz", + "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==", "dev": true, "dependencies": { - "@types/events": "*", - "@types/minimatch": "*", "@types/node": "*" } }, "node_modules/@types/json-schema": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", - "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", - "dev": true - }, - "node_modules/@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, "node_modules/@types/node": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.0.tgz", - "integrity": "sha512-zwrxviZS08kRX40nqBrmERElF2vpw4IUTd5khkhBTfFH8AOaeoLVx48EC4+ZzS2/Iga7NevncqnsUSYjM4OWYA==", + "version": "16.11.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.11.tgz", + "integrity": "sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==", + "dev": true + }, + "node_modules/@types/retry": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz", + "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==", "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz", - "integrity": "sha512-SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.5.0.tgz", + "integrity": "sha512-4bV6fulqbuaO9UMXU0Ia0o6z6if+kmMRW8rMRyfqXj/eGrZZRGedS4n0adeGNnjr8LKAM495hrQ7Tea52UWmQA==", "dev": true, "dependencies": { - "@typescript-eslint/experimental-utils": "4.16.1", - "@typescript-eslint/scope-manager": "4.16.1", - "debug": "^4.1.1", + "@typescript-eslint/experimental-utils": "5.5.0", + "@typescript-eslint/scope-manager": "5.5.0", + "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "ignore": "^5.1.8", + "regexpp": "^3.2.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -263,77 +201,21 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/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/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz", - "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.5.0.tgz", + "integrity": "sha512-kjWeeVU+4lQ1SLYErRKV5yDXbWDPkpbzTUUlfAUifPYvpX0qZlrcCZ96/6oWxt3QxtK5WVhXz+KsnwW9cIW+3A==", "dev": true, "dependencies": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.16.1", - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/typescript-estree": "4.16.1", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.5.0", + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/typescript-estree": "5.5.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -344,25 +226,25 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.16.1.tgz", - "integrity": "sha512-/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.5.0.tgz", + "integrity": "sha512-JsXBU+kgQOAgzUn2jPrLA+Rd0Y1dswOlX3hp8MuRO1hQDs6xgHtbCXEiAu7bz5hyVURxbXcA2draasMbNqrhmg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "4.16.1", - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/typescript-estree": "4.16.1", - "debug": "^4.1.1" + "@typescript-eslint/scope-manager": "5.5.0", + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/typescript-estree": "5.5.0", + "debug": "^4.3.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -370,40 +252,17 @@ } } }, - "node_modules/@typescript-eslint/parser/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/parser/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/@typescript-eslint/scope-manager": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz", - "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.5.0.tgz", + "integrity": "sha512-0/r656RmRLo7CbN4Mdd+xZyPJ/fPCKhYdU6mnZx+8msAD8nJSP8EyCFkzbd6vNVZzZvWlMYrSNekqGrCBqFQhg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/visitor-keys": "4.16.1" + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/visitor-keys": "5.5.0" }, "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -411,12 +270,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz", - "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.5.0.tgz", + "integrity": "sha512-OaYTqkW3GnuHxqsxxJ6KypIKd5Uw7bFiQJZRyNi1jbMJnK3Hc/DR4KwB6KJj6PBRkJJoaNwzMNv9vtTk87JhOg==", "dev": true, "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -424,21 +283,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz", - "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.5.0.tgz", + "integrity": "sha512-pVn8btYUiYrjonhMAO0yG8lm7RApzy2L4RC7Td/mC/qFkyf6vRbGyZozoA94+w6D2Y2GRqpMoCWcwx/EUOzyoQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/visitor-keys": "4.16.1", - "debug": "^4.1.1", - "globby": "^11.0.1", - "is-glob": "^4.0.1", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/visitor-keys": "5.5.0", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -450,111 +309,17 @@ } } }, - "node_modules/@typescript-eslint/typescript-estree/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/@typescript-eslint/typescript-estree/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz", - "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/typescript-estree/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/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz", - "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.5.0.tgz", + "integrity": "sha512-4GzJ1kRtsWzHhdM40tv0ZKHNSbkDhF0Woi/TDwVJX6UICwJItvP7ZTXbjTkCdrors7ww0sYe0t+cIKDAJwZ7Kw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.16.1", - "eslint-visitor-keys": "^2.0.0" + "@typescript-eslint/types": "5.5.0", + "eslint-visitor-keys": "^3.0.0" }, "engines": { - "node": "^8.10.0 || ^10.13.0 || >=11.10.1" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "type": "opencollective", @@ -562,155 +327,155 @@ } }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz", - "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==", + "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.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0" + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz", - "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==", + "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==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz", - "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==", + "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==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz", - "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz", - "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==", + "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.0", - "@webassemblyjs/helper-api-error": "1.11.0", + "@webassemblyjs/floating-point-hex-parser": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz", - "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==", + "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==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz", - "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==", + "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.0", - "@webassemblyjs/helper-buffer": "1.11.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/wasm-gen": "1.11.0" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz", - "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==", + "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" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz", - "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==", + "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" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz", - "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz", - "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==", + "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.0", - "@webassemblyjs/helper-buffer": "1.11.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/helper-wasm-section": "1.11.0", - "@webassemblyjs/wasm-gen": "1.11.0", - "@webassemblyjs/wasm-opt": "1.11.0", - "@webassemblyjs/wasm-parser": "1.11.0", - "@webassemblyjs/wast-printer": "1.11.0" + "@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" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz", - "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==", + "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.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/ieee754": "1.11.0", - "@webassemblyjs/leb128": "1.11.0", - "@webassemblyjs/utf8": "1.11.0" + "@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" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz", - "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==", + "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.0", - "@webassemblyjs/helper-buffer": "1.11.0", - "@webassemblyjs/wasm-gen": "1.11.0", - "@webassemblyjs/wasm-parser": "1.11.0" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz", - "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==", + "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.0", - "@webassemblyjs/helper-api-error": "1.11.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/ieee754": "1.11.0", - "@webassemblyjs/leb128": "1.11.0", - "@webassemblyjs/utf8": "1.11.0" + "@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" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz", - "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==", + "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.0", + "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" } }, "node_modules/@webpack-cli/configtest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.1.tgz", - "integrity": "sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", + "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", "dev": true, "peerDependencies": { "webpack": "4.x.x || 5.x.x", @@ -718,9 +483,9 @@ } }, "node_modules/@webpack-cli/info": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.2.tgz", - "integrity": "sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", + "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", "dev": true, "dependencies": { "envinfo": "^7.7.3" @@ -730,9 +495,9 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.0.tgz", - "integrity": "sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", + "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", "dev": true, "peerDependencies": { "webpack-cli": "4.x.x" @@ -775,9 +540,9 @@ } }, "node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz", + "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -787,60 +552,113 @@ } }, "node_modules/acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/ajv": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz", - "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==", + "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": { - "fast-deep-equal": "^2.0.1", + "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", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ajv-errors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-formats/node_modules/ajv": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, "node_modules/ajv-keywords": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", - "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", - "dev": true + "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" + } }, "node_modules/ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", "dev": true, "dependencies": { - "string-width": "^2.0.0" + "string-width": "^4.1.0" } }, "node_modules/ansi-colors": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", - "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true, "engines": { "node": ">=6" } }, - "node_modules/ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", + "node_modules/ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", "dev": true, "engines": [ "node >= 0.8.0" @@ -850,174 +668,61 @@ } }, "node_modules/ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "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": ">=4" + "node": ">=8" } }, "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "dependencies": { - "color-convert": "^1.9.0" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "dependencies": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - } - }, - "node_modules/anymatch/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/braces/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/fill-range/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "dependencies": { - "remove-trailing-separator": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" + "node": ">= 8" } }, "node_modules/arch": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz", - "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz", + "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==", + "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/arg": { "version": "2.0.0", @@ -1026,40 +731,10 @@ "dev": true }, "node_modules/argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, - "node_modules/arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/array-flatten": { "version": "2.1.2", @@ -1068,48 +743,9 @@ "dev": true }, "node_modules/array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "dependencies": { - "array-uniq": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "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" @@ -1124,103 +760,11 @@ "lodash": "^4.17.14" } }, - "node_modules/async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true - }, - "node_modules/async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", - "dev": true - }, - "node_modules/atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true, - "bin": { - "atob": "bin/atob.js" - }, - "engines": { - "node": ">= 4.5.0" - } - }, "node_modules/balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "node_modules/base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "dependencies": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base/node_modules/is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base/node_modules/is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/base/node_modules/is-descriptor": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=0.10.0" - } + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/batch": { "version": "0.6.1", @@ -1228,22 +772,13 @@ "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", "dev": true }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "engines": { - "node": "*" - } - }, "node_modules/binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, "node_modules/body-parser": { @@ -1276,6 +811,21 @@ "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "node_modules/bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -1291,21 +841,25 @@ } }, "node_modules/boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", + "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", "dev": true, "dependencies": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" + "ansi-align": "^3.0.0", + "camelcase": "^6.2.0", + "chalk": "^4.1.0", + "cli-boxes": "^2.2.1", + "string-width": "^4.2.2", + "type-fest": "^0.20.2", + "widest-line": "^3.1.0", + "wrap-ansi": "^7.0.0" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/brace-expansion": { @@ -1331,16 +885,16 @@ } }, "node_modules/browserslist": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", - "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz", + "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==", "dev": true, "dependencies": { - "caniuse-lite": "^1.0.30001181", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.649", + "caniuse-lite": "^1.0.30001280", + "electron-to-chromium": "^1.3.896", "escalade": "^3.1.1", - "node-releases": "^1.1.70" + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" }, "bin": { "browserslist": "cli.js" @@ -1354,9 +908,9 @@ } }, "node_modules/buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "node_modules/buffer-indexof": { @@ -1374,24 +928,17 @@ "node": ">= 0.8" } }, - "node_modules/cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "node_modules/call-bind": { + "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": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" }, - "engines": { - "node": ">=0.10.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/callsites": { @@ -1404,275 +951,118 @@ } }, "node_modules/camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz", + "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==", "dev": true, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001194", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001194.tgz", - "integrity": "sha512-iDUOH+oFeBYk5XawYsPtsx/8fFpndAPUQJC7gBTfxHM8xw5nOZv7ceAD4frS1MKCLUac7QL5wdAJiFQlDRjXlA==", - "dev": true + "version": "1.0.30001283", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz", + "integrity": "sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + } }, "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "dependencies": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "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": "^1.2.7" + "fsevents": "~2.3.2" } }, - "node_modules/chokidar/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "is-glob": "^4.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/chokidar/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/chokidar/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/chokidar/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/chokidar/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/chokidar/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" + "node": ">= 6" } }, "node_modules/chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", + "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, - "dependencies": { - "tslib": "^1.9.0" - }, "engines": { "node": ">=6.0" } }, - "node_modules/class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "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, - "dependencies": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/class-utils/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" + "node": ">=6" } }, "node_modules/cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", + "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/clipboardy": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz", - "integrity": "sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", + "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==", "dev": true, "dependencies": { - "arch": "^2.1.0", - "execa": "^0.8.0" + "arch": "^2.1.1", + "execa": "^1.0.0", + "is-wsl": "^2.1.1" }, "engines": { - "node": ">=4" - } - }, - "node_modules/clipboardy/node_modules/cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "dependencies": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "node_modules/clipboardy/node_modules/execa": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", - "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", - "dev": true, - "dependencies": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "dependencies": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "node_modules/cliui/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/cliui/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/clone-deep": { @@ -1689,59 +1079,46 @@ "node": ">=6" } }, - "node_modules/collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "dependencies": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "color-name": "~1.1.4" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" + "node": ">=7.0.0" } }, "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "node_modules/colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, "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==", - "dev": true - }, - "node_modules/component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "engines": { + "node": ">= 10" + } }, "node_modules/compressible": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz", - "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "dependencies": { - "mime-db": ">= 1.40.0 < 2" + "mime-db": ">= 1.43.0 < 2" }, "engines": { "node": ">= 0.6" @@ -1765,6 +1142,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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1813,62 +1205,41 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, - "node_modules/copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, "node_modules/cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "dependencies": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" }, "engines": { - "node": ">=4.8" + "node": ">= 8" } }, "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "dependencies": { - "ms": "2.0.0" - } - }, - "node_modules/decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true, + "ms": "2.1.2" + }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true, - "engines": { - "node": ">=0.10" + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/deep-equal": { @@ -1883,6 +1254,9 @@ "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/deep-extend": { @@ -1895,52 +1269,89 @@ } }, "node_modules/deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "node_modules/default-gateway": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", - "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", "dev": true, "dependencies": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" + "execa": "^5.0.0" }, "engines": { - "node": ">=6" + "node": ">= 10" } }, "node_modules/default-gateway/node_modules/execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "dependencies": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" }, "engines": { - "node": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "node_modules/default-gateway/node_modules/get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "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/default-gateway/node_modules/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, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/default-gateway/node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "dependencies": { - "pump": "^3.0.0" + "path-key": "^3.0.0" }, "engines": { - "node": ">=6" + "node": ">=8" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "dev": true, + "engines": { + "node": ">=8" } }, "node_modules/define-properties": { @@ -1955,85 +1366,26 @@ "node": ">= 0.4" } }, - "node_modules/define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/define-property/node_modules/is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/define-property/node_modules/is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/define-property/node_modules/is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", "dev": true, "dependencies": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" + "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": ">=6" - } - }, - "node_modules/del/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" + "node": ">=10" }, - "bin": { - "rimraf": "bin.js" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/depd": { @@ -2052,9 +1404,9 @@ "dev": true }, "node_modules/detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true }, "node_modules/dir-glob": { @@ -2076,9 +1428,9 @@ "dev": true }, "node_modules/dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", + "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", @@ -2113,26 +1465,17 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.3.680", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.680.tgz", - "integrity": "sha512-XBACJT9RdpdWtoMXQPR8Be3ZtmizWWbxfw8cY2b5feUwiDO3FUl8qo4W2jXoq/WnnA3xBRqafu1XbpczqyUvlA==", + "version": "1.4.9", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.9.tgz", + "integrity": "sha512-7AyB4SiLtGJbLACXezs8BDjDbZizuoiyHTQxbcvzfi5LYWRXVSFdmPvuDjtlWQmsVSONRicZfSBj3xgft0Wvrg==", "dev": true }, "node_modules/emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, - "node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -2152,17 +1495,16 @@ } }, "node_modules/enhanced-resolve": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", - "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", + "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", "dev": true, "dependencies": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" }, "engines": { - "node": ">=6.9.0" + "node": ">=10.13.0" } }, "node_modules/enquirer": { @@ -2177,19 +1519,10 @@ "node": ">=8.6" } }, - "node_modules/enquirer/node_modules/ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/envinfo": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.4.tgz", - "integrity": "sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "dev": true, "bin": { "envinfo": "dist/cli.js" @@ -2198,60 +1531,12 @@ "node": ">=4" } }, - "node_modules/errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, - "dependencies": { - "prr": "~1.0.1" - }, - "bin": { - "errno": "cli.js" - } - }, - "node_modules/es-abstract": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", - "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", - "dev": true, - "dependencies": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/es-module-lexer": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz", - "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "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" - } - }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -2268,55 +1553,59 @@ "dev": true }, "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "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": ">=0.8.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz", - "integrity": "sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.3.0.tgz", + "integrity": "sha512-aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww==", "dev": true, "dependencies": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.0", + "@eslint/eslintrc": "^1.0.4", + "@humanwhocodes/config-array": "^0.6.0", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", - "debug": "^4.0.1", + "debug": "^4.3.2", "doctrine": "^3.0.0", "enquirer": "^2.3.5", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.0", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.1.0", + "espree": "^9.1.0", "esquery": "^1.4.0", "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", + "glob-parent": "^6.0.1", + "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", - "lodash": "^4.17.20", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", "progress": "^2.0.0", - "regexpp": "^3.1.0", + "regexpp": "^3.2.0", "semver": "^7.2.1", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "table": "^6.0.4", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, @@ -2324,16 +1613,16 @@ "eslint": "bin/eslint.js" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, "funding": { "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-config-prettier": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz", - "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" @@ -2343,9 +1632,9 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz", - "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", "dev": true, "dependencies": { "prettier-linter-helpers": "^1.0.0" @@ -2354,8 +1643,8 @@ "node": ">=6.0.0" }, "peerDependencies": { - "eslint": ">=5.0.0", - "prettier": ">=1.13.0" + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" }, "peerDependenciesMeta": { "eslint-config-prettier": { @@ -2377,306 +1666,84 @@ } }, "node_modules/eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, "dependencies": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "^2.0.0" }, "engines": { - "node": ">=6" + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" }, "funding": { "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" } }, "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true, "engines": { - "node": ">=4" + "node": ">=10" } }, "node_modules/eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "dev": true, "engines": { - "node": ">=10" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/eslint/node_modules/ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz", + "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==", "dev": true, "dependencies": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "node_modules/eslint/node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/eslint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/eslint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/eslint/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/eslint/node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/eslint/node_modules/glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/eslint/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==", + "node_modules/eslint/node_modules/estraverse": { + "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": ">=8" + "node": ">=4.0" } }, - "node_modules/eslint/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/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/eslint/node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "node_modules/eslint/node_modules/ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true, "engines": { - "node": ">=8" + "node": ">= 4" } }, - "node_modules/eslint/node_modules/semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/eslint/node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/eslint/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.1.0.tgz", + "integrity": "sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==", "dev": true, "dependencies": { - "acorn": "^7.4.0", + "acorn": "^8.6.0", "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" + "eslint-visitor-keys": "^3.1.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true, - "bin": { - "esparse": "bin/esparse.js", - "esvalidate": "bin/esvalidate.js" - }, - "engines": { - "node": ">=4" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/esquery": { @@ -2692,9 +1759,9 @@ } }, "node_modules/esquery/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "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" @@ -2713,9 +1780,9 @@ } }, "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "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" @@ -2749,9 +1816,9 @@ } }, "node_modules/eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", "dev": true }, "node_modules/events": { @@ -2763,26 +1830,14 @@ "node": ">=0.8.x" } }, - "node_modules/eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, - "dependencies": { - "original": "^1.0.0" - }, - "engines": { - "node": ">=0.12.0" - } - }, "node_modules/execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "dependencies": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", @@ -2790,62 +1845,76 @@ "strip-eof": "^1.0.0" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/execa/node_modules/cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "dependencies": { - "lru-cache": "^4.0.1", + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" - } - }, - "node_modules/expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "dependencies": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" }, "engines": { - "node": ">=0.10.0" + "node": ">=4.8" } }, - "node_modules/expand-brackets/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/expand-brackets/node_modules/extend-shallow": { + "node_modules/execa/node_modules/path-key": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/execa/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/execa/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "dependencies": { - "is-extendable": "^0.1.0" + "shebang-regex": "^1.0.0" }, "engines": { "node": ">=0.10.0" } }, + "node_modules/execa/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/execa/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, "node_modules/express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -2905,6 +1974,21 @@ "node": ">= 0.6" } }, + "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "node_modules/express/node_modules/path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -2920,116 +2004,10 @@ "node": ">= 0.6" } }, - "node_modules/extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "dependencies": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extend-shallow/node_modules/is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "dependencies": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/extglob/node_modules/is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "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-diff": { @@ -3039,26 +2017,25 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" }, "engines": { "node": ">=8" } }, "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "dependencies": { "is-glob": "^4.0.1" @@ -3068,9 +2045,9 @@ } }, "node_modules/fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "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==", "dev": true }, "node_modules/fast-levenshtein": { @@ -3088,12 +2065,6 @@ "punycode": "^1.3.2" } }, - "node_modules/fast-url-parser/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - }, "node_modules/fastest-levenshtein": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", @@ -3101,18 +2072,18 @@ "dev": true }, "node_modules/fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", + "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/faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "dependencies": { "websocket-driver": ">=0.5.1" @@ -3163,16 +2134,32 @@ "node": ">= 0.8" } }, - "node_modules/find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "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": { - "locate-path": "^3.0.0" + "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/flat-cache": { @@ -3189,68 +2176,40 @@ } }, "node_modules/flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", + "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", "dev": true }, "node_modules/follow-redirects": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz", - "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==", + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", "dev": true, - "dependencies": { - "debug": "^3.0.0" - }, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], "engines": { "node": ">=4.0" - } - }, - "node_modules/follow-redirects/node_modules/debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/follow-redirects/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/for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true, - "engines": { - "node": ">=0.10.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } } }, "node_modules/forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true, "engines": { "node": ">= 0.6" } }, - "node_modules/fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "dependencies": { - "map-cache": "^0.2.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -3260,6 +2219,12 @@ "node": ">= 0.6" } }, + "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==", + "dev": true + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3267,770 +2232,19 @@ "dev": true }, "node_modules/fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", - "bundleDependencies": [ - "abbrev", - "ansi-regex", - "aproba", - "are-we-there-yet", - "balanced-match", - "brace-expansion", - "chownr", - "code-point-at", - "concat-map", - "console-control-strings", - "core-util-is", - "debug", - "deep-extend", - "delegates", - "detect-libc", - "fs-minipass", - "fs.realpath", - "gauge", - "glob", - "has-unicode", - "iconv-lite", - "ignore-walk", - "inflight", - "inherits", - "ini", - "is-fullwidth-code-point", - "isarray", - "minimatch", - "minimist", - "minipass", - "minizlib", - "mkdirp", - "ms", - "needle", - "node-pre-gyp", - "nopt", - "npm-bundled", - "npm-packlist", - "npmlog", - "number-is-nan", - "object-assign", - "once", - "os-homedir", - "os-tmpdir", - "osenv", - "path-is-absolute", - "process-nextick-args", - "rc", - "readable-stream", - "rimraf", - "safe-buffer", - "safer-buffer", - "sax", - "semver", - "set-blocking", - "signal-exit", - "string-width", - "string_decoder", - "strip-ansi", - "strip-json-comments", - "tar", - "util-deprecate", - "wide-align", - "wrappy", - "yallist" - ], + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "hasInstallScript": true, "optional": true, "os": [ "darwin" ], - "dependencies": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" - }, "engines": { - "node": ">=4.0" + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/fsevents/node_modules/abbrev": { - "version": "1.1.1", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/ansi-regex": { - "version": "2.1.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/aproba": { - "version": "1.2.0", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/are-we-there-yet": { - "version": "1.1.5", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "node_modules/fsevents/node_modules/balanced-match": { - "version": "1.0.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/brace-expansion": { - "version": "1.1.11", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/fsevents/node_modules/chownr": { - "version": "1.1.1", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/code-point-at": { - "version": "1.1.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/concat-map": { - "version": "0.0.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/console-control-strings": { - "version": "1.1.0", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/core-util-is": { - "version": "1.0.2", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/debug": { - "version": "4.1.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/fsevents/node_modules/deep-extend": { - "version": "0.6.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/fsevents/node_modules/delegates": { - "version": "1.0.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/detect-libc": { - "version": "1.0.3", - "dev": true, - "inBundle": true, - "license": "Apache-2.0", - "optional": true, - "bin": { - "detect-libc": "bin/detect-libc.js" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/fsevents/node_modules/fs-minipass": { - "version": "1.2.5", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "minipass": "^2.2.1" - } - }, - "node_modules/fsevents/node_modules/fs.realpath": { - "version": "1.0.0", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/gauge": { - "version": "2.7.4", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "node_modules/fsevents/node_modules/glob": { - "version": "7.1.3", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/fsevents/node_modules/has-unicode": { - "version": "2.0.1", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/iconv-lite": { - "version": "0.4.24", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/ignore-walk": { - "version": "3.0.1", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "minimatch": "^3.0.4" - } - }, - "node_modules/fsevents/node_modules/inflight": { - "version": "1.0.6", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/fsevents/node_modules/inherits": { - "version": "2.0.3", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/ini": { - "version": "1.3.5", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "engines": { - "node": "*" - } - }, - "node_modules/fsevents/node_modules/is-fullwidth-code-point": { - "version": "1.0.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "number-is-nan": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/isarray": { - "version": "1.0.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/minimatch": { - "version": "3.0.4", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/fsevents/node_modules/minimist": { - "version": "0.0.8", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/minipass": { - "version": "2.3.5", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "node_modules/fsevents/node_modules/minizlib": { - "version": "1.2.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "minipass": "^2.2.1" - } - }, - "node_modules/fsevents/node_modules/mkdirp": { - "version": "0.5.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "minimist": "0.0.8" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/fsevents/node_modules/ms": { - "version": "2.1.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/needle": { - "version": "2.3.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - }, - "bin": { - "needle": "bin/needle" - }, - "engines": { - "node": ">= 4.4.x" - } - }, - "node_modules/fsevents/node_modules/node-pre-gyp": { - "version": "0.12.0", - "dev": true, - "inBundle": true, - "license": "BSD-3-Clause", - "optional": true, - "dependencies": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - }, - "bin": { - "node-pre-gyp": "bin/node-pre-gyp" - } - }, - "node_modules/fsevents/node_modules/nopt": { - "version": "4.0.1", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "abbrev": "1", - "osenv": "^0.1.4" - }, - "bin": { - "nopt": "bin/nopt.js" - } - }, - "node_modules/fsevents/node_modules/npm-bundled": { - "version": "1.0.6", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/npm-packlist": { - "version": "1.4.1", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "node_modules/fsevents/node_modules/npmlog": { - "version": "4.1.2", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "node_modules/fsevents/node_modules/number-is-nan": { - "version": "1.0.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/object-assign": { - "version": "4.1.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/once": { - "version": "1.4.0", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/fsevents/node_modules/os-homedir": { - "version": "1.0.2", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/os-tmpdir": { - "version": "1.0.2", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/osenv": { - "version": "0.1.5", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "node_modules/fsevents/node_modules/path-is-absolute": { - "version": "1.0.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/process-nextick-args": { - "version": "2.0.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/rc": { - "version": "1.2.8", - "dev": true, - "inBundle": true, - "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", - "optional": true, - "dependencies": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "bin": { - "rc": "cli.js" - } - }, - "node_modules/fsevents/node_modules/rc/node_modules/minimist": { - "version": "1.2.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/readable-stream": { - "version": "2.3.6", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/fsevents/node_modules/rimraf": { - "version": "2.6.3", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/fsevents/node_modules/safe-buffer": { - "version": "5.1.2", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/safer-buffer": { - "version": "2.1.2", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/sax": { - "version": "1.2.4", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/semver": { - "version": "5.7.0", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver" - } - }, - "node_modules/fsevents/node_modules/set-blocking": { - "version": "2.0.0", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/signal-exit": { - "version": "3.0.2", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/string_decoder": { - "version": "1.1.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/fsevents/node_modules/string-width": { - "version": "1.0.2", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/strip-ansi": { - "version": "3.0.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "ansi-regex": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/strip-json-comments": { - "version": "2.0.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fsevents/node_modules/tar": { - "version": "4.4.8", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - }, - "engines": { - "node": ">=4.5" - } - }, - "node_modules/fsevents/node_modules/util-deprecate": { - "version": "1.0.2", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true - }, - "node_modules/fsevents/node_modules/wide-align": { - "version": "1.1.3", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true, - "dependencies": { - "string-width": "^1.0.2 || 2" - } - }, - "node_modules/fsevents/node_modules/wrappy": { - "version": "1.0.2", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, - "node_modules/fsevents/node_modules/yallist": { - "version": "3.0.3", - "dev": true, - "inBundle": true, - "license": "ISC", - "optional": true - }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -4043,37 +2257,36 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "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==", "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, "engines": { - "node": ">=4" - } - }, - "node_modules/get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">=6" } }, "node_modules/glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -4085,28 +2298,21 @@ }, "engines": { "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "dependencies": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - } - }, - "node_modules/glob-parent/node_modules/is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.0" + "is-glob": "^4.0.3" }, "engines": { - "node": ">=0.10.0" + "node": ">=10.13.0" } }, "node_modules/glob-to-regexp": { @@ -4116,46 +2322,44 @@ "dev": true }, "node_modules/globals": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", - "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "dependencies": { - "type-fest": "^0.8.1" + "type-fest": "^0.20.2" }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", "dev": true, "dependencies": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/globby/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/graceful-fs": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", - "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", "dev": true }, "node_modules/handle-thing": { @@ -4177,84 +2381,39 @@ } }, "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "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": ">=4" + "node": ">=8" } }, "node_modules/has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", "dev": true, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-value": { + "node_modules/has-tostringtag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "dependencies": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "has-symbols": "^1.0.2" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "node": ">= 0.4" }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/has-values/node_modules/kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/hpack.js": { @@ -4270,9 +2429,9 @@ } }, "node_modules/html-entities": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz", - "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz", + "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==", "dev": true }, "node_modules/http-deceiver": { @@ -4304,9 +2463,9 @@ "dev": true }, "node_modules/http-parser-js": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", - "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz", + "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==", "dev": true }, "node_modules/http-proxy": { @@ -4324,139 +2483,19 @@ } }, "node_modules/http-proxy-middleware": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", - "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", - "dev": true, - "dependencies": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/braces/node_modules/extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz", + "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==", "dev": true, "dependencies": { - "is-extendable": "^0.1.0" + "@types/http-proxy": "^1.17.5", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/fill-range/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/http-proxy-middleware/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" + "node": ">=12.0.0" } }, "node_modules/human-signals": { @@ -4481,18 +2520,18 @@ } }, "node_modules/ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz", + "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==", "dev": true, "engines": { "node": ">= 4" } }, "node_modules/import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, "dependencies": { "parent-module": "^1.0.0", @@ -4500,31 +2539,25 @@ }, "engines": { "node": ">=6" - } - }, - "node_modules/import-fresh/node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/import-local": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", - "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", "dev": true, "dependencies": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" }, "bin": { "import-local-fixture": "fixtures/cli.js" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/imurmurhash": { @@ -4536,6 +2569,15 @@ "node": ">=0.8.19" } }, + "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", @@ -4558,19 +2600,6 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, - "node_modules/internal-ip": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", - "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", - "dev": true, - "dependencies": { - "default-gateway": "^4.2.0", - "ipaddr.js": "^1.9.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/interpret": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", @@ -4586,97 +2615,47 @@ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", "dev": true }, - "node_modules/ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true, "engines": { "node": ">= 0.10" } }, - "node_modules/is-absolute-url": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", - "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==", + "node_modules/is-arguments": { + "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" + }, + "engines": { + "node": ">= 0.4" + }, + "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", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, "engines": { "node": ">=8" } }, - "node_modules/is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-accessor-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "dependencies": { - "binary-extensions": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "node_modules/is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/is-core-module": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", - "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -4685,69 +2664,34 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-data-descriptor/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "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-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true, - "dependencies": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "bin": { + "is-docker": "cli.js" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-descriptor/node_modules/kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-extglob": { @@ -4760,18 +2704,18 @@ } }, "node_modules/is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "dependencies": { "is-extglob": "^2.1.1" @@ -4798,28 +2742,25 @@ "node": ">=6" } }, - "node_modules/is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", + "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, - "dependencies": { - "is-path-inside": "^2.1.0" - }, "engines": { - "node": ">=6" + "node": ">=8" } }, - "node_modules/is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", + "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, - "dependencies": { - "path-is-inside": "^1.0.2" - }, "engines": { - "node": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-plain-object": { @@ -4835,15 +2776,19 @@ } }, "node_modules/is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "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": { - "has": "^1.0.3" + "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": { @@ -4855,34 +2800,16 @@ "node": ">=0.10.0" } }, - "node_modules/is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "dependencies": { - "has-symbols": "^1.0.1" + "is-docker": "^2.0.0" }, "engines": { - "node": ">= 0.4" - } - }, - "node_modules/is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true, - "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/isarray": { @@ -4907,54 +2834,41 @@ } }, "node_modules/jest-worker": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", - "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", + "version": "27.4.2", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz", + "integrity": "sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==", "dev": true, "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "supports-color": "^8.0.0" }, "engines": { "node": ">= 10.13.0" } }, - "node_modules/jest-worker/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" - } - }, "node_modules/jest-worker/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "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" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, "node_modules/js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" @@ -4978,33 +2892,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "node_modules/json3": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz", - "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==", - "dev": true - }, - "node_modules/json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/killable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", - "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==", - "dev": true - }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -5036,31 +2923,16 @@ "node": ">=6.11.5" } }, - "node_modules/loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "dependencies": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "^4.1.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/lodash": { @@ -5069,48 +2941,22 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/loglevel": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", - "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==", - "dev": true, - "engines": { - "node": ">= 0.6.0" - }, - "funding": { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/loglevel" - } + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "node_modules/map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, - "dependencies": { - "object-visit": "^1.0.0" + "yallist": "^4.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">=10" } }, "node_modules/media-typer": { @@ -5122,17 +2968,16 @@ "node": ">= 0.6" } }, - "node_modules/memory-fs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", - "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", + "node_modules/memfs": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.0.tgz", + "integrity": "sha512-o/RfP0J1d03YwsAxyHxAYs2kyJp55AFkMazlFAZFR2I2IXkxiUTXRabJ6RmNNCQ83LAD2jy52Khj0m3OffpNdA==", "dev": true, "dependencies": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "fs-monkey": "1.0.3" }, "engines": { - "node": ">=4.3.0 <5.0.0 || >=5.10" + "node": ">= 4.0.0" } }, "node_modules/merge-descriptors": { @@ -5166,16 +3011,16 @@ } }, "node_modules/micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "dependencies": { "braces": "^3.0.1", - "picomatch": "^2.0.5" + "picomatch": "^2.2.3" }, "engines": { - "node": ">=8" + "node": ">=8.6" } }, "node_modules/mime": { @@ -5191,35 +3036,26 @@ } }, "node_modules/mime-db": { - "version": "1.42.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz", - "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "dev": true, "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { - "version": "2.1.29", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", - "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dev": true, "dependencies": { - "mime-db": "1.46.0" + "mime-db": "1.51.0" }, "engines": { "node": ">= 0.6" } }, - "node_modules/mime-types/node_modules/mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", @@ -5253,31 +3089,6 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, - "node_modules/mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, - "dependencies": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/mixin-deep/node_modules/is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -5291,9 +3102,9 @@ } }, "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "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/multicast-dns": { @@ -5315,35 +3126,6 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, - "node_modules/nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "dev": true, - "optional": true - }, - "node_modules/nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -5381,9 +3163,9 @@ } }, "node_modules/node-releases": { - "version": "1.1.71", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", - "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true }, "node_modules/normalize-path": { @@ -5407,66 +3189,29 @@ "node": ">=4" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "node_modules/npm-run-path/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=4" } }, - "node_modules/object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, - "dependencies": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-copy/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-inspect": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", - "dev": true - }, "node_modules/object-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", - "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==", + "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" + }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object-keys": { @@ -5478,45 +3223,6 @@ "node": ">= 0.4" } }, - "node_modules/object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, - "dependencies": { - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -5568,16 +3274,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/opn": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", - "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", + "node_modules/open": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", + "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", "dev": true, "dependencies": { - "is-wsl": "^1.1.0" + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" }, "engines": { - "node": ">=4" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/optionator": { @@ -5597,15 +3308,6 @@ "node": ">= 0.8.0" } }, - "node_modules/original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "dependencies": { - "url-parse": "^1.4.3" - } - }, "node_modules/p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -5616,48 +3318,58 @@ } }, "node_modules/p-limit": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", - "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "dependencies": { "p-try": "^2.0.0" }, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "dependencies": { - "p-limit": "^2.0.0" + "p-limit": "^2.2.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", + "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": ">=6" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", - "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz", + "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==", "dev": true, "dependencies": { - "retry": "^0.12.0" + "@types/retry": "^0.12.0", + "retry": "^0.13.1" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/p-try": { @@ -5690,28 +3402,13 @@ "node": ">= 0.8" } }, - "node_modules/pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true - }, "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/path-is-absolute": { @@ -5730,18 +3427,18 @@ "dev": true }, "node_modules/path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "node_modules/path-to-regexp": { @@ -5759,10 +3456,16 @@ "node": ">=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==", + "dev": true + }, "node_modules/picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true, "engines": { "node": ">=8.6" @@ -5771,46 +3474,16 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "dependencies": { - "pinkie": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "dependencies": { - "find-up": "^3.0.0" + "find-up": "^4.0.0" }, "engines": { - "node": ">=6" + "node": ">=8" } }, "node_modules/portfinder": { @@ -5836,21 +3509,6 @@ "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/posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -5861,9 +3519,9 @@ } }, "node_modules/prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.0.tgz", + "integrity": "sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -5900,30 +3558,18 @@ } }, "node_modules/proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, "dependencies": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" }, "engines": { "node": ">= 0.10" } }, - "node_modules/prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -5935,13 +3581,10 @@ } }, "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==", - "dev": true, - "engines": { - "node": ">=6" - } + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true }, "node_modules/qs": { "version": "6.7.0", @@ -5956,21 +3599,16 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", "dev": true, "engines": { "node": ">=0.4.x" } }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, "node_modules/queue-microtask": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz", - "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, "funding": [ { @@ -6044,10 +3682,19 @@ "rc": "cli.js" } }, + "node_modules/rc/node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "dependencies": { "core-util-is": "~1.0.0", @@ -6060,144 +3707,21 @@ } }, "node_modules/readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "dependencies": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "picomatch": "^2.2.1" }, "engines": { - "node": ">=0.10" - } - }, - "node_modules/readdirp/node_modules/braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "dependencies": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/braces/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "dependencies": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/fill-range/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/is-number/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "dependencies": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/readdirp/node_modules/to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "dependencies": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - }, - "engines": { - "node": ">=0.10.0" + "node": ">=8.10.0" } }, "node_modules/rechoir": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz", - "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, "dependencies": { "resolve": "^1.9.0" @@ -6206,36 +3730,26 @@ "node": ">= 0.10" } }, - "node_modules/regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/regexp.prototype.flags": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", - "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", + "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", "dev": true, "dependencies": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true, "engines": { "node": ">=8" @@ -6266,39 +3780,6 @@ "node": ">=0.10.0" } }, - "node_modules/remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "node_modules/repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, - "engines": { - "node": ">=0.10.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", @@ -6308,12 +3789,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -6334,45 +3809,39 @@ } }, "node_modules/resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, "dependencies": { - "resolve-from": "^3.0.0" + "resolve-from": "^5.0.0" }, "engines": { - "node": ">=4" + "node": ">=8" + } + }, + "node_modules/resolve-cwd/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" } }, "node_modules/resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, "engines": { "node": ">=4" } }, - "node_modules/resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "dev": true - }, - "node_modules/ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true, - "engines": { - "node": ">=0.12" - } - }, "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true, "engines": { "node": ">= 4" @@ -6432,15 +3901,6 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, - "node_modules/safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, - "dependencies": { - "ret": "~0.1.10" - } - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -6448,17 +3908,21 @@ "dev": true }, "node_modules/schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "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": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" }, "engines": { - "node": ">= 4" + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, "node_modules/select-hose": { @@ -6468,21 +3932,27 @@ "dev": true }, "node_modules/selfsigned": { - "version": "1.10.8", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", - "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", + "version": "1.10.11", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz", + "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==", "dev": true, "dependencies": { "node-forge": "^0.10.0" } }, "node_modules/semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, "bin": { - "semver": "bin/semver" + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, "node_modules/send": { @@ -6509,6 +3979,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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "node_modules/send/node_modules/ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -6525,26 +4010,26 @@ } }, "node_modules/serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "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" } }, "node_modules/serve": { - "version": "11.3.2", - "resolved": "https://registry.npmjs.org/serve/-/serve-11.3.2.tgz", - "integrity": "sha512-yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w==", + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/serve/-/serve-13.0.2.tgz", + "integrity": "sha512-71R6fKvNgKrqARAag6lYJNnxDzpH7DCNrMuvPY5PLVaC2PDhJsGTj/34o4o4tPWhTuLgEXqvgnAWbATQ9zGZTQ==", "dev": true, "dependencies": { "@zeit/schemas": "2.6.0", - "ajv": "6.5.3", + "ajv": "6.12.6", "arg": "2.0.0", - "boxen": "1.3.0", + "boxen": "5.1.2", "chalk": "2.4.1", - "clipboardy": "1.2.3", + "clipboardy": "2.3.0", "compression": "1.7.3", "serve-handler": "6.1.3", "update-check": "1.5.2" @@ -6608,6 +4093,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/http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", @@ -6629,6 +4123,12 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "node_modules/serve-index/node_modules/setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -6650,6 +4150,18 @@ "node": ">= 0.8.0" } }, + "node_modules/serve/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/serve/node_modules/chalk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", @@ -6664,37 +4176,49 @@ "node": ">=4" } }, - "node_modules/set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "node_modules/set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "node_modules/serve/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "dependencies": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" + "color-name": "1.1.3" } }, - "node_modules/set-value/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "node_modules/serve/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "node_modules/serve/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/serve/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/serve/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "dependencies": { - "is-extendable": "^0.1.0" + "has-flag": "^3.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">=4" } }, "node_modules/setprototypeof": { @@ -6716,30 +4240,30 @@ } }, "node_modules/shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "dependencies": { - "shebang-regex": "^1.0.0" + "shebang-regex": "^3.0.0" }, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, "node_modules/shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=8" } }, "node_modules/signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", "dev": true }, "node_modules/slash": { @@ -6751,275 +4275,18 @@ "node": ">=8" } }, - "node_modules/slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/slice-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, - "dependencies": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, - "dependencies": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node/node_modules/define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "dependencies": { - "is-descriptor": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node/node_modules/is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-node/node_modules/is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "dependencies": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, - "dependencies": { - "kind-of": "^3.2.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon-util/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/snapdragon/node_modules/extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "dependencies": { - "is-extendable": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/sockjs": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz", - "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==", + "version": "0.3.24", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, "dependencies": { "faye-websocket": "^0.11.3", - "uuid": "^3.4.0", + "uuid": "^8.3.2", "websocket-driver": "^0.7.4" } }, - "node_modules/sockjs-client": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz", - "integrity": "sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==", - "dev": true, - "dependencies": { - "debug": "^3.2.6", - "eventsource": "^1.0.7", - "faye-websocket": "^0.11.3", - "inherits": "^2.0.4", - "json3": "^3.3.3", - "url-parse": "^1.4.7" - } - }, - "node_modules/sockjs-client/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/sockjs-client/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/source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", - "dev": true - }, "node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "dev": true, - "dependencies": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/source-map-support/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", @@ -7028,11 +4295,15 @@ "node": ">=0.10.0" } }, - "node_modules/source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", - "dev": true + "node_modules/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, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } }, "node_modules/spdy": { "version": "4.0.2", @@ -7064,29 +4335,6 @@ "wbuf": "^1.7.3" } }, - "node_modules/spdy-transport/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "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-transport/node_modules/readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -7101,72 +4349,6 @@ "node": ">= 6" } }, - "node_modules/spdy/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "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/split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "dependencies": { - "extend-shallow": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "node_modules/static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, - "dependencies": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/static-extend/node_modules/define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "dependencies": { - "is-descriptor": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -7186,54 +4368,29 @@ } }, "node_modules/string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "dependencies": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" }, "engines": { - "node": ">=4" - } - }, - "node_modules/string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", - "dev": true, - "dependencies": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" + "node": ">=8" } }, "node_modules/strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "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": "^3.0.0" + "ansi-regex": "^5.0.1" }, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/strip-eof": { @@ -7255,169 +4412,49 @@ } }, "node_modules/strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, "engines": { - "node": ">=0.10.0" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/table": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz", - "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==", - "dev": true, - "dependencies": { - "ajv": "^7.0.2", - "lodash": "^4.17.20", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/table/node_modules/ajv": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz", - "integrity": "sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/table/node_modules/ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/table/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/table/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/table/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/table/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/table/node_modules/string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/table/node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.0" + "has-flag": "^4.0.0" }, "engines": { "node": ">=8" } }, "node_modules/tapable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, "engines": { "node": ">=6" } }, - "node_modules/term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "dev": true, - "dependencies": { - "execa": "^0.7.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/terser": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.0.tgz", - "integrity": "sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==", - "dev": true, - "dependencies": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.19" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/terser-webpack-plugin": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz", - "integrity": "sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz", + "integrity": "sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g==", "dev": true, "dependencies": { - "jest-worker": "^26.6.2", - "p-limit": "^3.1.0", - "schema-utils": "^3.0.0", - "serialize-javascript": "^5.0.1", + "jest-worker": "^27.0.6", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", "source-map": "^0.6.1", - "terser": "^5.5.1" + "terser": "^5.7.2" }, "engines": { "node": ">= 10.13.0" @@ -7428,82 +4465,51 @@ }, "peerDependencies": { "webpack": "^5.1.0" - } - }, - "node_modules/terser-webpack-plugin/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", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } } }, - "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { - "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" - } - }, - "node_modules/terser-webpack-plugin/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/terser-webpack-plugin/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==", "dev": true }, - "node_modules/terser-webpack-plugin/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "node_modules/terser-webpack-plugin/node_modules/terser": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", + "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", "dev": true, "dependencies": { - "yocto-queue": "^0.1.0" + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" }, "engines": { "node": ">=10" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", - "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.6", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "peerDependencies": { + "acorn": "^8.5.0" }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "peerDependenciesMeta": { + "acorn": { + "optional": true + } } }, - "node_modules/terser-webpack-plugin/node_modules/source-map": { - "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" - } - }, - "node_modules/terser/node_modules/source-map": { + "node_modules/terser-webpack-plugin/node_modules/terser/node_modules/source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", @@ -7524,45 +4530,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "node_modules/to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, - "dependencies": { - "kind-of": "^3.0.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-object-path/node_modules/kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "dependencies": { - "is-buffer": "^1.1.5" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "dependencies": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - }, - "engines": { - "node": ">=0.10.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", @@ -7585,138 +4552,34 @@ } }, "node_modules/ts-loader": { - "version": "8.0.17", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.17.tgz", - "integrity": "sha512-OeVfSshx6ot/TCxRwpBHQ/4lRzfgyTkvi7ghDVrLXOHzTbSK413ROgu/xNqM72i3AFeAIJgQy78FwSMKmOW68w==", + "version": "9.2.6", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz", + "integrity": "sha512-QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw==", "dev": true, "dependencies": { "chalk": "^4.1.0", - "enhanced-resolve": "^4.0.0", - "loader-utils": "^2.0.0", + "enhanced-resolve": "^5.0.0", "micromatch": "^4.0.0", "semver": "^7.3.4" }, "engines": { - "node": ">=10.0.0" + "node": ">=12.0.0" }, "peerDependencies": { "typescript": "*", - "webpack": "*" + "webpack": "^5.0.0" } }, - "node_modules/ts-loader/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/ts-loader/node_modules/chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/ts-loader/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/ts-loader/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/ts-loader/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" - } - }, - "node_modules/ts-loader/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ts-loader/node_modules/semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ts-loader/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ts-loader/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, "node_modules/tsutils": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz", - "integrity": "sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", "dev": true, "dependencies": { "tslib": "^1.8.1" @@ -7741,12 +4604,15 @@ } }, "node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/type-is": { @@ -7763,9 +4629,9 @@ } }, "node_modules/typescript": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz", - "integrity": "sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", + "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -7775,21 +4641,6 @@ "node": ">=4.2.0" } }, - "node_modules/union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "dependencies": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -7799,64 +4650,6 @@ "node": ">= 0.8" } }, - "node_modules/unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, - "dependencies": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, - "dependencies": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "dependencies": { - "isarray": "1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/unset-value/node_modules/has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", - "dev": true, - "engines": { - "node": ">=4", - "yarn": "*" - } - }, "node_modules/update-check": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz", @@ -7868,19 +4661,22 @@ } }, "node_modules/uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "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/urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true + "node_modules/uri-js/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==", + "dev": true, + "engines": { + "node": ">=6" + } }, "node_modules/url": { "version": "0.11.0", @@ -7892,31 +4688,12 @@ "querystring": "0.2.0" } }, - "node_modules/url-parse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", - "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", - "dev": true, - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", "dev": true }, - "node_modules/use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -7933,18 +4710,18 @@ } }, "node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, "bin": { - "uuid": "bin/uuid" + "uuid": "dist/bin/uuid" } }, "node_modules/v8-compile-cache": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz", - "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, "node_modules/vary": { @@ -7957,9 +4734,9 @@ } }, "node_modules/watchpack": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz", - "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.0.tgz", + "integrity": "sha512-MnN0Q1OsvB/GGHETrFeZPQaOelWh/7O+EiFlj8sM9GPjtQkis7k01aAxrg/18kTfoIVcLL+haEVFlXDaSRwKRw==", "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", @@ -7979,22 +4756,23 @@ } }, "node_modules/webpack": { - "version": "5.24.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.24.3.tgz", - "integrity": "sha512-x7lrWZ7wlWAdyKdML6YPvfVZkhD1ICuIZGODE5SzKJjqI9A4SpqGTjGJTc6CwaHqn19gGaoOR3ONJ46nYsn9rw==", + "version": "5.64.4", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.4.tgz", + "integrity": "sha512-LWhqfKjCLoYJLKJY8wk2C3h77i8VyHowG3qYNZiIqD6D0ZS40439S/KVuc/PY48jp2yQmy0mhMknq8cys4jFMw==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.0", - "@types/estree": "^0.0.46", - "@webassemblyjs/ast": "1.11.0", - "@webassemblyjs/wasm-edit": "1.11.0", - "@webassemblyjs/wasm-parser": "1.11.0", - "acorn": "^8.0.4", + "@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", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.7.0", - "es-module-lexer": "^0.4.0", - "eslint-scope": "^5.1.1", + "enhanced-resolve": "^5.8.3", + "es-module-lexer": "^0.9.0", + "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.4", @@ -8002,11 +4780,11 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.0.0", + "schema-utils": "^3.1.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.1", - "watchpack": "^2.0.0", - "webpack-sources": "^2.1.1" + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.3.0", + "webpack-sources": "^3.2.2" }, "bin": { "webpack": "bin/webpack.js" @@ -8025,24 +4803,22 @@ } }, "node_modules/webpack-cli": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.5.0.tgz", - "integrity": "sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz", + "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==", "dev": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.0.1", - "@webpack-cli/info": "^1.2.2", - "@webpack-cli/serve": "^1.3.0", - "colorette": "^1.2.1", + "@webpack-cli/configtest": "^1.1.0", + "@webpack-cli/info": "^1.4.0", + "@webpack-cli/serve": "^1.6.0", + "colorette": "^2.0.14", "commander": "^7.0.0", - "enquirer": "^2.3.6", "execa": "^5.0.0", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", "rechoir": "^0.7.0", - "v8-compile-cache": "^2.2.0", "webpack-merge": "^5.7.3" }, "bin": { @@ -8058,9 +4834,6 @@ "@webpack-cli/generators": { "optional": true }, - "@webpack-cli/init": { - "optional": true - }, "@webpack-cli/migrate": { "optional": true }, @@ -8072,33 +4845,10 @@ } } }, - "node_modules/webpack-cli/node_modules/commander": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", - "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/webpack-cli/node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/webpack-cli/node_modules/execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", @@ -8118,23 +4868,10 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/webpack-cli/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/webpack-cli/node_modules/get-stream": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", - "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "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" @@ -8143,41 +4880,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/webpack-cli/node_modules/import-local": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", - "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", - "dev": true, - "dependencies": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - }, - "bin": { - "import-local-fixture": "fixtures/cli.js" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/webpack-cli/node_modules/is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, "engines": { "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" }, - "engines": { - "node": ">=8" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/webpack-cli/node_modules/npm-run-path": { @@ -8192,143 +4904,63 @@ "node": ">=8" } }, - "node_modules/webpack-cli/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "dependencies": { - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-cli/node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/webpack-dev-middleware": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz", - "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.2.2.tgz", + "integrity": "sha512-DjZyYrsHhkikAFNvSNKrpnziXukU1EChFAh9j4LAm6ndPLPW8cN0KhM7T+RAiOqsQ6ABfQ8hoKIs9IWMTjov+w==", "dev": true, "dependencies": { - "memory-fs": "^0.4.1", - "mime": "^2.4.4", - "mkdirp": "^0.5.1", + "colorette": "^2.0.10", + "memfs": "^3.2.2", + "mime-types": "^2.1.31", "range-parser": "^1.2.1", - "webpack-log": "^2.0.0" + "schema-utils": "^4.0.0" }, "engines": { - "node": ">= 6" + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" } }, - "node_modules/webpack-dev-middleware/node_modules/memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "node_modules/webpack-dev-middleware/node_modules/ajv": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", "dev": true, "dependencies": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/webpack-dev-middleware/node_modules/mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, - "bin": { - "mime": "cli.js" + "dependencies": { + "fast-deep-equal": "^3.1.3" }, - "engines": { - "node": ">=4.0.0" + "peerDependencies": { + "ajv": "^8.8.2" } }, + "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, "node_modules/webpack-dev-middleware/node_modules/range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", @@ -8338,54 +4970,65 @@ "node": ">= 0.6" } }, - "node_modules/webpack-dev-server": { - "version": "3.11.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz", - "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==", + "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==", "dev": true, "dependencies": { - "ansi-html": "0.0.7", + "@types/json-schema": "^7.0.9", + "ajv": "^8.8.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.0.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/webpack-dev-server": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.6.0.tgz", + "integrity": "sha512-oojcBIKvx3Ya7qs1/AVWHDgmP1Xml8rGsEBnSobxU/UJSX1xP1GPM3MwsAnDzvqcVmVki8tV7lbcsjEjk0PtYg==", + "dev": true, + "dependencies": { + "ansi-html-community": "^0.0.8", "bonjour": "^3.5.0", - "chokidar": "^2.1.8", + "chokidar": "^3.5.2", + "colorette": "^2.0.10", "compression": "^1.7.4", "connect-history-api-fallback": "^1.6.0", - "debug": "^4.1.1", - "del": "^4.1.1", + "default-gateway": "^6.0.3", + "del": "^6.0.0", "express": "^4.17.1", - "html-entities": "^1.3.1", - "http-proxy-middleware": "0.19.1", - "import-local": "^2.0.0", - "internal-ip": "^4.3.0", - "ip": "^1.1.5", - "is-absolute-url": "^3.0.3", - "killable": "^1.0.1", - "loglevel": "^1.6.8", - "opn": "^5.5.0", - "p-retry": "^3.0.1", - "portfinder": "^1.0.26", - "schema-utils": "^1.0.0", - "selfsigned": "^1.10.8", - "semver": "^6.3.0", + "graceful-fs": "^4.2.6", + "html-entities": "^2.3.2", + "http-proxy-middleware": "^2.0.0", + "ipaddr.js": "^2.0.1", + "open": "^8.0.9", + "p-retry": "^4.5.0", + "portfinder": "^1.0.28", + "schema-utils": "^4.0.0", + "selfsigned": "^1.10.11", "serve-index": "^1.9.1", "sockjs": "^0.3.21", - "sockjs-client": "^1.5.0", "spdy": "^4.0.2", - "strip-ansi": "^3.0.1", - "supports-color": "^6.1.0", + "strip-ansi": "^7.0.0", "url": "^0.11.0", - "webpack-dev-middleware": "^3.7.2", - "webpack-log": "^2.0.0", - "ws": "^6.2.1", - "yargs": "^13.3.2" + "webpack-dev-middleware": "^5.2.1", + "ws": "^8.1.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" }, "engines": { - "node": ">= 6.11.5" + "node": ">= 12.13.0" }, "peerDependencies": { - "webpack": "^4.0.0 || ^5.0.0" + "webpack": "^4.37.0 || ^5.0.0" }, "peerDependenciesMeta": { "webpack-cli": { @@ -8393,13 +5036,44 @@ } } }, + "node_modules/webpack-dev-server/node_modules/ajv": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/webpack-dev-server/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, "node_modules/webpack-dev-server/node_modules/ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "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": ">=0.10.0" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, "node_modules/webpack-dev-server/node_modules/compression": { @@ -8429,71 +5103,65 @@ "ms": "2.0.0" } }, - "node_modules/webpack-dev-server/node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "node_modules/webpack-dev-server/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==", "dev": true, - "dependencies": { - "ms": "^2.1.1" + "engines": { + "node": ">= 10" } }, - "node_modules/webpack-dev-server/node_modules/debug/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/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", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, - "node_modules/webpack-dev-server/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/webpack-dev-server/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "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==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.8.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.0.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" } }, "node_modules/webpack-dev-server/node_modules/strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "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": "^2.0.0" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/webpack-dev-server/node_modules/supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" + "node": ">=12" }, - "engines": { - "node": ">=6" - } - }, - "node_modules/webpack-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", - "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "dependencies": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - }, - "engines": { - "node": ">= 6" + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/webpack-merge": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", - "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, "dependencies": { "clone-deep": "^4.0.1", @@ -8504,108 +5172,21 @@ } }, "node_modules/webpack-sources": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz", - "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz", + "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==", "dev": true, - "dependencies": { - "source-list-map": "^2.0.1", - "source-map": "^0.6.1" - }, "engines": { "node": ">=10.13.0" } }, - "node_modules/webpack-sources/node_modules/source-map": { - "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" - } - }, - "node_modules/webpack/node_modules/acorn": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz", - "integrity": "sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/webpack/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", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/webpack/node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "node_modules/webpack/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==", "dev": true, "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/webpack/node_modules/enhanced-resolve": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz", - "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/webpack/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/webpack/node_modules/schema-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", - "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.6", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/webpack/node_modules/tapable": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", - "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==", - "dev": true, - "engines": { - "node": ">=6" + "acorn": "^8" } }, "node_modules/websocket-driver": { @@ -8637,33 +5218,30 @@ "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" }, "node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "dependencies": { "isexe": "^2.0.0" }, "bin": { - "which": "bin/which" - } - }, - "node_modules/which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "node_modules/widest-line": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", - "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", - "dev": true, - "dependencies": { - "string-width": "^2.1.1" + "node-which": "bin/node-which" }, "engines": { - "node": ">=4" + "node": ">= 8" + } + }, + "node_modules/widest-line": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", + "dev": true, + "dependencies": { + "string-width": "^4.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/wildcard": { @@ -8682,52 +5260,20 @@ } }, "node_modules/wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "dependencies": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "node": ">=10" }, - "engines": { - "node": ">=6" - } - }, - "node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/wrappy": { @@ -8737,232 +5283,112 @@ "dev": true }, "node_modules/ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz", + "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==", "dev": true, - "dependencies": { - "async-limiter": "~1.0.0" + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } } }, - "node_modules/y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", - "dev": true - }, "node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true - }, - "node_modules/yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "dependencies": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "node_modules/yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "dependencies": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "node_modules/yargs-parser/node_modules/camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "dependencies": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yargs/node_modules/strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "dependencies": { - "ansi-regex": "^4.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } } }, "dependencies": { - "@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz", - "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==", - "dev": true - }, - "@babel/highlight": { - "version": "7.13.8", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.8.tgz", - "integrity": "sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.12.11", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, "@discoveryjs/json-ext": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz", - "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", + "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==", "dev": true }, "@eslint/eslintrc": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz", - "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.4.tgz", + "integrity": "sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q==", "dev": true, "requires": { "ajv": "^6.12.4", - "debug": "^4.1.1", - "espree": "^7.3.0", - "globals": "^12.1.0", + "debug": "^4.3.2", + "espree": "^9.0.0", + "globals": "^13.9.0", "ignore": "^4.0.6", "import-fresh": "^3.2.1", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "minimatch": "^3.0.4", "strip-json-comments": "^3.1.1" }, "dependencies": { - "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", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "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 - }, - "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 - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true } } }, - "@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", + "@humanwhocodes/config-array": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.6.0.tgz", + "integrity": "sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.4", + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, + "@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.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", + "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.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", + "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.4", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "@types/eslint": { - "version": "7.2.6", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.6.tgz", - "integrity": "sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.2.0.tgz", + "integrity": "sha512-74hbvsnc+7TEDa1z5YLSe4/q8hGYB3USNvCuzHUJrjPV6hXaq8IXcngCrHkuvFt0+8rFz7xYXrHgNayIX0UZvQ==", "dev": true, "requires": { "@types/estree": "*", @@ -8970,9 +5396,9 @@ } }, "@types/eslint-scope": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.0.tgz", - "integrity": "sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==", "dev": true, "requires": { "@types/eslint": "*", @@ -8980,420 +5406,287 @@ } }, "@types/estree": { - "version": "0.0.46", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz", - "integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg==", + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==", "dev": true }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "dev": true - }, - "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "@types/http-proxy": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz", + "integrity": "sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==", "dev": true, "requires": { - "@types/events": "*", - "@types/minimatch": "*", "@types/node": "*" } }, "@types/json-schema": { - "version": "7.0.7", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", - "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", - "dev": true - }, - "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "version": "7.0.9", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", + "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, "@types/node": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.0.tgz", - "integrity": "sha512-zwrxviZS08kRX40nqBrmERElF2vpw4IUTd5khkhBTfFH8AOaeoLVx48EC4+ZzS2/Iga7NevncqnsUSYjM4OWYA==", + "version": "16.11.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.11.tgz", + "integrity": "sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==", + "dev": true + }, + "@types/retry": { + "version": "0.12.1", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz", + "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==", "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz", - "integrity": "sha512-SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.5.0.tgz", + "integrity": "sha512-4bV6fulqbuaO9UMXU0Ia0o6z6if+kmMRW8rMRyfqXj/eGrZZRGedS4n0adeGNnjr8LKAM495hrQ7Tea52UWmQA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.16.1", - "@typescript-eslint/scope-manager": "4.16.1", - "debug": "^4.1.1", + "@typescript-eslint/experimental-utils": "5.5.0", + "@typescript-eslint/scope-manager": "5.5.0", + "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", - "lodash": "^4.17.15", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" - }, - "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.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==", - "dev": true - }, - "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } + "ignore": "^5.1.8", + "regexpp": "^3.2.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" } }, "@typescript-eslint/experimental-utils": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz", - "integrity": "sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.5.0.tgz", + "integrity": "sha512-kjWeeVU+4lQ1SLYErRKV5yDXbWDPkpbzTUUlfAUifPYvpX0qZlrcCZ96/6oWxt3QxtK5WVhXz+KsnwW9cIW+3A==", "dev": true, "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/scope-manager": "4.16.1", - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/typescript-estree": "4.16.1", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.5.0", + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/typescript-estree": "5.5.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" } }, "@typescript-eslint/parser": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.16.1.tgz", - "integrity": "sha512-/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.5.0.tgz", + "integrity": "sha512-JsXBU+kgQOAgzUn2jPrLA+Rd0Y1dswOlX3hp8MuRO1hQDs6xgHtbCXEiAu7bz5hyVURxbXcA2draasMbNqrhmg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.16.1", - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/typescript-estree": "4.16.1", - "debug": "^4.1.1" - }, - "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "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 - } + "@typescript-eslint/scope-manager": "5.5.0", + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/typescript-estree": "5.5.0", + "debug": "^4.3.2" } }, "@typescript-eslint/scope-manager": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz", - "integrity": "sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.5.0.tgz", + "integrity": "sha512-0/r656RmRLo7CbN4Mdd+xZyPJ/fPCKhYdU6mnZx+8msAD8nJSP8EyCFkzbd6vNVZzZvWlMYrSNekqGrCBqFQhg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/visitor-keys": "4.16.1" + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/visitor-keys": "5.5.0" } }, "@typescript-eslint/types": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.16.1.tgz", - "integrity": "sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.5.0.tgz", + "integrity": "sha512-OaYTqkW3GnuHxqsxxJ6KypIKd5Uw7bFiQJZRyNi1jbMJnK3Hc/DR4KwB6KJj6PBRkJJoaNwzMNv9vtTk87JhOg==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz", - "integrity": "sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.5.0.tgz", + "integrity": "sha512-pVn8btYUiYrjonhMAO0yG8lm7RApzy2L4RC7Td/mC/qFkyf6vRbGyZozoA94+w6D2Y2GRqpMoCWcwx/EUOzyoQ==", "dev": true, "requires": { - "@typescript-eslint/types": "4.16.1", - "@typescript-eslint/visitor-keys": "4.16.1", - "debug": "^4.1.1", - "globby": "^11.0.1", - "is-glob": "^4.0.1", - "semver": "^7.3.2", - "tsutils": "^3.17.1" - }, - "dependencies": { - "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 - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "globby": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz", - "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" - } - }, - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.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==", - "dev": true - }, - "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } + "@typescript-eslint/types": "5.5.0", + "@typescript-eslint/visitor-keys": "5.5.0", + "debug": "^4.3.2", + "globby": "^11.0.4", + "is-glob": "^4.0.3", + "semver": "^7.3.5", + "tsutils": "^3.21.0" } }, "@typescript-eslint/visitor-keys": { - "version": "4.16.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz", - "integrity": "sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.5.0.tgz", + "integrity": "sha512-4GzJ1kRtsWzHhdM40tv0ZKHNSbkDhF0Woi/TDwVJX6UICwJItvP7ZTXbjTkCdrors7ww0sYe0t+cIKDAJwZ7Kw==", "dev": true, "requires": { - "@typescript-eslint/types": "4.16.1", - "eslint-visitor-keys": "^2.0.0" + "@typescript-eslint/types": "5.5.0", + "eslint-visitor-keys": "^3.0.0" } }, "@webassemblyjs/ast": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz", - "integrity": "sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==", + "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.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0" + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz", - "integrity": "sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==", + "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==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz", - "integrity": "sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==", + "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==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz", - "integrity": "sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", "dev": true }, "@webassemblyjs/helper-numbers": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz", - "integrity": "sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==", + "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.0", - "@webassemblyjs/helper-api-error": "1.11.0", + "@webassemblyjs/floating-point-hex-parser": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", "@xtuc/long": "4.2.2" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz", - "integrity": "sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==", + "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==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz", - "integrity": "sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==", + "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.0", - "@webassemblyjs/helper-buffer": "1.11.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/wasm-gen": "1.11.0" + "@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/ieee754": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz", - "integrity": "sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==", + "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" } }, "@webassemblyjs/leb128": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.0.tgz", - "integrity": "sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==", + "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" } }, "@webassemblyjs/utf8": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.0.tgz", - "integrity": "sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz", - "integrity": "sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==", + "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.0", - "@webassemblyjs/helper-buffer": "1.11.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/helper-wasm-section": "1.11.0", - "@webassemblyjs/wasm-gen": "1.11.0", - "@webassemblyjs/wasm-opt": "1.11.0", - "@webassemblyjs/wasm-parser": "1.11.0", - "@webassemblyjs/wast-printer": "1.11.0" + "@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/wasm-gen": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz", - "integrity": "sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==", + "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.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/ieee754": "1.11.0", - "@webassemblyjs/leb128": "1.11.0", - "@webassemblyjs/utf8": "1.11.0" + "@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/wasm-opt": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz", - "integrity": "sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==", + "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.0", - "@webassemblyjs/helper-buffer": "1.11.0", - "@webassemblyjs/wasm-gen": "1.11.0", - "@webassemblyjs/wasm-parser": "1.11.0" + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-buffer": "1.11.1", + "@webassemblyjs/wasm-gen": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1" } }, "@webassemblyjs/wasm-parser": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz", - "integrity": "sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==", + "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.0", - "@webassemblyjs/helper-api-error": "1.11.0", - "@webassemblyjs/helper-wasm-bytecode": "1.11.0", - "@webassemblyjs/ieee754": "1.11.0", - "@webassemblyjs/leb128": "1.11.0", - "@webassemblyjs/utf8": "1.11.0" + "@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/wast-printer": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz", - "integrity": "sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==", + "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.0", + "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" } }, "@webpack-cli/configtest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.1.tgz", - "integrity": "sha512-B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.0.tgz", + "integrity": "sha512-ttOkEkoalEHa7RaFYpM0ErK1xc4twg3Am9hfHhL7MVqlHebnkYd2wuI/ZqTDj0cVzZho6PdinY0phFZV3O0Mzg==", "dev": true, "requires": {} }, "@webpack-cli/info": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.2.tgz", - "integrity": "sha512-5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.0.tgz", + "integrity": "sha512-F6b+Man0rwE4n0409FyAJHStYA5OIZERxmnUfLVwv0mc0V1wLad3V7jqRlMkgKBeAq07jUvglacNaa6g9lOpuw==", "dev": true, "requires": { "envinfo": "^7.7.3" } }, "@webpack-cli/serve": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.0.tgz", - "integrity": "sha512-k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.0.tgz", + "integrity": "sha512-ZkVeqEmRpBV2GHvjjUZqEai2PpUbuq8Bqd//vEYsp63J8WyexI8ppCqVS3Zs0QADf6aWuPdU+0XsPI647PVlQA==", "dev": true, "requires": {} }, @@ -9426,206 +5719,126 @@ } }, "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz", + "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==", "dev": true }, "acorn-jsx": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", - "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, "requires": {} }, - "ajv": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz", - "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==", + "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": { - "fast-deep-equal": "^2.0.1", + "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", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, - "ajv-errors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true - }, - "ajv-keywords": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", - "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", - "dev": true - }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, "requires": { - "string-width": "^2.0.0" - } - }, - "ansi-colors": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", - "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", - "dev": true - }, - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "ajv": "^8.0.0" }, "dependencies": { - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "ajv": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" } }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true } } }, + "ajv-keywords": { + "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-align": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", + "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", + "dev": true, + "requires": { + "string-width": "^4.1.0" + } + }, + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + }, + "ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "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 + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, "arch": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz", - "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz", + "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==", "dev": true }, "arg": { @@ -9635,30 +5848,9 @@ "dev": true }, "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, "array-flatten": { @@ -9668,36 +5860,9 @@ "dev": true }, "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true - }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "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 }, "async": { @@ -9709,101 +5874,22 @@ "lodash": "^4.17.14" } }, - "async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true - }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", - "dev": true - }, - "atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true - }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", "dev": true }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true - }, "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, "body-parser": { @@ -9829,6 +5915,21 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true } } }, @@ -9847,18 +5948,19 @@ } }, "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz", + "integrity": "sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==", "dev": true, "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" + "ansi-align": "^3.0.0", + "camelcase": "^6.2.0", + "chalk": "^4.1.0", + "cli-boxes": "^2.2.1", + "string-width": "^4.2.2", + "type-fest": "^0.20.2", + "widest-line": "^3.1.0", + "wrap-ansi": "^7.0.0" } }, "brace-expansion": { @@ -9881,22 +5983,22 @@ } }, "browserslist": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", - "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz", + "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001181", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.649", + "caniuse-lite": "^1.0.30001280", + "electron-to-chromium": "^1.3.896", "escalade": "^3.1.1", - "node-releases": "^1.1.70" + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" } }, "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, "buffer-indexof": { @@ -9911,21 +6013,14 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", "dev": true }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "call-bind": { + "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": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" } }, "callsites": { @@ -9935,230 +6030,81 @@ "dev": true }, "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz", + "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==", "dev": true }, "caniuse-lite": { - "version": "1.0.30001194", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001194.tgz", - "integrity": "sha512-iDUOH+oFeBYk5XawYsPtsx/8fFpndAPUQJC7gBTfxHM8xw5nOZv7ceAD4frS1MKCLUac7QL5wdAJiFQlDRjXlA==", + "version": "1.0.30001283", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz", + "integrity": "sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg==", "dev": true }, "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" } }, "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.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" }, "dependencies": { - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-glob": "^4.0.1" } } } }, "chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "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 }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.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 }, "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", + "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", "dev": true }, "clipboardy": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz", - "integrity": "sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", + "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==", "dev": true, "requires": { - "arch": "^2.1.0", - "execa": "^0.8.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", - "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - } - } - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "arch": "^2.1.1", + "execa": "^1.0.0", + "is-wsl": "^2.1.1" } }, "clone-deep": { @@ -10172,56 +6118,40 @@ "shallow-clone": "^3.0.0" } }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.3" + "color-name": "~1.1.4" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, "colorette": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz", - "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", + "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", "dev": true }, "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==", - "dev": true - }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true }, "compressible": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz", - "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { - "mime-db": ">= 1.40.0 < 2" + "mime-db": ">= 1.43.0 < 2" } }, "compression": { @@ -10237,6 +6167,23 @@ "on-headers": "~1.0.1", "safe-buffer": "5.1.2", "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, "concat-map": { @@ -10275,52 +6222,32 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true - }, "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "2.1.2" } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true - }, "deep-equal": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", @@ -10342,47 +6269,66 @@ "dev": true }, "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "default-gateway": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", - "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", "dev": true, "requires": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" + "execa": "^5.0.0" }, "dependencies": { "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" } }, "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "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 + }, + "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 + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "requires": { - "pump": "^3.0.0" + "path-key": "^3.0.0" } } } }, + "define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "dev": true + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -10392,71 +6338,20 @@ "object-keys": "^1.0.12" } }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, "del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } + "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": { @@ -10472,9 +6367,9 @@ "dev": true }, "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true }, "dir-glob": { @@ -10493,9 +6388,9 @@ "dev": true }, "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", + "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", @@ -10527,21 +6422,15 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.680", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.680.tgz", - "integrity": "sha512-XBACJT9RdpdWtoMXQPR8Be3ZtmizWWbxfw8cY2b5feUwiDO3FUl8qo4W2jXoq/WnnA3xBRqafu1XbpczqyUvlA==", + "version": "1.4.9", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.9.tgz", + "integrity": "sha512-7AyB4SiLtGJbLACXezs8BDjDbZizuoiyHTQxbcvzfi5LYWRXVSFdmPvuDjtlWQmsVSONRicZfSBj3xgft0Wvrg==", "dev": true }, "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "encodeurl": { @@ -10560,14 +6449,13 @@ } }, "enhanced-resolve": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", - "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", + "version": "5.8.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz", + "integrity": "sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" } }, "enquirer": { @@ -10577,67 +6465,20 @@ "dev": true, "requires": { "ansi-colors": "^4.1.1" - }, - "dependencies": { - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - } } }, "envinfo": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.4.tgz", - "integrity": "sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", + "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "dev": true }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, - "requires": { - "prr": "~1.0.1" - } - }, - "es-abstract": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", - "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" - } - }, "es-module-lexer": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz", - "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==", + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", + "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "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" - } - }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -10651,240 +6492,92 @@ "dev": true }, "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "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": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz", - "integrity": "sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.3.0.tgz", + "integrity": "sha512-aIay56Ph6RxOTC7xyr59Kt3ewX185SaGnAr8eWukoPLeriCrvGjvAubxuvaXOfsxhtwV5g0uBOsyhAom4qJdww==", "dev": true, "requires": { - "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.0", + "@eslint/eslintrc": "^1.0.4", + "@humanwhocodes/config-array": "^0.6.0", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", - "debug": "^4.0.1", + "debug": "^4.3.2", "doctrine": "^3.0.0", "enquirer": "^2.3.5", - "eslint-scope": "^5.1.1", - "eslint-utils": "^2.1.0", - "eslint-visitor-keys": "^2.0.0", - "espree": "^7.3.1", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.0", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.1.0", + "espree": "^9.1.0", "esquery": "^1.4.0", "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", + "glob-parent": "^6.0.1", + "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", + "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", - "lodash": "^4.17.20", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", "progress": "^2.0.0", - "regexpp": "^3.1.0", + "regexpp": "^3.2.0", "semver": "^7.2.1", - "strip-ansi": "^6.0.0", + "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "table": "^6.0.4", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, "dependencies": { - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "eslint-scope": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz", + "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" } }, - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "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 - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.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==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true } } }, "eslint-config-prettier": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz", - "integrity": "sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", "dev": true, "requires": {} }, "eslint-plugin-prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz", - "integrity": "sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0" @@ -10901,53 +6594,39 @@ } }, "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "^2.0.0" }, "dependencies": { "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true } } }, "eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "dev": true }, "espree": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", - "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.1.0.tgz", + "integrity": "sha512-ZgYLvCS1wxOczBYGcQT9DDWgicXwJ4dbocr9uYN+/eresBAUuBu+O4WzB21ufQ/JqQT8gyp7hJ3z8SHii32mTQ==", "dev": true, "requires": { - "acorn": "^7.4.0", + "acorn": "^8.6.0", "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^1.3.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", - "dev": true - } + "eslint-visitor-keys": "^3.1.0" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, "esquery": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", @@ -10958,9 +6637,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -10975,9 +6654,9 @@ }, "dependencies": { "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } @@ -11001,9 +6680,9 @@ "dev": true }, "eventemitter3": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", - "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", "dev": true }, "events": { @@ -11012,23 +6691,14 @@ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true }, - "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, - "requires": { - "original": "^1.0.0" - } - }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", "is-stream": "^1.1.0", "npm-run-path": "^2.0.0", "p-finally": "^1.0.0", @@ -11037,49 +6707,52 @@ }, "dependencies": { "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "lru-cache": "^4.0.1", + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" } - } - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "shebang-regex": "^1.0.0" } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "isexe": "^2.0.0" } } } @@ -11137,6 +6810,21 @@ "safe-buffer": "5.1.2" } }, + "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -11151,96 +6839,10 @@ } } }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "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 }, "fast-diff": { @@ -11250,23 +6852,22 @@ "dev": true }, "fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", + "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "micromatch": "^4.0.4" }, "dependencies": { "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -11275,9 +6876,9 @@ } }, "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "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==", "dev": true }, "fast-levenshtein": { @@ -11293,14 +6894,6 @@ "dev": true, "requires": { "punycode": "^1.3.2" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } } }, "fastest-levenshtein": { @@ -11310,18 +6903,18 @@ "dev": true }, "fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", + "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" } }, "faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", "dev": true, "requires": { "websocket-driver": ">=0.5.1" @@ -11358,15 +6951,33 @@ "parseurl": "~1.3.3", "statuses": "~1.5.0", "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": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "flat-cache": { @@ -11380,64 +6991,35 @@ } }, "flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", + "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", "dev": true }, "follow-redirects": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz", - "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==", - "dev": true, - "requires": { - "debug": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.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 - } - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", + "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", "dev": true }, "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "requires": { - "map-cache": "^0.2.2" - } - }, "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "dev": true }, + "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==", + "dev": true + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -11445,552 +7027,11 @@ "dev": true }, "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, - "optional": true, - "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true, - "optional": true - }, - "minipass": { - "version": "2.3.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.3.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.7.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "yallist": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "optional": true - } - } + "optional": true }, "function-bind": { "version": "1.1.1", @@ -12004,28 +7045,30 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "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", + "has-symbols": "^1.0.1" + } }, "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } }, "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -12037,24 +7080,12 @@ } }, "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } + "is-glob": "^4.0.3" } }, "glob-to-regexp": { @@ -12064,39 +7095,32 @@ "dev": true }, "globals": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz", - "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==", + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", + "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", "dev": true, "requires": { - "type-fest": "^0.8.1" + "type-fest": "^0.20.2" } }, "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" } }, "graceful-fs": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz", - "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", "dev": true }, "handle-thing": { @@ -12115,67 +7139,24 @@ } }, "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", "dev": true }, - "has-value": { + "has-tostringtag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } + "has-symbols": "^1.0.2" } }, "hpack.js": { @@ -12191,9 +7172,9 @@ } }, "html-entities": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz", - "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz", + "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==", "dev": true }, "http-deceiver": { @@ -12224,9 +7205,9 @@ } }, "http-parser-js": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", - "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.5.tgz", + "integrity": "sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==", "dev": true }, "http-proxy": { @@ -12241,120 +7222,16 @@ } }, "http-proxy-middleware": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", - "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz", + "integrity": "sha512-cfaXRVoZxSed/BmkA7SwBVNI9Kj7HFltaE5rqYOub5kWzWZ+gofV2koVN1j2rMW7pEfSSlCHGJ31xmuyFyfLOg==", "dev": true, "requires": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" - }, - "dependencies": { - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - } + "@types/http-proxy": "^1.17.5", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" } }, "human-signals": { @@ -12373,37 +7250,29 @@ } }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz", + "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==", "dev": true }, "import-fresh": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", - "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - } } }, "import-local": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", - "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", + "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", "dev": true, "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" } }, "imurmurhash": { @@ -12412,6 +7281,12 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "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", @@ -12434,16 +7309,6 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, - "internal-ip": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", - "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", - "dev": true, - "requires": { - "default-gateway": "^4.2.0", - "ipaddr.js": "^1.9.0" - } - }, "interpret": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", @@ -12456,129 +7321,53 @@ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", "dev": true }, - "ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true - }, "ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true }, - "is-absolute-url": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", - "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==", - "dev": true - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "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": { - "binary-extensions": "^1.0.0" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } }, "is-core-module": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz", - "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", + "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", "dev": true, "requires": { "has": "^1.0.3" } }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "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": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "has-tostringtag": "^1.0.0" } }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true }, "is-extglob": { @@ -12588,15 +7377,15 @@ "dev": true }, "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { "is-extglob": "^2.1.1" @@ -12614,23 +7403,17 @@ "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", "dev": true }, - "is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true, - "requires": { - "is-path-inside": "^2.1.0" - } - }, "is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true, - "requires": { - "path-is-inside": "^1.0.2" - } + "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==", + "dev": true }, "is-plain-object": { "version": "2.0.4", @@ -12642,12 +7425,13 @@ } }, "is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "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": { - "has": "^1.0.3" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, "is-stream": { @@ -12656,27 +7440,15 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, - "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "is-docker": "^2.0.0" } }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true - }, "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", @@ -12696,26 +7468,20 @@ "dev": true }, "jest-worker": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", - "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", + "version": "27.4.2", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz", + "integrity": "sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==", "dev": true, "requires": { "@types/node": "*", "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "supports-color": "^8.0.0" }, "dependencies": { - "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 - }, "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "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" @@ -12723,20 +7489,13 @@ } } }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" } }, "json-parse-better-errors": { @@ -12757,27 +7516,6 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, - "json3": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz", - "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==", - "dev": true - }, - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "killable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", - "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==", - "dev": true - }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -12800,25 +7538,13 @@ "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==", "dev": true }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "^4.1.0" } }, "lodash": { @@ -12827,35 +7553,19 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "loglevel": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", - "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==", + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, - "requires": { - "object-visit": "^1.0.0" + "yallist": "^4.0.0" } }, "media-typer": { @@ -12864,14 +7574,13 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, - "memory-fs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", - "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", + "memfs": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.0.tgz", + "integrity": "sha512-o/RfP0J1d03YwsAxyHxAYs2kyJp55AFkMazlFAZFR2I2IXkxiUTXRabJ6RmNNCQ83LAD2jy52Khj0m3OffpNdA==", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "fs-monkey": "1.0.3" } }, "merge-descriptors": { @@ -12899,13 +7608,13 @@ "dev": true }, "micromatch": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", - "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { "braces": "^3.0.1", - "picomatch": "^2.0.5" + "picomatch": "^2.2.3" } }, "mime": { @@ -12915,26 +7624,18 @@ "dev": true }, "mime-db": { - "version": "1.42.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz", - "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==", + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "dev": true }, "mime-types": { - "version": "2.1.29", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz", - "integrity": "sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dev": true, "requires": { - "mime-db": "1.46.0" - }, - "dependencies": { - "mime-db": { - "version": "1.46.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz", - "integrity": "sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==", - "dev": true - } + "mime-db": "1.51.0" } }, "mimic-fn": { @@ -12964,27 +7665,6 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, - "mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, "mkdirp": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", @@ -12995,9 +7675,9 @@ } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "multicast-dns": { @@ -13016,32 +7696,6 @@ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", "dev": true }, - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "dev": true, - "optional": true - }, - "nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - } - }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -13073,9 +7727,9 @@ "dev": true }, "node-releases": { - "version": "1.1.71", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", - "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true }, "normalize-path": { @@ -13091,56 +7745,25 @@ "dev": true, "requires": { "path-key": "^2.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true } } }, - "object-inspect": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", - "dev": true - }, "object-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", - "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==", - "dev": true + "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" + } }, "object-keys": { "version": "1.1.1", @@ -13148,36 +7771,6 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, - "object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, - "requires": { - "isobject": "^3.0.0" - } - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, "obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -13217,13 +7810,15 @@ "mimic-fn": "^2.1.0" } }, - "opn": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", - "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", + "open": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", + "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" } }, "optionator": { @@ -13240,15 +7835,6 @@ "word-wrap": "^1.2.3" } }, - "original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "requires": { - "url-parse": "^1.4.3" - } - }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -13256,36 +7842,40 @@ "dev": true }, "p-limit": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", - "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { "p-try": "^2.0.0" } }, "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "^2.2.0" } }, "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true - }, - "p-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", - "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", + "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": { - "retry": "^0.12.0" + "aggregate-error": "^3.0.0" + } + }, + "p-retry": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.1.tgz", + "integrity": "sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==", + "dev": true, + "requires": { + "@types/retry": "^0.12.0", + "retry": "^0.13.1" } }, "p-try": { @@ -13309,22 +7899,10 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true - }, "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, "path-is-absolute": { @@ -13340,15 +7918,15 @@ "dev": true }, "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-to-regexp": { @@ -13363,40 +7941,25 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", "dev": true }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "^3.0.0" + "find-up": "^4.0.0" } }, "portfinder": { @@ -13418,21 +7981,9 @@ "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 } } }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true - }, "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -13440,9 +7991,9 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.0.tgz", + "integrity": "sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==", "dev": true }, "prettier-linter-helpers": { @@ -13467,27 +8018,15 @@ "dev": true }, "proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" } }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", @@ -13499,9 +8038,9 @@ } }, "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": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true }, "qs": { @@ -13516,16 +8055,10 @@ "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "dev": true }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, "queue-microtask": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz", - "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, "randombytes": { @@ -13573,12 +8106,20 @@ "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + } } }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -13591,154 +8132,37 @@ } }, "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - }, - "dependencies": { - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - } + "picomatch": "^2.2.1" } }, "rechoir": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz", - "integrity": "sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, "requires": { "resolve": "^1.9.0" } }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } - }, "regexp.prototype.flags": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", - "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz", + "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, "regexpp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", - "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", "dev": true }, "registry-auth-token": { @@ -13760,42 +8184,12 @@ "rc": "^1.0.1" } }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, "require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -13813,36 +8207,32 @@ } }, "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } } }, "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "dev": true - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", "dev": true }, "reusify": { @@ -13875,15 +8265,6 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, - "requires": { - "ret": "~0.1.10" - } - }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -13891,14 +8272,14 @@ "dev": true }, "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "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": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } }, "select-hose": { @@ -13908,19 +8289,22 @@ "dev": true }, "selfsigned": { - "version": "1.10.8", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", - "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", + "version": "1.10.11", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz", + "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==", "dev": true, "requires": { "node-forge": "^0.10.0" } }, "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", - "dev": true + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } }, "send": { "version": "0.17.1", @@ -13943,6 +8327,23 @@ "statuses": "~1.5.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" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -13958,31 +8359,40 @@ } }, "serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "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" } }, "serve": { - "version": "11.3.2", - "resolved": "https://registry.npmjs.org/serve/-/serve-11.3.2.tgz", - "integrity": "sha512-yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w==", + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/serve/-/serve-13.0.2.tgz", + "integrity": "sha512-71R6fKvNgKrqARAag6lYJNnxDzpH7DCNrMuvPY5PLVaC2PDhJsGTj/34o4o4tPWhTuLgEXqvgnAWbATQ9zGZTQ==", "dev": true, "requires": { "@zeit/schemas": "2.6.0", - "ajv": "6.5.3", + "ajv": "6.12.6", "arg": "2.0.0", - "boxen": "1.3.0", + "boxen": "5.1.2", "chalk": "2.4.1", - "clipboardy": "1.2.3", + "clipboardy": "2.3.0", "compression": "1.7.3", "serve-handler": "6.1.3", "update-check": "1.5.2" }, "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, "chalk": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", @@ -13993,6 +8403,42 @@ "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } } } }, @@ -14044,6 +8490,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" + } + }, "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", @@ -14062,6 +8517,12 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, "setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -14082,35 +8543,6 @@ "send": "0.17.1" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", @@ -14127,24 +8559,24 @@ } }, "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "^3.0.0" } }, "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", "dev": true }, "slash": { @@ -14153,247 +8585,33 @@ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - } - } - }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, - "requires": { - "kind-of": "^3.2.0" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, "sockjs": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz", - "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==", + "version": "0.3.24", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", "dev": true, "requires": { "faye-websocket": "^0.11.3", - "uuid": "^3.4.0", + "uuid": "^8.3.2", "websocket-driver": "^0.7.4" } }, - "sockjs-client": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz", - "integrity": "sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==", - "dev": true, - "requires": { - "debug": "^3.2.6", - "eventsource": "^1.0.7", - "faye-websocket": "^0.11.3", - "inherits": "^2.0.4", - "json3": "^3.3.3", - "url-parse": "^1.4.7" - }, - "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 - } - } - }, - "source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", - "dev": true - }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "dev": true, - "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "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" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } } }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", - "dev": true - }, "spdy": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", @@ -14405,23 +8623,6 @@ "http-deceiver": "^1.2.7", "select-hose": "^2.0.0", "spdy-transport": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "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": { @@ -14438,21 +8639,6 @@ "wbuf": "^1.7.3" }, "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "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 - }, "readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -14466,42 +8652,6 @@ } } }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -14518,42 +8668,23 @@ } }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, - "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "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": "^3.0.0" + "ansi-regex": "^5.0.1" } }, "strip-eof": { @@ -14569,194 +8700,63 @@ "dev": true }, "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "^3.0.0" - } - }, - "table": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/table/-/table-6.0.7.tgz", - "integrity": "sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g==", - "dev": true, - "requires": { - "ajv": "^7.0.2", - "lodash": "^4.17.20", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.0" - }, - "dependencies": { - "ajv": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz", - "integrity": "sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "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 - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "string-width": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", - "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - } + "has-flag": "^4.0.0" } }, "tapable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true }, - "term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "dev": true, - "requires": { - "execa": "^0.7.0" - } - }, - "terser": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.0.tgz", - "integrity": "sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==", - "dev": true, - "requires": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.19" - }, - "dependencies": { - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } - }, "terser-webpack-plugin": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz", - "integrity": "sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz", + "integrity": "sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g==", "dev": true, "requires": { - "jest-worker": "^26.6.2", - "p-limit": "^3.1.0", - "schema-utils": "^3.0.0", - "serialize-javascript": "^5.0.1", + "jest-worker": "^27.0.6", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", "source-map": "^0.6.1", - "terser": "^5.5.1" + "terser": "^5.7.2" }, "dependencies": { - "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", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "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": {} - }, - "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==", + "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==", "dev": true }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "terser": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", + "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", "dev": true, "requires": { - "yocto-queue": "^0.1.0" + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } } - }, - "schema-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", - "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.6", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true } } }, @@ -14772,38 +8772,6 @@ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -14820,103 +8788,27 @@ "dev": true }, "ts-loader": { - "version": "8.0.17", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.17.tgz", - "integrity": "sha512-OeVfSshx6ot/TCxRwpBHQ/4lRzfgyTkvi7ghDVrLXOHzTbSK413ROgu/xNqM72i3AFeAIJgQy78FwSMKmOW68w==", + "version": "9.2.6", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.2.6.tgz", + "integrity": "sha512-QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw==", "dev": true, "requires": { "chalk": "^4.1.0", - "enhanced-resolve": "^4.0.0", - "loader-utils": "^2.0.0", + "enhanced-resolve": "^5.0.0", "micromatch": "^4.0.0", "semver": "^7.3.4" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "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==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } } }, "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, "tsutils": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.20.0.tgz", - "integrity": "sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg==", + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", "dev": true, "requires": { "tslib": "^1.8.1" @@ -14932,9 +8824,9 @@ } }, "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, "type-is": { @@ -14948,75 +8840,17 @@ } }, "typescript": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.2.tgz", - "integrity": "sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", + "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==", "dev": true }, - "union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - } - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", "dev": true }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true - } - } - }, - "upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", - "dev": true - }, "update-check": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.2.tgz", @@ -15028,20 +8862,22 @@ } }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "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" + }, + "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==", + "dev": true + } } }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true - }, "url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", @@ -15060,22 +8896,6 @@ } } }, - "url-parse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", - "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -15089,15 +8909,15 @@ "dev": true }, "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true }, "v8-compile-cache": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz", - "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, "vary": { @@ -15107,9 +8927,9 @@ "dev": true }, "watchpack": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz", - "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.0.tgz", + "integrity": "sha512-MnN0Q1OsvB/GGHETrFeZPQaOelWh/7O+EiFlj8sM9GPjtQkis7k01aAxrg/18kTfoIVcLL+haEVFlXDaSRwKRw==", "dev": true, "requires": { "glob-to-regexp": "^0.4.1", @@ -15126,22 +8946,23 @@ } }, "webpack": { - "version": "5.24.3", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.24.3.tgz", - "integrity": "sha512-x7lrWZ7wlWAdyKdML6YPvfVZkhD1ICuIZGODE5SzKJjqI9A4SpqGTjGJTc6CwaHqn19gGaoOR3ONJ46nYsn9rw==", + "version": "5.64.4", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.64.4.tgz", + "integrity": "sha512-LWhqfKjCLoYJLKJY8wk2C3h77i8VyHowG3qYNZiIqD6D0ZS40439S/KVuc/PY48jp2yQmy0mhMknq8cys4jFMw==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", - "@types/estree": "^0.0.46", - "@webassemblyjs/ast": "1.11.0", - "@webassemblyjs/wasm-edit": "1.11.0", - "@webassemblyjs/wasm-parser": "1.11.0", - "acorn": "^8.0.4", + "@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", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.7.0", - "es-module-lexer": "^0.4.0", - "eslint-scope": "^5.1.1", + "enhanced-resolve": "^5.8.3", + "es-module-lexer": "^0.9.0", + "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.4", @@ -15149,116 +8970,46 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.0.0", + "schema-utils": "^3.1.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.1", - "watchpack": "^2.0.0", - "webpack-sources": "^2.1.1" + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.3.0", + "webpack-sources": "^3.2.2" }, "dependencies": { - "acorn": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.0.5.tgz", - "integrity": "sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==", - "dev": true - }, - "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", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "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": {} - }, - "enhanced-resolve": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz", - "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - } - }, - "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 - }, - "schema-utils": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz", - "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.6", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - }, - "tapable": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", - "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==", - "dev": true } } }, "webpack-cli": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.5.0.tgz", - "integrity": "sha512-wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.1.tgz", + "integrity": "sha512-JYRFVuyFpzDxMDB+v/nanUdQYcZtqFPGzmlW4s+UkPMFhSpfRNmf1z4AwYcHJVdvEFAM7FFCQdNTpsBYhDLusQ==", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.0.1", - "@webpack-cli/info": "^1.2.2", - "@webpack-cli/serve": "^1.3.0", - "colorette": "^1.2.1", + "@webpack-cli/configtest": "^1.1.0", + "@webpack-cli/info": "^1.4.0", + "@webpack-cli/serve": "^1.6.0", + "colorette": "^2.0.14", "commander": "^7.0.0", - "enquirer": "^2.3.6", "execa": "^5.0.0", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", "rechoir": "^0.7.0", - "v8-compile-cache": "^2.2.0", "webpack-merge": "^5.7.3" }, "dependencies": { - "commander": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz", - "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==", - "dev": true - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, "execa": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz", - "integrity": "sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "requires": { "cross-spawn": "^7.0.3", @@ -15272,47 +9023,18 @@ "strip-final-newline": "^2.0.0" } }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, "get-stream": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz", - "integrity": "sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg==", + "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 }, - "import-local": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", - "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, "npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", @@ -15321,105 +9043,47 @@ "requires": { "path-key": "^3.0.0" } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } } } }, "webpack-dev-middleware": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz", - "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.2.2.tgz", + "integrity": "sha512-DjZyYrsHhkikAFNvSNKrpnziXukU1EChFAh9j4LAm6ndPLPW8cN0KhM7T+RAiOqsQ6ABfQ8hoKIs9IWMTjov+w==", "dev": true, "requires": { - "memory-fs": "^0.4.1", - "mime": "^2.4.4", - "mkdirp": "^0.5.1", + "colorette": "^2.0.10", + "memfs": "^3.2.2", + "mime-types": "^2.1.31", "range-parser": "^1.2.1", - "webpack-log": "^2.0.0" + "schema-utils": "^4.0.0" }, "dependencies": { - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "ajv": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" } }, - "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.3" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, "range-parser": { @@ -15427,54 +9091,79 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "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==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.8.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.0.0" + } } } }, "webpack-dev-server": { - "version": "3.11.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz", - "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.6.0.tgz", + "integrity": "sha512-oojcBIKvx3Ya7qs1/AVWHDgmP1Xml8rGsEBnSobxU/UJSX1xP1GPM3MwsAnDzvqcVmVki8tV7lbcsjEjk0PtYg==", "dev": true, "requires": { - "ansi-html": "0.0.7", + "ansi-html-community": "^0.0.8", "bonjour": "^3.5.0", - "chokidar": "^2.1.8", + "chokidar": "^3.5.2", + "colorette": "^2.0.10", "compression": "^1.7.4", "connect-history-api-fallback": "^1.6.0", - "debug": "^4.1.1", - "del": "^4.1.1", + "default-gateway": "^6.0.3", + "del": "^6.0.0", "express": "^4.17.1", - "html-entities": "^1.3.1", - "http-proxy-middleware": "0.19.1", - "import-local": "^2.0.0", - "internal-ip": "^4.3.0", - "ip": "^1.1.5", - "is-absolute-url": "^3.0.3", - "killable": "^1.0.1", - "loglevel": "^1.6.8", - "opn": "^5.5.0", - "p-retry": "^3.0.1", - "portfinder": "^1.0.26", - "schema-utils": "^1.0.0", - "selfsigned": "^1.10.8", - "semver": "^6.3.0", + "graceful-fs": "^4.2.6", + "html-entities": "^2.3.2", + "http-proxy-middleware": "^2.0.0", + "ipaddr.js": "^2.0.1", + "open": "^8.0.9", + "p-retry": "^4.5.0", + "portfinder": "^1.0.28", + "schema-utils": "^4.0.0", + "selfsigned": "^1.10.11", "serve-index": "^1.9.1", "sockjs": "^0.3.21", - "sockjs-client": "^1.5.0", "spdy": "^4.0.2", - "strip-ansi": "^3.0.1", - "supports-color": "^6.1.0", + "strip-ansi": "^7.0.0", "url": "^0.11.0", - "webpack-dev-middleware": "^3.7.2", - "webpack-log": "^2.0.0", - "ws": "^6.2.1", - "yargs": "^13.3.2" + "webpack-dev-middleware": "^5.2.1", + "ws": "^8.1.0" }, "dependencies": { + "ajv": { + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz", + "integrity": "sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.3" + } + }, "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true }, "compression": { @@ -15503,63 +9192,51 @@ } } }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - }, - "dependencies": { - "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 - } - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "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==", "dev": true }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "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==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "@types/json-schema": "^7.0.9", + "ajv": "^8.8.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.0.0" } }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "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": { - "has-flag": "^3.0.0" + "ansi-regex": "^6.0.1" } } } }, - "webpack-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", - "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - } - }, "webpack-merge": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz", - "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, "requires": { "clone-deep": "^4.0.1", @@ -15567,22 +9244,10 @@ } }, "webpack-sources": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz", - "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==", - "dev": true, - "requires": { - "source-list-map": "^2.0.1", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.2.tgz", + "integrity": "sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw==", + "dev": true }, "websocket-driver": { "version": "0.7.4", @@ -15607,27 +9272,21 @@ "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==" }, "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { "isexe": "^2.0.0" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, "widest-line": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", - "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", + "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", "dev": true, "requires": { - "string-width": "^2.1.1" + "string-width": "^4.0.0" } }, "wildcard": { @@ -15643,42 +9302,14 @@ "dev": true }, "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" } }, "wrappy": { @@ -15688,94 +9319,16 @@ "dev": true }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.3.0.tgz", + "integrity": "sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw==", "dev": true, - "requires": { - "async-limiter": "~1.0.0" - } - }, - "y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==", - "dev": true + "requires": {} }, "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - } - } - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true } } diff --git a/Samples/TypeScript/Demo/package.json b/Samples/TypeScript/Demo/package.json index 7bca07b..3a01832 100644 --- a/Samples/TypeScript/Demo/package.json +++ b/Samples/TypeScript/Demo/package.json @@ -11,19 +11,19 @@ "clean": "rimraf dist" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^4.16.1", - "@typescript-eslint/parser": "^4.16.1", - "eslint": "^7.21.0", - "eslint-config-prettier": "^8.1.0", - "eslint-plugin-prettier": "^3.3.1", - "prettier": "^2.2.1", + "@typescript-eslint/eslint-plugin": "^5.5.0", + "@typescript-eslint/parser": "^5.5.0", + "eslint": "^8.3.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-prettier": "^4.0.0", + "prettier": "^2.5.0", "rimraf": "^3.0.2", - "serve": "^11.3.2", - "ts-loader": "^8.0.17", - "typescript": "^4.2.2", - "webpack": "^5.24.3", - "webpack-cli": "^4.5.0", - "webpack-dev-server": "^3.11.2" + "serve": "^13.0.2", + "ts-loader": "^9.2.6", + "typescript": "^4.5.2", + "webpack": "^5.64.4", + "webpack-cli": "^4.9.1", + "webpack-dev-server": "^4.6.0" }, "dependencies": { "whatwg-fetch": "^3.6.2" diff --git a/Samples/TypeScript/Demo/src/lapplive2dmanager.ts b/Samples/TypeScript/Demo/src/lapplive2dmanager.ts index f6e21c0..946ee95 100644 --- a/Samples/TypeScript/Demo/src/lapplive2dmanager.ts +++ b/Samples/TypeScript/Demo/src/lapplive2dmanager.ts @@ -133,10 +133,10 @@ export class LAppLive2DManager { public onUpdate(): void { const { width, height } = canvas; - const projection: CubismMatrix44 = new CubismMatrix44(); const modelCount: number = this._models.getSize(); for (let i = 0; i < modelCount; ++i) { + const projection: CubismMatrix44 = new CubismMatrix44(); const model: LAppModel = this.getModel(i); if (model.getModel()) { diff --git a/Samples/TypeScript/Demo/src/lappmodel.ts b/Samples/TypeScript/Demo/src/lappmodel.ts index 5c7f84a..8724541 100644 --- a/Samples/TypeScript/Demo/src/lappmodel.ts +++ b/Samples/TypeScript/Demo/src/lappmodel.ts @@ -133,9 +133,8 @@ export class LAppModel extends CubismUserModel { for (let i = 0; i < count; i++) { const expressionName = this._modelSetting.getExpressionName(i); - const expressionFileName = this._modelSetting.getExpressionFileName( - i - ); + const expressionFileName = + this._modelSetting.getExpressionFileName(i); fetch(`${this._modelHomeDir}${expressionFileName}`) .then(response => response.arrayBuffer()) @@ -255,10 +254,10 @@ export class LAppModel extends CubismUserModel { CubismFramework.getIdManager().getId( CubismDefaultParameterId.ParamBreath ), - 0.0, + 0.5, 0.5, 3.2345, - 0.5 + 1 ) ); @@ -296,7 +295,8 @@ export class LAppModel extends CubismUserModel { // EyeBlinkIds const setupEyeBlinkIds = (): void => { - const eyeBlinkIdCount: number = this._modelSetting.getEyeBlinkParameterCount(); + const eyeBlinkIdCount: number = + this._modelSetting.getEyeBlinkParameterCount(); for (let i = 0; i < eyeBlinkIdCount; ++i) { this._eyeBlinkIds.pushBack( @@ -395,9 +395,8 @@ export class LAppModel extends CubismUserModel { } // WebGLのテクスチャユニットにテクスチャをロードする - let texturePath = this._modelSetting.getTextureFileName( - modelTextureNumber - ); + let texturePath = + this._modelSetting.getTextureFileName(modelTextureNumber); texturePath = this._modelHomeDir + texturePath; // ロード完了時に呼び出すコールバック関数 diff --git a/Samples/TypeScript/Demo/src/lappsprite.ts b/Samples/TypeScript/Demo/src/lappsprite.ts index 39e82b7..5d2af2c 100644 --- a/Samples/TypeScript/Demo/src/lappsprite.ts +++ b/Samples/TypeScript/Demo/src/lappsprite.ts @@ -104,14 +104,7 @@ export class LAppSprite { // uvバッファ、座標初期化 { this._uvArray = new Float32Array([ - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 1.0, - 1.0 + 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0 ]); // uvバッファを作成 diff --git a/Samples/TypeScript/Demo/src/lappwavfilehandler.ts b/Samples/TypeScript/Demo/src/lappwavfilehandler.ts index fcca346..319bc52 100644 --- a/Samples/TypeScript/Demo/src/lappwavfilehandler.ts +++ b/Samples/TypeScript/Demo/src/lappwavfilehandler.ts @@ -158,7 +158,8 @@ export class LAppWavFileHandler { throw new Error('File is not linear PCM.'); } // チャンネル数 - this._wavFileInfo._numberOfChannels = this._byteReader.get16LittleEndian(); + this._wavFileInfo._numberOfChannels = + this._byteReader.get16LittleEndian(); // サンプリングレート this._wavFileInfo._samplingRate = this._byteReader.get32LittleEndian(); // データ速度[byte/sec]（読み飛ばし） diff --git a/Samples/TypeScript/Demo/webpack.config.js b/Samples/TypeScript/Demo/webpack.config.js index 406c4f9..7082a14 100644 --- a/Samples/TypeScript/Demo/webpack.config.js +++ b/Samples/TypeScript/Demo/webpack.config.js @@ -26,15 +26,20 @@ module.exports = { ] }, devServer: { - contentBase: path.resolve(__dirname, '../../..'), - watchContentBase: true, - inline: true, + static: [ + { + directory: path.resolve(__dirname, '../../..'), + serveIndex: true, + watch: true, + } + ], hot: true, port: 5000, host: '0.0.0.0', compress: true, - useLocalIp: true, - writeToDisk: true + devMiddleware: { + writeToDisk: true, + }, }, devtool: 'inline-source-map' }