diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml index 44bc247b..5176b64d 100644 --- a/.github/workflows/check-format.yml +++ b/.github/workflows/check-format.yml @@ -1,5 +1,8 @@ name: Check Code Format -on: pull_request +on: + pull_request: + paths-ignore: + - "website/**" jobs: check: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 00000000..2a523a93 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,71 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ develop, main ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ develop ] + schedule: + - cron: '16 22 * * 3' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'csharp', 'javascript' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/deploy-document.yml b/.github/workflows/deploy-document.yml index b22a1d02..9cf8313c 100644 --- a/.github/workflows/deploy-document.yml +++ b/.github/workflows/deploy-document.yml @@ -2,6 +2,7 @@ name: Deploy on: push: + branches: [develop] paths: - "website/**" diff --git a/.github/workflows/dotnet-grasshopper.yml b/.github/workflows/dotnet-grasshopper.yml index c0b610e8..11c28f92 100644 --- a/.github/workflows/dotnet-grasshopper.yml +++ b/.github/workflows/dotnet-grasshopper.yml @@ -7,14 +7,16 @@ on: - "website/**" pull_request: branches: [main, develop] - + paths-ignore: + - "website/**" + jobs: build: strategy: matrix: configuration: [Debug, Release] - runs-on: windows-latest # For a list of available runner types, refer to + runs-on: windows-latest # For a list of available runner types, refer to env: Solution_Name: HoaryFox.sln @@ -43,22 +45,23 @@ jobs: run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration env: Configuration: ${{ matrix.configuration }} - - - name: Copy karambaConnect to /HoaryFox/bin dir + + - name: Copy karambaConnect and samples to /HoaryFox/bin dir + if: ${{ matrix.configuration == 'Release' }} # Only upload gha from a release build shell: powershell run: | - cp ./KarambaConnect/bin/KarambaConnect.gha ./HoaryFox/bin/KarambaConnect.gha - cp ./KarambaConnect/bin/STBDotNet.dll ./HoaryFox/bin/STBDotNet.dll - + cp ./KarambaConnect/bin/Release/net48/KarambaConnect.gha ./HoaryFox/bin/Release/net48/KarambaConnect.gha + cp ./Samples ./HoaryFox/bin/Release/net48/Samples -recurse + cp ./LICENSE ./HoaryFox/bin/Release/net48/LICENSE + - name: Upload release build of plugin as artefact if: ${{ matrix.configuration == 'Release' }} # Only upload gha from a release build uses: actions/upload-artifact@v2 with: name: HoaryFox path: | - ./HoaryFox/bin/HoaryFox.gha - ./HoaryFox/bin/KarambaConnect.gha - ./HoaryFox/bin/STBReader.dll - ./HoaryFox/bin/STBDotNet.dll - - + ./HoaryFox/bin/Release/net48/HoaryFox.gha + ./HoaryFox/bin/Release/net48/KarambaConnect.gha + ./HoaryFox/bin/Release/net48/STBDotNet.dll + ./HoaryFox/bin/Release/net48/Samples/ + ./HoaryFox/bin/Release/net48/LICENSE diff --git a/.github/workflows/test-build-document.yml b/.github/workflows/test-build-document.yml new file mode 100644 index 00000000..f7a42c2b --- /dev/null +++ b/.github/workflows/test-build-document.yml @@ -0,0 +1,19 @@ +name: test build document site + +on: + pull_request: + branches: [develop] + paths: + - "website/**" + +jobs: + deploy: + runs-on: ubuntu-18.04 + defaults: + run: + working-directory: website + + steps: + - uses: actions/checkout@v2 + - run: yarn install + - run: yarn build \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9e802910..3152d7b6 100644 --- a/.gitignore +++ b/.gitignore @@ -260,3 +260,14 @@ paket-files/ __pycache__/ *.pyc /StbData + +# vscode settings +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..bf07d24f --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,25 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + "program": "C:/Program Files/Rhino 6/System/Rhino.exe", + "args": [], + "cwd": "${workspaceFolder}", + "console": "internalConsole", + "stopAtEntry": true + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..d96f354e --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,42 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/HoaryFox/HoaryFox.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/HoaryFox/HoaryFox.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "${workspaceFolder}/HoaryFox/HoaryFox.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/HoaryFox/Component/Bar/Stb2Bar.cs b/HoaryFox/Component/Bar/Stb2Bar.cs deleted file mode 100644 index f6cb06d2..00000000 --- a/HoaryFox/Component/Bar/Stb2Bar.cs +++ /dev/null @@ -1,141 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using System.Xml.Linq; - -//using Grasshopper.Kernel; -//using HoaryFox.STB; -//using HoaryFox.Util; -//using Rhino.Geometry; - -//namespace HoaryFox.Component.Bar -//{ -// public class Stb2Bar:GH_Component -// { -// private string _path; -// public static readonly double LengthTolerance = GH_Component.DocumentTolerance(); -// public static readonly double AngleTolerance = GH_Component.DocumentAngleTolerance(); - -// private static StbNodes _nodes; -// private static StbColumns _columns; -// private static StbPosts _posts; -// private static StbGirders _girders; -// private static StbBeams _beams; - -// public static StbSecColRC SecColumnRc; -// public static StbSecBeamRC SecBeamRc; - -// private readonly List> _frameBreps = new List>(); - -// /// -// /// Each implementation of GH_Component must provide a public -// /// constructor without any arguments. -// /// Category represents the Tab in which the component will appear, -// /// Subcategory the panel. If you use non-existing tab or panel names, -// /// new tabs/panels will automatically be created. -// /// -// public Stb2Bar() -// : base("Stb to Bar", "S2B", "Read ST-Bridge file and display", "HoaryFox", "Bar") -// { -// } - -// public override void ClearData() -// { -// base.ClearData(); -// _frameBreps.Clear(); -// } - -// /// -// /// Registers all the input parameters for this component. -// /// -// protected override void RegisterInputParams(GH_InputParamManager pManager) -// { -// pManager.AddTextParameter("path", "path", "input ST-Bridge file path", GH_ParamAccess.item); -// } - -// /// -// /// Registers all the output parameters for this component. -// /// -// protected override void RegisterOutputParams(GH_OutputParamManager pManager) -// { -// pManager.AddBrepParameter("Columns", "Col", "output StbColumns to Bar", GH_ParamAccess.list); -// pManager.AddBrepParameter("Girders", "Gird", "output StbGirders to Bar", GH_ParamAccess.list); -// pManager.AddBrepParameter("Posts", "Pst", "output StbPosts to Bar", GH_ParamAccess.list); -// pManager.AddBrepParameter("Beams", "Bm", "output StbBeams to Bar", GH_ParamAccess.list); -// } - -// /// -// /// This is the method that actually does the work. -// /// -// /// The DA object can be used to retrieve data from input parameters and -// /// to store data in output parameters. -// protected override void SolveInstance(IGH_DataAccess DA) -// { -// // 対象の stb の pathを取得 -// if (!DA.GetData("path", ref _path)) { return; } -// var xDocument = XDocument.Load(_path); - -// Init(); -// Load(xDocument); - -// // meshの生成 -// MakeBar(); - -// for (var i = 0; i < 4; i++) -// { -// DA.SetDataList(i, _frameBreps[i]); -// } -// } - -// /// -// /// Provides an Icon for every component that will be visible in the User Interface. -// /// Icons need to be 24x24 pixels. -// /// -// protected override System.Drawing.Bitmap Icon => null; - -// /// -// /// Each component must have a unique Guid to identify it. -// /// It is vital this Guid doesn't change otherwise old ghx files -// /// that use the old ID will partially fail during loading. -// /// -// public override Guid ComponentGuid => new Guid("8C6A2977-EC3A-43D0-90B2-0B10EF2E124B"); - -// private static void Init() -// { -// _nodes = new StbNodes(); -// _columns = new StbColumns(); -// _posts = new StbPosts(); -// _girders = new StbGirders(); -// _beams = new StbBeams(); -// SecColumnRc = new StbSecColRC(); -// SecBeamRc = new StbSecBeamRC(); -// } - -// private static void Load(XDocument xDoc) -// { -// var members = new List() -// { -// _nodes, -// _columns, _posts, _girders, _beams, -// SecColumnRc, SecBeamRc -// }; - -// foreach (var member in members) -// { -// member.Load(xDoc); -// } -// } - -// private void MakeBar() -// { -// var stbFrames = new List() { -// _columns, _girders, _posts, _beams -// }; - -// var breps = new CreateBar(_nodes); - -// foreach (var frame in stbFrames) -// _frameBreps.Add(breps.Frame(frame)); -// } -// } -//} - diff --git a/HoaryFox/Component/Base/NameTagBase.cs b/HoaryFox/Component/Base/NameTagBase.cs deleted file mode 100644 index c8b9bbfb..00000000 --- a/HoaryFox/Component/Base/NameTagBase.cs +++ /dev/null @@ -1,95 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using Grasshopper.Kernel; -using Rhino.Geometry; -using STBReader; -using STBReader.Member; -using STBReader.Model; - -namespace HoaryFox.Component.Base -{ - public class NameTagBase : GH_Component - { - private StbData _stbData; - private int _size; - private readonly FrameType _frameType; - - private readonly List _frameName = new List(); - private readonly List _framePos = new List(); - - public override bool IsPreviewCapable => true; - - protected NameTagBase(string name, string nickname, string description, FrameType frameType) - : base(name, nickname, description, category: "HoaryFox", subCategory: "NameTag") - { - _frameType = frameType; - } - - public override void ClearData() - { - base.ClearData(); - _frameName.Clear(); - _framePos.Clear(); - } - - protected override void RegisterInputParams(GH_InputParamManager pManager) - { - pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); - pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); - } - - protected override void RegisterOutputParams(GH_OutputParamManager pManager) - { - pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.list); - } - - protected override void SolveInstance(IGH_DataAccess DA) - { - if (!DA.GetData("Data", ref _stbData)) { return; } - if (!DA.GetData("Size", ref _size)) { return; } - - StbNodes nodes = _stbData.Nodes; - StbFrame frame; - switch (_frameType) - { - case FrameType.Column: frame = _stbData.Columns; break; - case FrameType.Post: frame = _stbData.Posts; break; - case FrameType.Girder: frame = _stbData.Girders; break; - case FrameType.Beam: frame = _stbData.Beams; break; - case FrameType.Brace: frame = _stbData.Braces; break; - case FrameType.Slab: - case FrameType.Wall: - case FrameType.Any: - return; - default: - throw new ArgumentOutOfRangeException(); - } - - for (var i = 0; i < frame.Id.Count; i++) - { - int idNodeStart = nodes.Id.IndexOf(frame.IdNodeStart[i]); - int idNodeEnd = nodes.Id.IndexOf(frame.IdNodeEnd[i]); - _frameName.Add(frame.Name[i]); - _framePos.Add(new Point3d( - (nodes.X[idNodeStart] + nodes.X[idNodeEnd]) / 2.0, - (nodes.Y[idNodeStart] + nodes.Y[idNodeEnd]) / 2.0, - (nodes.Z[idNodeStart] + nodes.Z[idNodeEnd]) / 2.0) - ); - } - - DA.SetDataList(0, _frameName); - } - - public override void DrawViewportWires(IGH_PreviewArgs args) - { - for (var i = 0; i < _frameName.Count; i++) - { - args.Display.Draw2dText(_frameName[i], Color.Black, _framePos[i], true, _size); - } - } - - protected override Bitmap Icon => null; - public override Guid ComponentGuid => new Guid("758DE991-F652-4EDC-BC63-2A454BA43FB0"); - } -} diff --git a/HoaryFox/Component/Base/SecTagBase.cs b/HoaryFox/Component/Base/SecTagBase.cs deleted file mode 100644 index 224e71b5..00000000 --- a/HoaryFox/Component/Base/SecTagBase.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using Grasshopper.Kernel; -using Grasshopper.Kernel.Data; -using Grasshopper.Kernel.Types; -using HoaryFox.Member; -using Rhino.Geometry; -using STBReader; -using STBReader.Member; - -namespace HoaryFox.Component.Base -{ - public class SecTagBase : GH_Component - { - private StbData _stbData; - private int _size; - private readonly FrameType _frameType; - - private GH_Structure _frameTags = new GH_Structure(); - private List _tagPos = new List(); - - protected SecTagBase(string name, string nickname, string description, FrameType frameType) - : base(name, nickname, description, category: "HoaryFox", subCategory: "SectionTag") - { - _frameType = frameType; - } - - public override void ClearData() - { - base.ClearData(); - _frameTags.Clear(); - _tagPos.Clear(); - } - - public override bool IsPreviewCapable => true; - - protected override void RegisterInputParams(GH_InputParamManager pManager) - { - pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); - pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); - } - - protected override void RegisterOutputParams(GH_OutputParamManager pManager) - { - pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); - } - - protected override void SolveInstance(IGH_DataAccess DA) - { - if (!DA.GetData("Data", ref _stbData)) { return; } - if (!DA.GetData("Size", ref _size)) { return; } - - StbFrame frame; - switch (_frameType) - { - case FrameType.Column: frame = _stbData.Columns; break; - case FrameType.Post: frame = _stbData.Posts; break; - case FrameType.Girder: frame = _stbData.Girders; break; - case FrameType.Beam: frame = _stbData.Beams; break; - case FrameType.Brace: frame = _stbData.Braces; break; - case FrameType.Slab: - case FrameType.Wall: - case FrameType.Any: - return; - default: - throw new ArgumentOutOfRangeException(); - } - GetTag(frame); - - DA.SetDataTree(0, _frameTags); - } - - public override void DrawViewportWires(IGH_PreviewArgs args) - { - if (_frameTags.DataCount == 0) - { - return; - } - - for (var i = 0; i < _frameTags.PathCount; i++) - { - List tags = _frameTags.Branches[i]; - string tag = tags[0].ToString() + "\n" + tags[1].ToString() + "\n" + tags[2].ToString() + "\n" + - tags[3].ToString() + "\n" + tags[4].ToString() + "\n" + tags[5].ToString(); - args.Display.Draw2dText(tag, Color.Black, _tagPos[i], false, _size); - } - } - - protected override Bitmap Icon => null; - public override Guid ComponentGuid => new Guid("6300E95D-38AF-47A6-B792-E4680FE37F49"); - - private void GetTag(StbFrame stbFrame) - { - var tags = new CreateTag(_stbData.Nodes, _stbData.SecColumnRc, _stbData.SecColumnS, _stbData.SecBeamRc, _stbData.SecBeamS, _stbData.SecBraceS, _stbData.SecSteel); - _frameTags = tags.FrameGHStructure(stbFrame); - _tagPos = tags.Position; - } - } -} diff --git a/HoaryFox/Component/Geometry/Axes.cs b/HoaryFox/Component/Geometry/Axes.cs new file mode 100644 index 00000000..d94556c9 --- /dev/null +++ b/HoaryFox/Component/Geometry/Axes.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using Grasshopper.Kernel; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Geometry +{ + public class Axis : GH_Component + { + private ST_BRIDGE _stBridge; + private int _size; + private double _factor; + private readonly List _axisLines = new List(); + private readonly List _axisPts = new List(); + private readonly List _axisStr = new List(); + private readonly List _storyPts = new List(); + private readonly List _storyStr = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.secondary; + + public Axis() + : base("Axis", "Axis", + "Description", + "HoaryFox", "Geometry") + { + } + + public override void ClearData() + { + base.ClearData(); + _axisLines.Clear(); + _axisPts.Clear(); + _axisStr.Clear(); + _storyPts.Clear(); + _storyStr.Clear(); + } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge Data", GH_ParamAccess.item); + pManager.AddNumberParameter("Factor", "F", "Axis length factor", GH_ParamAccess.item, 1.2); + pManager.AddIntegerParameter("Size", "S", "Axis tag", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddLineParameter("Axis", "Ax", "output StbAxes to Line", GH_ParamAccess.list); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData(0, ref _stBridge)) { return; } + if (!dataAccess.GetData(1, ref _factor)) { return; } + if (!dataAccess.GetData(2, ref _size)) { return; } + + StbAxes axis = _stBridge.StbModel.StbAxes; + StbParallelAxes[] parallels = axis.StbParallelAxes; + StbStory[] stories = _stBridge.StbModel.StbStories; + double length = GetMaxLength(_stBridge.StbModel.StbNodes); + + StbParallelAxesToLine(_factor, parallels, stories, length); + + dataAccess.SetDataList(0, _axisLines); + } + + private void StbParallelAxesToLine(double factor, StbParallelAxes[] parallels, IEnumerable stories, double length) + { + var isFirst = true; + foreach (StbStory story in stories) + { + double height = story.height; + _storyStr.Add(story.name); + _storyPts.Add(new Point3d(0, 0, height)); + CreateEachAxis(factor, parallels, length, isFirst, height); + + isFirst = false; + } + } + + private void CreateEachAxis(double factor, StbParallelAxes[] parallels, double length, bool isFirst, double height) + { + foreach (StbParallelAxes parallel in parallels) + { + var basePt = new Point3d(parallel.X, parallel.Y, height); + Vector3d axisVec = Vector3d.XAxis * length; + axisVec.Rotate(parallel.angle * Math.PI / 180, -Vector3d.ZAxis); + Vector3d distanceVec = Vector3d.YAxis; + distanceVec.Rotate(parallel.angle * Math.PI / 180, Vector3d.ZAxis); + + foreach (StbParallelAxis pAxis in parallel.StbParallelAxis) + { + _axisLines.Add(new Line( + basePt - (axisVec * (factor - 1)) + (distanceVec * pAxis.distance), + basePt + (axisVec * factor) + (distanceVec * pAxis.distance) + )); + _axisPts.Add(basePt - (axisVec * (factor - 1)) + (distanceVec * pAxis.distance)); + _axisStr.Add(isFirst ? pAxis.name : string.Empty); + } + } + } + + private static double GetMaxLength(StbNode[] stbNodes) + { + IEnumerable xList = stbNodes.Select(n => n.X); + IEnumerable yList = stbNodes.Select(n => n.Y); + + return Math.Sqrt(Math.Pow(xList.Max() - xList.Min(), 2) + Math.Pow(yList.Max() - yList.Min(), 2)); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _axisLines.Count; i++) + { + args.Display.Draw2dText(_axisStr[i], Color.Black, _axisPts[i], true, _size); + args.Display.DrawPatternedLine(_axisLines[i], Color.Black, 0x0000AFAF, 1); + } + + double xMin = _axisPts.Min(pt => pt.X); + double yMin = _axisPts.Min(pt => pt.Y); + var vec = new Vector3d(xMin, yMin, 0); + double length = _axisLines.Max(line => line.Length); + + for (var i = 1; i < _storyPts.Count; i++) + { + args.Display.DrawLine(new Line(_storyPts[i - 1] + vec, _storyPts[i] + vec), Color.Black); + } + + for (var i = 0; i < _storyPts.Count; i++) + { + args.Display.Draw2dText(_storyStr[i], Color.Black, _storyPts[i] + vec, true, _size); + args.Display.DrawLine(new Line(_storyPts[i] + vec, _storyPts[i] + vec + length * Vector3d.XAxis), Color.Black); + args.Display.DrawLine(new Line(_storyPts[i] + vec, _storyPts[i] + vec + length * Vector3d.YAxis), Color.Black); + } + } + + protected override Bitmap Icon => Resource.Axis; + + public override Guid ComponentGuid => new Guid("98315013-7bb3-4ad9-8b69-ad1457ebe0b7"); + } +} diff --git a/HoaryFox/Component/Geometry/Stb2Brep.cs b/HoaryFox/Component/Geometry/Stb2Brep.cs index 0709774f..fcdbc6f6 100644 --- a/HoaryFox/Component/Geometry/Stb2Brep.cs +++ b/HoaryFox/Component/Geometry/Stb2Brep.cs @@ -3,31 +3,34 @@ using System.Drawing; using System.Linq; using Grasshopper.Kernel; -using HoaryFox.Member; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils.Geometry; using HoaryFox.Properties; using Rhino; using Rhino.DocObjects; using Rhino.Geometry; -using STBReader; -using STBReader.Member; +using STBDotNet.v202; namespace HoaryFox.Component.Geometry { public class Stb2Brep : GH_Component { - private StbData _stbData; + private ST_BRIDGE _stBridge; + private readonly GH_Structure[] _brepList = new GH_Structure[7]; - private readonly List> _geometryBreps = new List>(); + public override GH_Exposure Exposure => GH_Exposure.primary; public Stb2Brep() - : base("Stb to Brep", "S2B", "Read ST-Bridge file and display", "HoaryFox", "Geometry") + : base("Stb to Brep", "S2B", + "Display ST-Bridge model in Brep", + "HoaryFox", "Geometry") { } public override void ClearData() { base.ClearData(); - _geometryBreps.Clear(); } protected override void RegisterInputParams(GH_InputParamManager pManager) @@ -38,92 +41,83 @@ protected override void RegisterInputParams(GH_InputParamManager pManager) protected override void RegisterOutputParams(GH_OutputParamManager pManager) { - pManager.AddBrepParameter("Columns", "Col", "output StbColumns to Brep", GH_ParamAccess.list); - pManager.AddBrepParameter("Girders", "Gird", "output StbGirders to Brep", GH_ParamAccess.list); - pManager.AddBrepParameter("Posts", "Pst", "output StbPosts to Brep", GH_ParamAccess.list); - pManager.AddBrepParameter("Beams", "Bm", "output StbBeams to Brep", GH_ParamAccess.list); - pManager.AddBrepParameter("Braces", "Brc", "output StbBraces to Brep", GH_ParamAccess.list); - pManager.AddBrepParameter("Slabs", "Slb", "output StbSlabs to Brep", GH_ParamAccess.list); - pManager.AddBrepParameter("Walls", "Wl", "output StbWalls to Brep", GH_ParamAccess.list); + pManager.AddBrepParameter("Columns", "Col", "output StbColumns to Brep", GH_ParamAccess.tree); + pManager.AddBrepParameter("Girders", "Gird", "output StbGirders to Brep", GH_ParamAccess.tree); + pManager.AddBrepParameter("Posts", "Pst", "output StbPosts to Brep", GH_ParamAccess.tree); + pManager.AddBrepParameter("Beams", "Bm", "output StbBeams to Brep", GH_ParamAccess.tree); + pManager.AddBrepParameter("Braces", "Brc", "output StbBraces to Brep", GH_ParamAccess.tree); + pManager.AddBrepParameter("Slabs", "Slb", "output StbSlabs to Brep", GH_ParamAccess.tree); + pManager.AddBrepParameter("Walls", "Wl", "output StbWalls to Brep", GH_ParamAccess.tree); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var isBake = false; - if (!DA.GetData("Data", ref _stbData)) { return; } - if (!DA.GetData("Bake", ref isBake)) { return; } - this.MakeBrep(isBake); + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Bake", ref isBake)) { return; } + + CreateBrep(); + if (isBake) + { + BakeBrep(); + } for (var i = 0; i < 7; i++) { - DA.SetDataList(i, _geometryBreps[i]); + dataAccess.SetDataTree(i, _brepList[i]); } } protected override Bitmap Icon => Resource.Brep; - public override Guid ComponentGuid => new Guid("7d2f0c4e-4888-4607-8548-592104f6f06f"); + public override Guid ComponentGuid => new Guid("B2D5EA7F-E75F-406B-8D22-C267B43C5E72"); - private void MakeBrep(bool isBake) + private void CreateBrep() { - var stbFrames = new List - { - _stbData.Columns, _stbData.Girders, _stbData.Posts, _stbData.Beams, _stbData.Braces - }; - var breps = new FrameBreps(_stbData); - - foreach (StbFrame frame in stbFrames) - { - _geometryBreps.Add(breps.Frame(frame)); - } - _geometryBreps.Add(breps.Slab(_stbData.Slabs)); - _geometryBreps.Add(breps.Wall(_stbData.Walls)); - - if (isBake) - { - this.BakeBreps(stbFrames); - } + StbMembers member = _stBridge.StbModel.StbMembers; + var brepFromStb = new CreateMemberBrepListFromStb(_stBridge.StbModel.StbSections, _stBridge.StbModel.StbNodes, new[] { DocumentTolerance(), DocumentAngleTolerance() }); + _brepList[0] = brepFromStb.Column(member.StbColumns); + _brepList[1] = brepFromStb.Girder(member.StbGirders); + _brepList[2] = brepFromStb.Post(member.StbPosts); + _brepList[3] = brepFromStb.Beam(member.StbBeams); + _brepList[4] = brepFromStb.Brace(member.StbBraces); + _brepList[5] = brepFromStb.Slab(member.StbSlabs); + _brepList[6] = brepFromStb.Wall(member.StbWalls); } - private void BakeBreps(IEnumerable stbFrames) + private void BakeBrep() { RhinoDoc activeDoc = RhinoDoc.ActiveDoc; var parentLayerNames = new[] { "Column", "Girder", "Post", "Beam", "Brace", "Slab", "Wall" }; Color[] layerColors = { Color.Red, Color.Green, Color.Aquamarine, Color.LightCoral, Color.MediumPurple, Color.DarkGray, Color.CornflowerBlue }; - Misc.MakeParentLayers(activeDoc, parentLayerNames, layerColors); + GeometryBaker.MakeParentLayers(activeDoc, parentLayerNames, layerColors); - //TODO: このネストは直す - List>> tagList = stbFrames.Select(stbFrame => Misc.GetTag(_stbData, stbFrame)).ToList(); + Dictionary[][] infoArray = Utils.TagUtils.GetAllSectionInfoArray(_stBridge.StbModel.StbMembers, _stBridge.StbModel.StbSections); - foreach ((List frameBreps, int index) in _geometryBreps.Select((frameBrep, index) => (frameBrep, index))) + foreach ((GH_Structure breps, int i) in _brepList.Select((frameBrep, index) => (frameBrep, index))) { - Layer parentLayer = activeDoc.Layers.FindName(parentLayerNames[index]); - int parentIndex = parentLayer.Index; + Layer parentLayer = activeDoc.Layers.FindName(parentLayerNames[i]); Guid parentId = parentLayer.Id; - - foreach ((Brep brep, int bIndex) in frameBreps.Select((brep, bIndex) => (brep, bIndex))) + foreach ((Brep brep, int bIndex) in breps.Select((brep, bIndex) => (brep.Value, bIndex))) { var objAttr = new ObjectAttributes(); - objAttr.SetUserString("Type", parentLayerNames[index]); - if (index < 5) + Dictionary[] infos = infoArray[i]; + Dictionary info = infos[bIndex]; + + foreach (KeyValuePair pair in info) { - List> tags = tagList[index]; - List tag = tags[bIndex]; - Misc.SetFrameUserString(ref objAttr, tag); - - var layer = new Layer { Name = tag[0], ParentLayerId = parentId, Color = layerColors[index] }; - int layerIndex = activeDoc.Layers.Add(layer); - if (layerIndex == -1) - { - layer = activeDoc.Layers.FindName(tag[0]); - layerIndex = layer.Index; - } - objAttr.LayerIndex = layerIndex; + objAttr.SetUserString(pair.Key, pair.Value); } - else + + var layer = new Layer { Name = info["name"], ParentLayerId = parentId, Color = layerColors[i] }; + int layerIndex = activeDoc.Layers.Add(layer); + if (layerIndex == -1) { - objAttr.LayerIndex = parentIndex; + layer = activeDoc.Layers.FindName(info["name"]); + layerIndex = layer.Index; } + objAttr.LayerIndex = layerIndex; + activeDoc.Objects.AddBrep(brep, objAttr); } } diff --git a/HoaryFox/Component/Geometry/Stb2Line.cs b/HoaryFox/Component/Geometry/Stb2Line.cs index 7550f894..37ee7279 100644 --- a/HoaryFox/Component/Geometry/Stb2Line.cs +++ b/HoaryFox/Component/Geometry/Stb2Line.cs @@ -3,31 +3,30 @@ using System.Drawing; using System.Linq; using Grasshopper.Kernel; -using HoaryFox.Member; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils.Geometry; +using HoaryFox.Properties; using Rhino; using Rhino.DocObjects; using Rhino.Geometry; -using STBReader; -using STBReader.Member; - +using STBDotNet.v202; namespace HoaryFox.Component.Geometry { public class Stb2Line : GH_Component { - private StbData _stbData; + private ST_BRIDGE _stBridge; private List _nodes = new List(); - private readonly List> _lineList = new List>(); + private readonly GH_Structure[] _lineList = new GH_Structure[5]; - public Stb2Line() - : base(name: "Stb to Line", nickname: "S2L", description: "Read ST-Bridge file and display", category: "HoaryFox", subCategory: "Geometry") - { - } + public override GH_Exposure Exposure => GH_Exposure.primary; - public override void ClearData() + public Stb2Line() + : base("Stb to Line", "S2L", + "Display ST-Bridge model in line", + "HoaryFox", "Geometry") { - base.ClearData(); - _lineList.Clear(); } protected override void RegisterInputParams(GH_InputParamManager pManager) @@ -39,76 +38,65 @@ protected override void RegisterInputParams(GH_InputParamManager pManager) protected override void RegisterOutputParams(GH_OutputParamManager pManager) { pManager.AddPointParameter("Nodes", "pt", "output StbNodes to point3d", GH_ParamAccess.list); - pManager.AddLineParameter("Columns", "Col", "output StbColumns to Line", GH_ParamAccess.list); - pManager.AddLineParameter("Girders", "Gird", "output StbGirders to Line", GH_ParamAccess.list); - pManager.AddLineParameter("Posts", "Pst", "output StbPosts to Line", GH_ParamAccess.list); - pManager.AddLineParameter("Beams", "Beam", "output StbBeams to Line", GH_ParamAccess.list); - pManager.AddLineParameter("Braces", "Brc", "output StbBraces to Line", GH_ParamAccess.list); + pManager.AddLineParameter("Columns", "Col", "output StbColumns to Line", GH_ParamAccess.tree); + pManager.AddLineParameter("Girders", "Gird", "output StbGirders to Line", GH_ParamAccess.tree); + pManager.AddLineParameter("Posts", "Pst", "output StbPosts to Line", GH_ParamAccess.tree); + pManager.AddLineParameter("Beams", "Beam", "output StbBeams to Line", GH_ParamAccess.tree); + pManager.AddLineParameter("Braces", "Brc", "output StbBraces to Line", GH_ParamAccess.tree); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var isBake = false; - if (!DA.GetData("Data", ref _stbData)) { return; } - if (!DA.GetData("Bake", ref isBake)) { return; } + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Bake", ref isBake)) { return; } - MakeLine(isBake); - DA.SetDataList(0, _nodes); - foreach ((List geometry, int i) in _lineList.Select((geo, index) => (geo, index + 1))) + CreateLine(); + if (isBake) { - DA.SetDataList(i, geometry); + BakeLine(); } - } - - private void MakeLine(bool isBake) - { - var createLines = new FrameLines(_stbData); - _nodes = createLines.Nodes(); - _lineList.Add(createLines.Columns()); - _lineList.Add(createLines.Girders()); - _lineList.Add(createLines.Posts()); - _lineList.Add(createLines.Beams()); - _lineList.Add(createLines.Braces()); - if (isBake) + dataAccess.SetDataList(0, _nodes); + foreach ((GH_Structure geometry, int i) in _lineList.Select((geo, index) => (geo, index + 1))) { - this.BakeLines(); + dataAccess.SetDataTree(i, geometry); } } - private void BakeLines() + private void BakeLine() { RhinoDoc activeDoc = RhinoDoc.ActiveDoc; - var parentLayerNames = new[] { "Column", "Girder", "Post", "Beam", "Brace", "Slab", "Wall" }; Color[] layerColors = { Color.Red, Color.Green, Color.Aquamarine, Color.LightCoral, Color.MediumPurple, Color.DarkGray, Color.CornflowerBlue }; - Misc.MakeParentLayers(activeDoc, parentLayerNames, layerColors); - var stbFrames = new List { _stbData.Columns, _stbData.Girders, _stbData.Posts, _stbData.Beams, _stbData.Braces }; + GeometryBaker.MakeParentLayers(activeDoc, parentLayerNames, layerColors); - //TODO: このネストは直す - List>> tagList = stbFrames.Select(stbFrame => Misc.GetTag(_stbData, stbFrame)).ToList(); + Dictionary[][] infoArray = Utils.TagUtils.GetAllSectionInfoArray(_stBridge.StbModel.StbMembers, _stBridge.StbModel.StbSections); - foreach ((List lines, int index) in _lineList.Select((frameBrep, index) => (frameBrep, index))) + foreach ((GH_Structure lines, int i) in _lineList.Select((frameBrep, index) => (frameBrep, index))) { - Layer parentLayer = activeDoc.Layers.FindName(parentLayerNames[index]); + Layer parentLayer = activeDoc.Layers.FindName(parentLayerNames[i]); int parentIndex = parentLayer.Index; Guid parentId = parentLayer.Id; - foreach ((Line line, int bIndex) in lines.Select((brep, bIndex) => (brep, bIndex))) + foreach ((Line line, int bIndex) in lines.Select((geometry, bIndex) => (geometry.Value, bIndex))) { var objAttr = new ObjectAttributes(); - objAttr.SetUserString("Type", parentLayerNames[index]); - if (index < 5) + if (i < 5) { - List> tags = tagList[index]; - List tag = tags[bIndex]; - Misc.SetFrameUserString(ref objAttr, tag); + Dictionary[] infos = infoArray[i]; + Dictionary info = infos[bIndex]; + + foreach (KeyValuePair pair in info) + { + objAttr.SetUserString(pair.Key, pair.Value); + } - var layer = new Layer { Name = tag[0], ParentLayerId = parentId, Color = layerColors[index] }; + var layer = new Layer { Name = info["name"], ParentLayerId = parentId, Color = layerColors[i] }; int layerIndex = activeDoc.Layers.Add(layer); if (layerIndex == -1) { - layer = activeDoc.Layers.FindName(tag[0]); + layer = activeDoc.Layers.FindName(info["name"]); layerIndex = layer.Index; } objAttr.LayerIndex = layerIndex; @@ -123,7 +111,18 @@ private void BakeLines() } } - protected override Bitmap Icon => Properties.Resource.Line; - public override Guid ComponentGuid => new Guid("7d2f0c4e-4888-4607-8548-592104f6f06d"); + private void CreateLine() + { + var createLines = new CreateLineFromStb(_stBridge); + _nodes = createLines.Nodes(); + _lineList[0] = createLines.Columns(); + _lineList[1] = createLines.Girders(); + _lineList[2] = createLines.Posts(); + _lineList[3] = createLines.Beams(); + _lineList[4] = createLines.Braces(); + } + + protected override Bitmap Icon => Resource.Line; + public override Guid ComponentGuid => new Guid("D1E6793B-F75C-4AEE-9A9F-B9DD08D6EB77"); } } diff --git a/HoaryFox/Component/IO/StbLoader.cs b/HoaryFox/Component/IO/StbLoader.cs index 27ffe4be..aeb0d718 100644 --- a/HoaryFox/Component/IO/StbLoader.cs +++ b/HoaryFox/Component/IO/StbLoader.cs @@ -1,42 +1,41 @@ using System; using Grasshopper.Kernel; -using STBReader; +using STBDotNet.v202; namespace HoaryFox.Component.IO { public class StbLoader : GH_Component { private string _path; - private readonly double _lengthTolerance = DocumentTolerance(); - private readonly double _angleTolerance = DocumentAngleTolerance(); public override GH_Exposure Exposure => GH_Exposure.primary; public StbLoader() - : base("Load STB file", "Loader", "Read ST-Bridge file and display", "HoaryFox", "IO") + : base("Load STB file", "Loader", + "Read ST-Bridge file", + "HoaryFox", "IO") { } - protected override void RegisterInputParams(GH_InputParamManager pManager) + protected override void RegisterInputParams(GH_Component.GH_InputParamManager pManager) { pManager.AddTextParameter("path", "path", "input ST-Bridge file path", GH_ParamAccess.item); } - protected override void RegisterOutputParams(GH_OutputParamManager pManager) + protected override void RegisterOutputParams(GH_Component.GH_OutputParamManager pManager) { pManager.AddGenericParameter("Data", "D", "output StbData", GH_ParamAccess.item); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { - // 対象の stb の pathを取得 - if (!DA.GetData("path", ref _path)) { return; } + // 対象の stb の path を取得 + if (!dataAccess.GetData("path", ref _path)) { return; } - var stbData = new StbData(_path, _lengthTolerance, _angleTolerance); - - DA.SetData(0, stbData); + var stbData = (ST_BRIDGE)STBDotNet.Serialization.Serializer.Deserialize(_path); + dataAccess.SetData(0, stbData); } protected override System.Drawing.Bitmap Icon => Properties.Resource.LoadStb; - public override Guid ComponentGuid => new Guid("B8B7631C-BCAE-4549-95F7-1954D4781D24"); + public override Guid ComponentGuid => new Guid("C1E1CD82-9AC0-479C-A22F-DB7C44F3C77D"); } } diff --git a/HoaryFox/Component/Tag/Name/BeamNameTag.cs b/HoaryFox/Component/Tag/Name/BeamNameTag.cs index 5dd23918..b7fdb77b 100644 --- a/HoaryFox/Component/Tag/Name/BeamNameTag.cs +++ b/HoaryFox/Component/Tag/Name/BeamNameTag.cs @@ -1,17 +1,80 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Name { - public class BeamNameTag : NameTagBase + public class BeamNameTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + + private readonly GH_Structure _frameName = new GH_Structure(); + private readonly List _framePos = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.secondary; + public BeamNameTag() - : base(name: "Beam Name Tag", nickname: "BeamTag", description: "Display Beam Name Tag", frameType: FrameType.Beam) + : base("Beam Name Tag", "BeamTag", + "Display Beam Name Tag", + "HoaryFox", "NameTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameName.Clear(); + _framePos.Clear(); + } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + StbNode[] nodes = _stBridge.StbModel.StbNodes; + StbBeam[] beams = _stBridge.StbModel.StbMembers.StbBeams; + foreach ((StbBeam beam, int i) in beams.Select((beam, index) => (beam, index))) + { + _frameName.Append(new GH_String(beam.name), new GH_Path(0, i)); + + string idNodeStart = beam.id_node_start; + string idNodeEnd = beam.id_node_end; + _framePos.Add(TagUtils.GetFrameTagPosition(idNodeStart, idNodeEnd, nodes)); + } + dataAccess.SetDataTree(0, _frameName); } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _frameName.PathCount; i++) + { + args.Display.Draw2dText(_frameName.Branches[i][0].Value, Color.Black, _framePos[i], true, _size); + } + } + protected override Bitmap Icon => Properties.Resource.BeamName; - public override Guid ComponentGuid => new Guid("758DE991-F652-4EDC-BC63-2A454BA43FB1"); + + public override Guid ComponentGuid => new Guid("FDC62C6D-7C03-412D-8FF8-B76439197730"); } } diff --git a/HoaryFox/Component/Tag/Name/BraceNameTag.cs b/HoaryFox/Component/Tag/Name/BraceNameTag.cs index 27535364..483663c5 100644 --- a/HoaryFox/Component/Tag/Name/BraceNameTag.cs +++ b/HoaryFox/Component/Tag/Name/BraceNameTag.cs @@ -1,17 +1,80 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Name { - public class BraceNameTag : NameTagBase + public class BraceNameTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + + private readonly GH_Structure _frameName = new GH_Structure(); + private readonly List _framePos = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.tertiary; + public BraceNameTag() - : base(name: "Brace Name Tag", nickname: "BraceTag", description: "Display Brace Name Tag", frameType: FrameType.Brace) + : base("Brace Name Tag", "BraceTag", + "Display Brace Name Tag", + "HoaryFox", "NameTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameName.Clear(); + _framePos.Clear(); + } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + StbNode[] nodes = _stBridge.StbModel.StbNodes; + StbBrace[] braces = _stBridge.StbModel.StbMembers.StbBraces; + foreach ((StbBrace brace, int i) in braces.Select((brace, index) => (brace, index))) + { + _frameName.Append(new GH_String(brace.name), new GH_Path(0, i)); + + string idNodeStart = brace.id_node_start; + string idNodeEnd = brace.id_node_end; + _framePos.Add(TagUtils.GetFrameTagPosition(idNodeStart, idNodeEnd, nodes)); + } + dataAccess.SetDataTree(0, _frameName); } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _frameName.PathCount; i++) + { + args.Display.Draw2dText(_frameName.Branches[i][0].Value, Color.Black, _framePos[i], true, _size); + } + } + protected override Bitmap Icon => Properties.Resource.BraceName; - public override Guid ComponentGuid => new Guid("E566DDCB-4192-40B2-8E96-2083207CC5A8"); + + public override Guid ComponentGuid => new Guid("21F7885E-6321-4C0D-8974-BC40769AAEAE"); } } diff --git a/HoaryFox/Component/Tag/Name/ColumnNameTag.cs b/HoaryFox/Component/Tag/Name/ColumnNameTag.cs index c77d32e0..6770c20a 100644 --- a/HoaryFox/Component/Tag/Name/ColumnNameTag.cs +++ b/HoaryFox/Component/Tag/Name/ColumnNameTag.cs @@ -1,17 +1,79 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Name { - public class ColumnNameTag : NameTagBase + public class ColumnNameTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + + private readonly GH_Structure _frameName = new GH_Structure(); + private readonly List _framePos = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.primary; + public ColumnNameTag() - : base(name: "Column Name Tag", nickname: "ColumnTag", description: "Display Column Name Tag", frameType: FrameType.Column) + : base("Column Name Tag", "ColumnTag", + "Display Column Name Tag", + "HoaryFox", "NameTag") + { + } + + public override void ClearData() { + base.ClearData(); + _frameName.Clear(); + _framePos.Clear(); } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + StbNode[] nodes = _stBridge.StbModel.StbNodes; + StbColumn[] columns = _stBridge.StbModel.StbMembers.StbColumns; + foreach ((StbColumn column, int i) in columns.Select((column, index) => (column, index))) + { + _frameName.Append(new GH_String(column.name), new GH_Path(0, i)); + string idNodeStart = column.id_node_bottom; + string idNodeEnd = column.id_node_top; + _framePos.Add(TagUtils.GetFrameTagPosition(idNodeStart, idNodeEnd, nodes)); + } + dataAccess.SetDataTree(0, _frameName); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _frameName.PathCount; i++) + { + args.Display.Draw2dText(_frameName.Branches[i][0].Value, Color.Black, _framePos[i], true, _size); + } + } + protected override Bitmap Icon => Properties.Resource.ColumnName; - public override Guid ComponentGuid => new Guid("806B9DBE-0207-4E79-A1BE-DD0B37BA9B31"); + + public override Guid ComponentGuid => new Guid("AB439AE1-A56F-4764-BC36-F3752D30461A"); } } diff --git a/HoaryFox/Component/Tag/Name/GirderNameTag.cs b/HoaryFox/Component/Tag/Name/GirderNameTag.cs index 9904afa8..0d83da4f 100644 --- a/HoaryFox/Component/Tag/Name/GirderNameTag.cs +++ b/HoaryFox/Component/Tag/Name/GirderNameTag.cs @@ -1,17 +1,80 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Name { - public class GirderNameTag : NameTagBase + public class GirderNameTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + + private readonly GH_Structure _frameName = new GH_Structure(); + private readonly List _framePos = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.secondary; + public GirderNameTag() - : base(name: "Girder Name Tag", nickname: "GirderTag", description: "Display girder Name Tag ", frameType: FrameType.Girder) + : base("Girder Name Tag", "GirderTag", + "Display Girder Name Tag", + "HoaryFox", "NameTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameName.Clear(); + _framePos.Clear(); + } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + StbNode[] nodes = _stBridge.StbModel.StbNodes; + StbGirder[] girders = _stBridge.StbModel.StbMembers.StbGirders; + foreach ((StbGirder girder, int i) in girders.Select((girder, index) => (girder, index))) + { + _frameName.Append(new GH_String(girder.name), new GH_Path(0, i)); + + string idNodeStart = girder.id_node_start; + string idNodeEnd = girder.id_node_end; + _framePos.Add(TagUtils.GetFrameTagPosition(idNodeStart, idNodeEnd, nodes)); + } + dataAccess.SetDataTree(0, _frameName); } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _frameName.PathCount; i++) + { + args.Display.Draw2dText(_frameName.Branches[i][0].Value, Color.Black, _framePos[i], true, _size); + } + } + protected override Bitmap Icon => Properties.Resource.GirderName; - public override Guid ComponentGuid => new Guid("35D72484-2675-487E-A970-5DE885582312"); + + public override Guid ComponentGuid => new Guid("31664B98-E1F0-4635-A718-18C8FDE14A14"); } } diff --git a/HoaryFox/Component/Tag/Name/PostNameTag.cs b/HoaryFox/Component/Tag/Name/PostNameTag.cs index e6a3d097..45078822 100644 --- a/HoaryFox/Component/Tag/Name/PostNameTag.cs +++ b/HoaryFox/Component/Tag/Name/PostNameTag.cs @@ -1,17 +1,80 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Name { - public class PostNameTag : NameTagBase + public class PostNameTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + + private readonly GH_Structure _frameName = new GH_Structure(); + private readonly List _framePos = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.primary; + public PostNameTag() - : base(name: "Post Name Tag", nickname: "PostTag", description: "Display Post Name Tag", frameType: FrameType.Post) + : base("Post Name Tag", "PostTag", + "Display Post Name Tag", + "HoaryFox", "NameTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameName.Clear(); + _framePos.Clear(); + } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + StbNode[] nodes = _stBridge.StbModel.StbNodes; + StbPost[] posts = _stBridge.StbModel.StbMembers.StbPosts; + foreach ((StbPost post, int i) in posts.Select((post, index) => (post, index))) + { + _frameName.Append(new GH_String(post.name), new GH_Path(0, i)); + + string idNodeStart = post.id_node_bottom; + string idNodeEnd = post.id_node_top; + _framePos.Add(TagUtils.GetFrameTagPosition(idNodeStart, idNodeEnd, nodes)); + } + dataAccess.SetDataTree(0, _frameName); } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _frameName.PathCount; i++) + { + args.Display.Draw2dText(_frameName.Branches[i][0].Value, Color.Black, _framePos[i], true, _size); + } + } + protected override Bitmap Icon => Properties.Resource.PostName; - public override Guid ComponentGuid => new Guid("8FAC9887-B49F-4FC1-8B6B-7847FCE49339"); + + public override Guid ComponentGuid => new Guid("AD517629-4CD1-4109-B071-653D80DC6B70"); } } diff --git a/HoaryFox/Component/Tag/Name/SlabNameTag.cs b/HoaryFox/Component/Tag/Name/SlabNameTag.cs new file mode 100644 index 00000000..cdff54ef --- /dev/null +++ b/HoaryFox/Component/Tag/Name/SlabNameTag.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Tag.Name +{ + public class SlabNameTag : GH_Component + { + private ST_BRIDGE _stBridge; + private int _size; + + private readonly GH_Structure _plateName = new GH_Structure(); + private readonly List _platePos = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.quarternary; + + public SlabNameTag() + : base("Slab Name Tag", "SlabTag", + "Display Slab Name Tag", + "HoaryFox", "NameTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _plateName.Clear(); + _platePos.Clear(); + } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + StbNode[] nodes = _stBridge.StbModel.StbNodes; + StbSlab[] slabs = _stBridge.StbModel.StbMembers.StbSlabs; + foreach ((StbSlab slab, int i) in slabs.Select((slab, i) => (slab, i))) + { + _plateName.Append(new GH_String(slab.name), new GH_Path(0, i)); + StbSlabOffset[] offsets = slab.StbSlabOffsetList; + string[] nodeIds = slab.StbNodeIdOrder.Split(' '); + Point3d[] pts = SlabNodeToPoint3ds(nodeIds, nodes, offsets); + _platePos.Add(new Point3d(pts.Average(n => n.X), pts.Average(n => n.Y), pts.Average(n => n.Z))); + } + dataAccess.SetDataTree(0, _plateName); + } + + private static Point3d[] SlabNodeToPoint3ds(IReadOnlyList nodeIds, StbNode[] nodes, StbSlabOffset[] offsets) + { + var pts = new Point3d[nodeIds.Count]; + for (var i = 0; i < nodeIds.Count; i++) + { + string nodeId = nodeIds[i]; + StbNode node = nodes.First(n => n.id == nodeId); + var offsetVec = new Vector3d(); + if (offsets != null) + { + foreach (StbSlabOffset offset in offsets.Where(offset => nodeId == offset.id_node)) + { + offsetVec = new Vector3d(offset.offset_X, offset.offset_Y, offset.offset_Z); + } + } + + pts[i] = new Point3d(node.X, node.Y, node.Z) + offsetVec; + } + + return pts; + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _plateName.PathCount; i++) + { + args.Display.Draw2dText(_plateName.Branches[i][0].Value, Color.Black, _platePos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.SlabName; + + public override Guid ComponentGuid => new Guid("9ee6efbb-20b5-49bb-aae9-02ca6031c09d"); + } +} diff --git a/HoaryFox/Component/Tag/Name/WallNameTag.cs b/HoaryFox/Component/Tag/Name/WallNameTag.cs new file mode 100644 index 00000000..dfecd3b4 --- /dev/null +++ b/HoaryFox/Component/Tag/Name/WallNameTag.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Tag.Name +{ + public class WallNameTag : GH_Component + { + private ST_BRIDGE _stBridge; + private int _size; + + private readonly GH_Structure _plateName = new GH_Structure(); + private readonly List _platePos = new List(); + + public override bool IsPreviewCapable => true; + public override GH_Exposure Exposure => GH_Exposure.quarternary; + + public WallNameTag() + : base("Wall Name Tag", "WallTag", + "Display Wall Name Tag", + "HoaryFox", "NameTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _plateName.Clear(); + _platePos.Clear(); + } + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("NameTag", "NTag", "output name tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + StbNode[] nodes = _stBridge.StbModel.StbNodes; + StbWall[] walls = _stBridge.StbModel.StbMembers.StbWalls; + foreach ((StbWall wall, int i) in walls.Select((wall, index) => (wall, index))) + { + _plateName.Append(new GH_String(wall.name), new GH_Path(0, i)); + + Point3d[] pts = WallNodeToPoint3ds(nodes, wall.StbNodeIdOrder.Split(' ')); + _platePos.Add(new Point3d(pts.Average(n => n.X), pts.Average(n => n.Y), pts.Average(n => n.Z))); + } + dataAccess.SetDataTree(0, _plateName); + } + + private static Point3d[] WallNodeToPoint3ds(StbNode[] nodes, string[] nodeIds) + { + var pts = new Point3d[nodeIds.Length]; + for (int i = 0; i < nodeIds.Length; i++) + { + string nodeId = nodeIds[i]; + StbNode node = nodes.First(n => n.id == nodeId); + pts[i] = new Point3d(node.X, node.Y, node.Z); + } + + return pts; + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + for (var i = 0; i < _plateName.PathCount; i++) + { + args.Display.Draw2dText(_plateName.Branches[i][0].Value, Color.Black, _platePos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.WallName; + + public override Guid ComponentGuid => new Guid("713d1503-eebd-4504-83f0-ddd072a11188"); + } +} diff --git a/HoaryFox/Component/Tag/Section/BeamSecTag.cs b/HoaryFox/Component/Tag/Section/BeamSecTag.cs index 9595dc8d..3acd383a 100644 --- a/HoaryFox/Component/Tag/Section/BeamSecTag.cs +++ b/HoaryFox/Component/Tag/Section/BeamSecTag.cs @@ -1,17 +1,131 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Section { - public class BeamSecTag : SecTagBase + public class BeamSecTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + private GH_Structure _frameTags = new GH_Structure(); + private List _tagPos = new List(); + public override GH_Exposure Exposure => GH_Exposure.secondary; + public BeamSecTag() - : base(name: "Beam Section Tag", nickname: "BeamSec", description: "Display Beam Section Tag", frameType: FrameType.Beam) + : base("Beam Section Tag", "BeamSec", + "Display Beam Section Tag", + "HoaryFox", "SectionTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameTags.Clear(); + _tagPos.Clear(); + } + + public override bool IsPreviewCapable => true; + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + _frameTags = GetTagStrings(_stBridge.StbModel.StbMembers.StbBeams, _stBridge.StbModel.StbSections); + _tagPos = GetTagPosition(_stBridge.StbModel.StbMembers.StbBeams, _stBridge.StbModel.StbNodes); + + dataAccess.SetDataTree(0, _frameTags); + } + private static GH_Structure GetTagStrings(IEnumerable beams, StbSections sections) { + var ghSecStrings = new GH_Structure(); + + foreach (var item in beams.Select((beam, index) => new { beam, index })) + { + string secId = item.beam.id_section; + var ghPath = new GH_Path(0, item.index); + StbGirderKind_structure kindStruct = item.beam.kind_structure; + + switch (kindStruct) + { + case StbGirderKind_structure.RC: + StbSecBeam_RC secRc = sections.StbSecBeam_RC.First(i => i.id == secId); + foreach (object figureObj in secRc.StbSecFigureBeam_RC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamRcSection(figureObj, secRc.strength_concrete), ghPath); + } + break; + case StbGirderKind_structure.S: + StbSecBeam_S secS = sections.StbSecBeam_S.First(i => i.id == secId); + foreach (object figureObj in secS.StbSecSteelFigureBeam_S.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamSSection(figureObj), ghPath); + } + break; + case StbGirderKind_structure.SRC: + StbSecBeam_SRC secSrc = sections.StbSecBeam_SRC.First(i => i.id == secId); + foreach (object figureObj in secSrc.StbSecFigureBeam_SRC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamRcSection(figureObj, secSrc.strength_concrete), ghPath); + } + foreach (object figureObj in secSrc.StbSecSteelFigureBeam_SRC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamSSection(figureObj), ghPath); + } + break; + case StbGirderKind_structure.UNDEFINED: + break; + default: + throw new ArgumentOutOfRangeException(); + } + } + + return ghSecStrings; } - protected override Bitmap Icon => Properties.Resource.BeamSection; - public override Guid ComponentGuid => new Guid("6310E95D-38AF-47A6-B792-E4680FE37F49"); + + private static List GetTagPosition(IEnumerable beams, IEnumerable nodes) + { + return beams.Select(beam => TagUtils.GetFrameTagPosition(beam.id_node_start, beam.id_node_end, nodes)).ToList(); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + if (_frameTags.DataCount == 0) + { + return; + } + + for (var i = 0; i < _frameTags.PathCount; i++) + { + List tags = _frameTags.Branches[i]; + string tag = tags.Aggregate(string.Empty, (current, tagString) => current + (tagString + "\n")); + args.Display.Draw2dText(tag, Color.Black, _tagPos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.BeamSection; + public override Guid ComponentGuid => new Guid("73277668-972F-4E7B-821F-FC86C6868FF3"); + } } diff --git a/HoaryFox/Component/Tag/Section/BraceSecTag.cs b/HoaryFox/Component/Tag/Section/BraceSecTag.cs index 1dd8471e..88333ac1 100644 --- a/HoaryFox/Component/Tag/Section/BraceSecTag.cs +++ b/HoaryFox/Component/Tag/Section/BraceSecTag.cs @@ -1,17 +1,121 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Section { - public class BraceSecTag : SecTagBase + public class BraceSecTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + private GH_Structure _frameTags = new GH_Structure(); + private List _tagPos = new List(); + public override GH_Exposure Exposure => GH_Exposure.tertiary; + public BraceSecTag() - : base(name: "Brace Section Tag", nickname: "BraceSec", description: "Display Beam Section Tag", frameType: FrameType.Brace) + : base("Brace Section Tag", "BraceSec", + "Display Brace Section Tag", + "HoaryFox", "SectionTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameTags.Clear(); + _tagPos.Clear(); + } + + public override bool IsPreviewCapable => true; + + protected override void RegisterInputParams(GH_InputParamManager pManager) { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + _frameTags = GetTagStrings(_stBridge.StbModel.StbMembers.StbBraces, _stBridge.StbModel.StbSections); + _tagPos = GetTagPosition(_stBridge.StbModel.StbMembers.StbBraces, _stBridge.StbModel.StbNodes); + + dataAccess.SetDataTree(0, _frameTags); } - protected override Bitmap Icon => Properties.Resource.BraceSection; - public override Guid ComponentGuid => new Guid("DE9D56D2-C82C-4AB1-96FF-D1253B420A43"); + private static GH_Structure GetTagStrings(IEnumerable braces, StbSections sections) + { + var ghSecStrings = new GH_Structure(); + + if (braces == null) + { + return ghSecStrings; + } + + foreach (var item in braces.Select((brace, index) => new { brace, index })) + { + string secId = item.brace.id_section; + var ghPath = new GH_Path(0, item.index); + StbBraceKind_structure kindStruct = item.brace.kind_structure; + + switch (kindStruct) + { + case StbBraceKind_structure.S: + StbSecBrace_S secS = sections.StbSecBrace_S.First(i => i.id == secId); + foreach (object figureObj in secS.StbSecSteelFigureBrace_S.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBraceSSection(figureObj), ghPath); + } + break; + case StbBraceKind_structure.RC: + case StbBraceKind_structure.SRC: + throw new ArgumentException("Unsupported section type."); + default: + throw new ArgumentOutOfRangeException(); + } + } + + return ghSecStrings; + } + + private static List GetTagPosition(IEnumerable braces, IEnumerable nodes) + { + return braces == null + ? new List() + : braces.Select(beam => TagUtils.GetFrameTagPosition(beam.id_node_start, beam.id_node_end, nodes)).ToList(); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + if (_frameTags.DataCount == 0) + { + return; + } + + for (var i = 0; i < _frameTags.PathCount; i++) + { + List tags = _frameTags.Branches[i]; + string tag = tags.Aggregate(string.Empty, (current, tagString) => current + (tagString + "\n")); + args.Display.Draw2dText(tag, Color.Black, _tagPos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.BraceSection; + public override Guid ComponentGuid => new Guid("86763C20-7C6C-4D8C-9AFF-CC4380127991"); + } } diff --git a/HoaryFox/Component/Tag/Section/ColumnSecTag.cs b/HoaryFox/Component/Tag/Section/ColumnSecTag.cs index 76e0ba67..7f21153d 100644 --- a/HoaryFox/Component/Tag/Section/ColumnSecTag.cs +++ b/HoaryFox/Component/Tag/Section/ColumnSecTag.cs @@ -1,17 +1,127 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Section { - public class ColumnSecTag : SecTagBase + public class ColumnSecTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + private GH_Structure _frameTags = new GH_Structure(); + private List _tagPos = new List(); + public override GH_Exposure Exposure => GH_Exposure.primary; + + public ColumnSecTag() - : base(name: "Column Section Tag", nickname: "ColumnSec", description: "Display Column Section Tag", frameType: FrameType.Column) + : base("Column Section Tag", "ColumnSec", + "Display Column Section Tag", + "HoaryFox", "SectionTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameTags.Clear(); + _tagPos.Clear(); + } + + public override bool IsPreviewCapable => true; + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) { + pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); } - protected override Bitmap Icon => Properties.Resource.ColumnSection; - public override Guid ComponentGuid => new Guid("63B2A2E1-A277-4ABA-B522-00D7969871C3"); + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + _frameTags = GetTagStrings(_stBridge.StbModel.StbMembers.StbColumns, _stBridge.StbModel.StbSections); + _tagPos = GetTagPosition(_stBridge.StbModel.StbMembers.StbColumns, _stBridge.StbModel.StbNodes); + + dataAccess.SetDataTree(0, _frameTags); + } + private static GH_Structure GetTagStrings(IEnumerable columns, StbSections sections) + { + var ghSecStrings = new GH_Structure(); + + foreach (var item in columns.Select((column, index) => new { column, index })) + { + string secId = item.column.id_section; + var ghPath = new GH_Path(0, item.index); + StbColumnKind_structure kindStruct = item.column.kind_structure; + + switch (kindStruct) + { + case StbColumnKind_structure.RC: + StbSecColumn_RC secRc = sections.StbSecColumn_RC.First(i => i.id == secId); + ghSecStrings.AppendRange(TagUtils.GetColumnRcSection(secRc.StbSecFigureColumn_RC.Item, secRc.strength_concrete), ghPath); + break; + case StbColumnKind_structure.S: + StbSecColumn_S secS = sections.StbSecColumn_S.First(i => i.id == secId); + foreach (object figureObj in secS.StbSecSteelFigureColumn_S.Items) + { + ghSecStrings.AppendRange(TagUtils.GetColumnSSection(figureObj), ghPath); + } + break; + case StbColumnKind_structure.SRC: + StbSecColumn_SRC secSrc = sections.StbSecColumn_SRC.First(i => i.id == secId); + ghSecStrings.AppendRange(TagUtils.GetColumnRcSection(secSrc.StbSecFigureColumn_SRC.Item, secSrc.strength_concrete), ghPath); + foreach (object figureObj in secSrc.StbSecSteelFigureColumn_SRC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetColumnSSection(figureObj), ghPath); + } + break; + case StbColumnKind_structure.CFT: + case StbColumnKind_structure.UNDEFINED: + throw new ArgumentException("Unsupported section type."); + default: + throw new ArgumentOutOfRangeException(); + } + } + + return ghSecStrings; + } + + private static List GetTagPosition(IEnumerable columns, IEnumerable nodes) + { + return columns.Select(beam => TagUtils.GetFrameTagPosition(beam.id_node_bottom, beam.id_node_top, nodes)).ToList(); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + if (_frameTags.DataCount == 0) + { + return; + } + + for (var i = 0; i < _frameTags.PathCount; i++) + { + List tags = _frameTags.Branches[i]; + string tag = tags.Aggregate(string.Empty, (current, tagString) => current + (tagString + "\n")); + args.Display.Draw2dText(tag, Color.Black, _tagPos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.ColumnSection; + public override Guid ComponentGuid => new Guid("BCF4A288-DA26-4F28-A919-CB9FD1FCF3B1"); + } } diff --git a/HoaryFox/Component/Tag/Section/GirderSecTag.cs b/HoaryFox/Component/Tag/Section/GirderSecTag.cs index 1a6c0d94..a77e88ba 100644 --- a/HoaryFox/Component/Tag/Section/GirderSecTag.cs +++ b/HoaryFox/Component/Tag/Section/GirderSecTag.cs @@ -1,17 +1,131 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Section { - public class GirderSecTag : SecTagBase + public class GirderSecTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + private GH_Structure _frameTags = new GH_Structure(); + private List _tagPos = new List(); + public override GH_Exposure Exposure => GH_Exposure.secondary; + public GirderSecTag() - : base(name: "Girder Section Tag", nickname: "GirderSec", description: "Display Girder Section Tag", frameType: FrameType.Girder) + : base("Girder Section Tag", "GirderSec", + "Display Girder Section Tag", + "HoaryFox", "SectionTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameTags.Clear(); + _tagPos.Clear(); + } + + public override bool IsPreviewCapable => true; + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + _frameTags = GetTagStrings(_stBridge.StbModel.StbMembers.StbGirders, _stBridge.StbModel.StbSections); + _tagPos = GetTagPosition(_stBridge.StbModel.StbMembers.StbGirders, _stBridge.StbModel.StbNodes); + + dataAccess.SetDataTree(0, _frameTags); + } + private static GH_Structure GetTagStrings(IEnumerable beams, StbSections sections) { + var ghSecStrings = new GH_Structure(); + + foreach (var item in beams.Select((beam, index) => new { beam, index })) + { + string secId = item.beam.id_section; + var ghPath = new GH_Path(0, item.index); + StbGirderKind_structure kindStruct = item.beam.kind_structure; + + switch (kindStruct) + { + case StbGirderKind_structure.RC: + StbSecBeam_RC secRc = sections.StbSecBeam_RC.First(i => i.id == secId); + foreach (object figureObj in secRc.StbSecFigureBeam_RC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamRcSection(figureObj, secRc.strength_concrete), ghPath); + } + break; + case StbGirderKind_structure.S: + StbSecBeam_S secS = sections.StbSecBeam_S.First(i => i.id == secId); + foreach (object figureObj in secS.StbSecSteelFigureBeam_S.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamSSection(figureObj), ghPath); + } + break; + case StbGirderKind_structure.SRC: + StbSecBeam_SRC secSrc = sections.StbSecBeam_SRC.First(i => i.id == secId); + foreach (object figureObj in secSrc.StbSecFigureBeam_SRC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamRcSection(figureObj, secSrc.strength_concrete), ghPath); + } + foreach (object figureObj in secSrc.StbSecSteelFigureBeam_SRC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetBeamSSection(figureObj), ghPath); + } + break; + case StbGirderKind_structure.UNDEFINED: + break; + default: + throw new ArgumentOutOfRangeException(); + } + } + + return ghSecStrings; } - protected override Bitmap Icon => Properties.Resource.GirderSection; - public override Guid ComponentGuid => new Guid("D72C9B9D-6233-44EF-B588-D2854BB4FB4F"); + + private static List GetTagPosition(IEnumerable girders, IEnumerable nodes) + { + return girders.Select(girder => TagUtils.GetFrameTagPosition(girder.id_node_start, girder.id_node_end, nodes)).ToList(); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + if (_frameTags.DataCount == 0) + { + return; + } + + for (var i = 0; i < _frameTags.PathCount; i++) + { + List tags = _frameTags.Branches[i]; + string tag = tags.Aggregate(string.Empty, (current, tagString) => current + (tagString + "\n")); + args.Display.Draw2dText(tag, Color.Black, _tagPos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.GirderSection; + public override Guid ComponentGuid => new Guid("6E1E7529-826B-4214-9C63-B77AF0715009"); + } } diff --git a/HoaryFox/Component/Tag/Section/PostSecTag.cs b/HoaryFox/Component/Tag/Section/PostSecTag.cs index 744cd833..e306e0e1 100644 --- a/HoaryFox/Component/Tag/Section/PostSecTag.cs +++ b/HoaryFox/Component/Tag/Section/PostSecTag.cs @@ -1,17 +1,126 @@ using System; +using System.Collections.Generic; using System.Drawing; -using HoaryFox.Component.Base; -using STBReader.Member; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; namespace HoaryFox.Component.Tag.Section { - public class PostSecTag : SecTagBase + public class PostSecTag : GH_Component { + private ST_BRIDGE _stBridge; + private int _size; + private GH_Structure _frameTags = new GH_Structure(); + private List _tagPos = new List(); + public override GH_Exposure Exposure => GH_Exposure.primary; + public PostSecTag() - : base(name: "Post Section Tag", nickname: "PostSec", description: "Display Post Section Tag", frameType: FrameType.Post) + : base("Post Section Tag", "PostSec", + "Display Post Section Tag", + "HoaryFox", "SectionTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _frameTags.Clear(); + _tagPos.Clear(); + } + + public override bool IsPreviewCapable => true; + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + _frameTags = GetTagStrings(_stBridge.StbModel.StbMembers.StbPosts, _stBridge.StbModel.StbSections); + _tagPos = GetTagPosition(_stBridge.StbModel.StbMembers.StbPosts, _stBridge.StbModel.StbNodes); + + dataAccess.SetDataTree(0, _frameTags); + } + private static GH_Structure GetTagStrings(IEnumerable columns, StbSections sections) { + var ghSecStrings = new GH_Structure(); + + foreach (var item in columns.Select((column, index) => new { column, index })) + { + string secId = item.column.id_section; + var ghPath = new GH_Path(0, item.index); + StbColumnKind_structure kindStruct = item.column.kind_structure; + + switch (kindStruct) + { + case StbColumnKind_structure.RC: + StbSecColumn_RC secRc = sections.StbSecColumn_RC.First(i => i.id == secId); + ghSecStrings.AppendRange(TagUtils.GetColumnRcSection(secRc.StbSecFigureColumn_RC.Item, secRc.strength_concrete), ghPath); + break; + case StbColumnKind_structure.S: + StbSecColumn_S secS = sections.StbSecColumn_S.First(i => i.id == secId); + foreach (object figureObj in secS.StbSecSteelFigureColumn_S.Items) + { + ghSecStrings.AppendRange(TagUtils.GetColumnSSection(figureObj), ghPath); + } + break; + case StbColumnKind_structure.SRC: + StbSecColumn_SRC secSrc = sections.StbSecColumn_SRC.First(i => i.id == secId); + ghSecStrings.AppendRange(TagUtils.GetColumnRcSection(secSrc.StbSecFigureColumn_SRC.Item, secSrc.strength_concrete), ghPath); + foreach (object figureObj in secSrc.StbSecSteelFigureColumn_SRC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetColumnSSection(figureObj), ghPath); + } + break; + case StbColumnKind_structure.CFT: + case StbColumnKind_structure.UNDEFINED: + throw new ArgumentException("Unsupported section type."); + default: + throw new ArgumentOutOfRangeException(); + } + } + + return ghSecStrings; } - protected override Bitmap Icon => Properties.Resource.PostSection; - public override Guid ComponentGuid => new Guid("C5891374-37F7-43E8-9D28-A901D87B497E"); + + private static List GetTagPosition(IEnumerable columns, IEnumerable nodes) + { + return columns.Select(beam => TagUtils.GetFrameTagPosition(beam.id_node_bottom, beam.id_node_top, nodes)).ToList(); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + if (_frameTags.DataCount == 0) + { + return; + } + + for (var i = 0; i < _frameTags.PathCount; i++) + { + List tags = _frameTags.Branches[i]; + string tag = tags.Aggregate(string.Empty, (current, tagString) => current + (tagString + "\n")); + args.Display.Draw2dText(tag, Color.Black, _tagPos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.PostSection; + public override Guid ComponentGuid => new Guid("B0C5FFF4-B510-4A0F-B441-C0B3144BF757"); + } } diff --git a/HoaryFox/Component/Tag/Section/SlabSecTag.cs b/HoaryFox/Component/Tag/Section/SlabSecTag.cs new file mode 100644 index 00000000..43827818 --- /dev/null +++ b/HoaryFox/Component/Tag/Section/SlabSecTag.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Tag.Section +{ + public class SlabSecTag : GH_Component + { + private ST_BRIDGE _stBridge; + private int _size; + private GH_Structure _plateTags = new GH_Structure(); + private List _tagPos = new List(); + + public override GH_Exposure Exposure => GH_Exposure.quarternary; + + public SlabSecTag() + : base("Slab Section Tag", "SlabSec", + "Display Slab Section Tag", + "HoaryFox", "SectionTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _plateTags.Clear(); + _tagPos.Clear(); + } + + public override bool IsPreviewCapable => true; + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + _plateTags = GetTagStrings(_stBridge.StbModel.StbMembers.StbSlabs, _stBridge.StbModel.StbSections); + _tagPos = GetTagPosition(_stBridge.StbModel.StbMembers.StbSlabs, _stBridge.StbModel.StbNodes); + + dataAccess.SetDataTree(0, _plateTags); + } + private static GH_Structure GetTagStrings(IEnumerable slabs, StbSections sections) + { + var ghSecStrings = new GH_Structure(); + + foreach (var item in slabs.Select((slab, index) => new { slab, index })) + { + SetSectionInfo(sections, ghSecStrings, item.slab, item.index); + } + + return ghSecStrings; + } + + private static void SetSectionInfo(StbSections sections, GH_Structure ghSecStrings, StbSlab slab, int index) + { + string secId = slab.id_section; + var ghPath = new GH_Path(0, index); + StbSlabKind_structure kindStruct = slab.kind_structure; + switch (kindStruct) + { + case StbSlabKind_structure.RC: + StbSecSlab_RC secRc = sections.StbSecSlab_RC.First(i => i.id == secId); + foreach (object figure in secRc.StbSecFigureSlab_RC.Items) + { + ghSecStrings.AppendRange(TagUtils.GetSlabRcSection(figure, secRc.strength_concrete), ghPath); + } + break; + case StbSlabKind_structure.DECK: + StbSecSlabDeck secDeck = sections.StbSecSlabDeck.First(i => i.id == secId); + ghSecStrings.AppendRange(TagUtils.GetSlabDeckSection(secDeck.StbSecFigureSlabDeck.StbSecSlabDeckStraight, secDeck.strength_concrete), ghPath); + break; + case StbSlabKind_structure.PRECAST: + StbSecSlabPrecast secPrecast = sections.StbSecSlabPrecast.First(i => i.id == secId); + ghSecStrings.AppendRange(TagUtils.GetSlabPrecastSection(secPrecast.precast_type, secPrecast.StbSecProductSlabPrecast, secPrecast.strength_concrete), ghPath); + break; + default: + throw new ArgumentOutOfRangeException(nameof(kindStruct), kindStruct, null); + } + } + + private static List GetTagPosition(IEnumerable slabs, IEnumerable nodes) + { + return slabs.Select(slab => TagUtils.GetSlabTagPosition(slab.StbNodeIdOrder, slab.StbSlabOffsetList, nodes)).ToList(); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + if (_plateTags.DataCount == 0) + { + return; + } + + for (var i = 0; i < _plateTags.PathCount; i++) + { + List tags = _plateTags.Branches[i]; + string tag = tags.Aggregate(string.Empty, (current, tagString) => current + tagString + "\n"); + args.Display.Draw2dText(tag, Color.Black, _tagPos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.SlabSection; + public override Guid ComponentGuid => new Guid("90b847fd-4bac-4ea1-bab9-6ed6cc7541ed"); + + } +} diff --git a/HoaryFox/Component/Tag/Section/WallSecTag.cs b/HoaryFox/Component/Tag/Section/WallSecTag.cs new file mode 100644 index 00000000..3c22c802 --- /dev/null +++ b/HoaryFox/Component/Tag/Section/WallSecTag.cs @@ -0,0 +1,102 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using Grasshopper.Kernel; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using HoaryFox.Component.Utils; +using HoaryFox.Properties; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Tag.Section +{ + public class WallSecTag : GH_Component + { + private ST_BRIDGE _stBridge; + private int _size; + private GH_Structure _plateTags = new GH_Structure(); + private List _tagPos = new List(); + + public override GH_Exposure Exposure => GH_Exposure.quarternary; + + public WallSecTag() + : base("Wall Section Tag", "WallSec", + "Display Wall Section Tag", + "HoaryFox", "SectionTag") + { + } + + public override void ClearData() + { + base.ClearData(); + _plateTags.Clear(); + _tagPos.Clear(); + } + + public override bool IsPreviewCapable => true; + + protected override void RegisterInputParams(GH_InputParamManager pManager) + { + pManager.AddGenericParameter("Data", "D", "input ST-Bridge file data", GH_ParamAccess.item); + pManager.AddIntegerParameter("Size", "S", "Tag size", GH_ParamAccess.item, 12); + } + + protected override void RegisterOutputParams(GH_OutputParamManager pManager) + { + pManager.AddTextParameter("SecTag", "STag", "output section tag", GH_ParamAccess.tree); + } + + protected override void SolveInstance(IGH_DataAccess dataAccess) + { + if (!dataAccess.GetData("Data", ref _stBridge)) { return; } + if (!dataAccess.GetData("Size", ref _size)) { return; } + + _plateTags = GetTagStrings(_stBridge.StbModel.StbMembers.StbWalls, _stBridge.StbModel.StbSections); + _tagPos = GetTagPosition(_stBridge.StbModel.StbMembers.StbWalls, _stBridge.StbModel.StbNodes); + + dataAccess.SetDataTree(0, _plateTags); + } + private static GH_Structure GetTagStrings(IEnumerable walls, StbSections sections) + { + var ghSecStrings = new GH_Structure(); + + foreach (var item in walls.Select((wall, index) => new { wall, index })) + { + string secId = item.wall.id_section; + var ghPath = new GH_Path(0, item.index); + + StbSecWall_RC secRc = sections.StbSecWall_RC.First(i => i.id == secId); + StbSecWall_RC_Straight figure = secRc.StbSecFigureWall_RC.StbSecWall_RC_Straight; + ghSecStrings.AppendRange(TagUtils.GetWallRcSection(figure, secRc.strength_concrete), ghPath); + } + + return ghSecStrings; + } + + private static List GetTagPosition(IEnumerable walls, IEnumerable nodes) + { + return walls.Select(wall => TagUtils.GetWallTagPosition(wall.StbNodeIdOrder, wall.StbWallOffsetList, nodes)).ToList(); + } + + public override void DrawViewportWires(IGH_PreviewArgs args) + { + if (_plateTags.DataCount == 0) + { + return; + } + + for (var i = 0; i < _plateTags.PathCount; i++) + { + List tags = _plateTags.Branches[i]; + string tag = tags.Aggregate(string.Empty, (current, tagString) => current + tagString + "\n"); + args.Display.Draw2dText(tag, Color.Black, _tagPos[i], true, _size); + } + } + + protected override Bitmap Icon => Resource.WallSection; + public override Guid ComponentGuid => new Guid("fcb8d572-732a-473f-a807-7c2e8bc6f64f"); + + } +} diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Brace.cs b/HoaryFox/Component/Utils/Geometry/BrepMaker/Brace.cs new file mode 100644 index 00000000..f3637fd6 --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/BrepMaker/Brace.cs @@ -0,0 +1,88 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry.BrepMaker +{ + public class Brace + { + private readonly IReadOnlyList _tolerance; + private readonly StbSections _sections; + + public Brace(StbSections sections, IReadOnlyList tolerance) + { + _tolerance = tolerance; + _sections = sections; + } + + public Brep CreateBraceBrep(string idSection, double rotate, StbBraceKind_structure kind, IReadOnlyList sectionPoints, Vector3d memberAxis) + { + var curveList = new List(); + + switch (kind) + { + case StbBraceKind_structure.S: + StbSecBrace_S sSec = _sections.StbSecBrace_S.First(sec => sec.id == idSection); + object[] figures = sSec.StbSecSteelFigureBrace_S.Items; + curveList = SecSteelBraceToCurves(figures, sectionPoints); + break; + case StbBraceKind_structure.RC: + case StbBraceKind_structure.SRC: + throw new ArgumentException("Unsupported brace structure type"); + default: + throw new ArgumentOutOfRangeException(); + } + + Utils.RotateCurveList(memberAxis, curveList, rotate, sectionPoints); + Brep brep = Brep.CreateFromLoft(curveList, Point3d.Unset, Point3d.Unset, LoftType.Straight, false)[0] + .CapPlanarHoles(_tolerance[0]); + return brep; + } + + private List SecSteelBraceToCurves(IReadOnlyList figures, IReadOnlyList sectionPoints) + { + var curveList = new List(); + string start, center, end; + Vector3d[] localAxis = Utils.CreateLocalAxis(sectionPoints); + + switch (figures.Count) + { + case 1: + var same = figures[0] as StbSecSteelBrace_S_Same; + center = same.shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[0], Utils.SectionType.Brace, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[3], Utils.SectionType.Brace, localAxis)); + break; + case 2: + var notSames = new[] { figures[0] as StbSecSteelBrace_S_NotSame, figures[1] as StbSecSteelBrace_S_NotSame }; + start = notSames.First(sec => sec.pos == StbSecSteelBrace_S_NotSamePos.BOTTOM).shape; + end = notSames.First(sec => sec.pos == StbSecSteelBrace_S_NotSamePos.TOP).shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, start, sectionPoints[0], Utils.SectionType.Brace, localAxis)); + curveList.Add(sectionPoints[0] == sectionPoints[1] + ? SteelSections.GetCurve(_sections.StbSecSteel, start, sectionPoints[2], Utils.SectionType.Brace, localAxis) + : SteelSections.GetCurve(_sections.StbSecSteel, start, sectionPoints[1], Utils.SectionType.Brace, localAxis)); + curveList.Add(sectionPoints[0] == sectionPoints[1] + ? SteelSections.GetCurve(_sections.StbSecSteel, end, sectionPoints[2], Utils.SectionType.Brace, localAxis) + : SteelSections.GetCurve(_sections.StbSecSteel, end, sectionPoints[1], Utils.SectionType.Brace, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, end, sectionPoints[3], Utils.SectionType.Brace, localAxis)); + break; + case 3: + var three = new[] { figures[0] as StbSecSteelBrace_S_ThreeTypes, figures[1] as StbSecSteelBrace_S_ThreeTypes, figures[2] as StbSecSteelBrace_S_ThreeTypes }; + start = three.First(sec => sec.pos == StbSecSteelBrace_S_ThreeTypesPos.BOTTOM).shape; + center = three.First(sec => sec.pos == StbSecSteelBrace_S_ThreeTypesPos.CENTER).shape; + end = three.First(sec => sec.pos == StbSecSteelBrace_S_ThreeTypesPos.TOP).shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, start, sectionPoints[0], Utils.SectionType.Brace, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[1], Utils.SectionType.Brace, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[2], Utils.SectionType.Brace, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, end, sectionPoints[3], Utils.SectionType.Brace, localAxis)); + break; + default: + throw new ArgumentException("Unmatched StbSecSteelBrace_S"); + } + + return curveList; + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Column.cs b/HoaryFox/Component/Utils/Geometry/BrepMaker/Column.cs new file mode 100644 index 00000000..1d289886 --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/BrepMaker/Column.cs @@ -0,0 +1,135 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry.BrepMaker +{ + public class Column + { + private readonly IReadOnlyList _tolerance; + private readonly StbSections _sections; + public Column(StbSections sections, IReadOnlyList tolerance) + { + _tolerance = tolerance; + _sections = sections; + } + + public Brep CreateColumnBrep(string idSection, double rotate, StbColumnKind_structure kind, IReadOnlyList sectionPoints, Vector3d memberAxis) + { + var curveList = new List(); + + switch (kind) + { + case StbColumnKind_structure.RC: + StbSecColumn_RC rcSec = _sections.StbSecColumn_RC.First(sec => sec.id == idSection); + object rcFigure = rcSec.StbSecFigureColumn_RC.Item; + curveList = SecRcColumnToCurves(rcFigure, sectionPoints); + break; + case StbColumnKind_structure.S: + StbSecColumn_S sSec = _sections.StbSecColumn_S.First(sec => sec.id == idSection); + object[] sFigures = sSec.StbSecSteelFigureColumn_S.Items; + curveList = SecSteelColumnToCurves(sFigures, sectionPoints); + break; + case StbColumnKind_structure.SRC: + StbSecColumn_SRC srcSec = _sections.StbSecColumn_SRC.First(sec => sec.id == idSection); + object srcFigure = srcSec.StbSecFigureColumn_SRC.Item; + curveList = SecRcColumnToCurves(srcFigure, sectionPoints); + break; + case StbColumnKind_structure.CFT: + case StbColumnKind_structure.UNDEFINED: + break; + default: + throw new ArgumentOutOfRangeException(); + } + + Utils.RotateCurveList(memberAxis, curveList, rotate, sectionPoints); + Brep brep = Brep.CreateFromLoft(curveList, Point3d.Unset, Point3d.Unset, LoftType.Straight, false)[0] + .CapPlanarHoles(_tolerance[0]); + return brep; + } + + private static List SecRcColumnToCurves(object figure, IReadOnlyList sectionPoints) + { + var curveList = new List(); + Vector3d[] localAxis = Utils.CreateLocalAxis(sectionPoints); + + switch (figure) + { + case StbSecColumn_RC_Rect rect: + curveList.Add(new PolylineCurve( + SectionCornerPoints.ColumnRect(sectionPoints[0], rect.width_X, rect.width_Y, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve( + SectionCornerPoints.ColumnRect(sectionPoints[3], rect.width_X, rect.width_Y, localAxis[1], localAxis[2]))); + break; + case StbSecColumn_SRC_Rect rect: + curveList.Add(new PolylineCurve( + SectionCornerPoints.ColumnRect(sectionPoints[0], rect.width_X, rect.width_Y, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve( + SectionCornerPoints.ColumnRect(sectionPoints[3], rect.width_X, rect.width_Y, localAxis[1], localAxis[2]))); + break; + case StbSecColumn_RC_Circle circle: + curveList.Add(SectionCornerPoints.ColumnPipe(sectionPoints[0], circle.D, localAxis[0])); + curveList.Add(SectionCornerPoints.ColumnPipe(sectionPoints[3], circle.D, localAxis[0])); + break; + case StbSecColumn_SRC_Circle circle: + curveList.Add(SectionCornerPoints.ColumnPipe(sectionPoints[0], circle.D, localAxis[0])); + curveList.Add(SectionCornerPoints.ColumnPipe(sectionPoints[3], circle.D, localAxis[0])); + break; + default: + throw new Exception(); + } + + return curveList; + } + + private List SecSteelColumnToCurves(IReadOnlyList figures, IReadOnlyList sectionPoints) + { + var curveList = new List(); + Vector3d[] localAxis = Utils.CreateLocalAxis(sectionPoints); + + string bottom, center, top; + switch (figures.Count) + { + case 1: + var same = figures[0] as StbSecSteelColumn_S_Same; + center = same.shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[0], Utils.SectionType.Column, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[3], Utils.SectionType.Column, localAxis)); + break; + case 2: + var notSames = new[] { figures[0] as StbSecSteelColumn_S_NotSame, figures[1] as StbSecSteelColumn_S_NotSame }; + bottom = notSames.First(item => item.pos == StbSecSteelColumn_S_NotSamePos.BOTTOM).shape; + top = notSames.First(item => item.pos == StbSecSteelColumn_S_NotSamePos.TOP).shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, bottom, sectionPoints[0], Utils.SectionType.Column, localAxis)); + if (sectionPoints[1].Z > sectionPoints[0].Z) + { + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, bottom, sectionPoints[1], Utils.SectionType.Column, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, top, sectionPoints[1], Utils.SectionType.Column, localAxis)); + } + else + { + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, bottom, sectionPoints[2], Utils.SectionType.Column, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, top, sectionPoints[2], Utils.SectionType.Column, localAxis)); + } + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, top, sectionPoints[3], Utils.SectionType.Column, localAxis)); + break; + case 3: + var three = new[] { figures[0] as StbSecSteelColumn_S_ThreeTypes, figures[1] as StbSecSteelColumn_S_ThreeTypes, figures[2] as StbSecSteelColumn_S_ThreeTypes }; + bottom = three.First(item => item.pos == StbSecSteelColumn_S_ThreeTypesPos.BOTTOM).shape; + center = three.First(item => item.pos == StbSecSteelColumn_S_ThreeTypesPos.CENTER).shape; + top = three.First(item => item.pos == StbSecSteelColumn_S_ThreeTypesPos.TOP).shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, bottom, sectionPoints[0], Utils.SectionType.Column, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[1], Utils.SectionType.Column, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[2], Utils.SectionType.Column, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, top, sectionPoints[3], Utils.SectionType.Column, localAxis)); + break; + default: + throw new ArgumentException("Unmatched StbSecSteelColumn_S"); + } + + return curveList; + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Girder.cs b/HoaryFox/Component/Utils/Geometry/BrepMaker/Girder.cs new file mode 100644 index 00000000..8566086e --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/BrepMaker/Girder.cs @@ -0,0 +1,176 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry.BrepMaker +{ + public class Girder + { + private readonly IReadOnlyList _tolerance; + private readonly StbSections _sections; + public Girder(StbSections sections, IReadOnlyList tolerance) + { + _tolerance = tolerance; + _sections = sections; + } + public Brep CreateGirderBrep(string idSection, double rotate, StbGirderKind_structure kind, IReadOnlyList sectionPoints, Vector3d memberAxis) + { + var curveList = new List(); + switch (kind) + { + case StbGirderKind_structure.RC: + StbSecBeam_RC rcSec = _sections.StbSecBeam_RC.First(sec => sec.id == idSection); + object[] rcFigure = rcSec.StbSecFigureBeam_RC.Items; + curveList = SecRcBeamCurves(rcFigure, sectionPoints); + break; + case StbGirderKind_structure.S: + StbSecBeam_S sSec = _sections.StbSecBeam_S.First(sec => sec.id == idSection); + object[] sFigure = sSec.StbSecSteelFigureBeam_S.Items; + curveList = SecSteelBeamToCurves(sFigure, sectionPoints); + break; + case StbGirderKind_structure.SRC: + StbSecBeam_SRC srcSec = _sections.StbSecBeam_SRC.First(sec => sec.id == idSection); + object[] srcFigure = srcSec.StbSecFigureBeam_SRC.Items; + curveList = SecSrcBeamCurves(srcFigure, sectionPoints); + break; + case StbGirderKind_structure.UNDEFINED: + default: + throw new ArgumentOutOfRangeException(); + } + + Utils.RotateCurveList(memberAxis, curveList, rotate, sectionPoints); + Brep brep = Brep.CreateFromLoft(curveList, Point3d.Unset, Point3d.Unset, LoftType.Straight, false)[0] + .CapPlanarHoles(_tolerance[0]); + return brep; + } + + + private static List SecRcBeamCurves(IReadOnlyList figures, IReadOnlyList sectionPoints) + { + var curveList = new List(); + Vector3d[] localAxis = Utils.CreateLocalAxis(sectionPoints); + + switch (figures.Count) + { + case 1: + var straight = figures[0] as StbSecBeam_RC_Straight; + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[0], straight.depth, straight.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[3], straight.depth, straight.width, localAxis[1], localAxis[2]))); + break; + case 2: + var taper = new[] { figures[0] as StbSecBeam_RC_Taper, figures[1] as StbSecBeam_RC_Taper }; + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[0], taper[0].depth, taper[0].width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[3], taper[1].depth, taper[1].width, localAxis[1], localAxis[2]))); + break; + case 3: + var haunch = new[] { figures[0] as StbSecBeam_RC_Haunch, figures[1] as StbSecBeam_RC_Haunch, figures[2] as StbSecBeam_RC_Haunch }; + StbSecBeam_RC_Haunch start = haunch.First(fig => fig.pos == StbSecBeam_RC_HaunchPos.START); + StbSecBeam_RC_Haunch center = haunch.First(fig => fig.pos == StbSecBeam_RC_HaunchPos.CENTER); + StbSecBeam_RC_Haunch end = haunch.First(fig => fig.pos == StbSecBeam_RC_HaunchPos.END); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[0], start.depth, start.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[1], center.depth, center.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[2], center.depth, center.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[3], end.depth, end.width, localAxis[1], localAxis[2]))); + break; + default: + throw new Exception(); + } + + return curveList; + } + + private static List SecSrcBeamCurves(IReadOnlyList figures, IReadOnlyList sectionPoints) + { + var curveList = new List(); + Vector3d[] localAxis = Utils.CreateLocalAxis(sectionPoints); + + switch (figures.Count) + { + case 1: + var straight = figures[0] as StbSecBeam_SRC_Straight; + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[0], straight.depth, straight.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[3], straight.depth, straight.width, localAxis[1], localAxis[2]))); + break; + case 2: + var taper = new[] { figures[0] as StbSecBeam_SRC_Taper, figures[1] as StbSecBeam_SRC_Taper }; + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[0], taper[0].depth, taper[0].width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve( + SectionCornerPoints.BeamRect(sectionPoints[3], taper[1].depth, taper[1].width, localAxis[1], localAxis[2]))); + break; + case 3: + var haunch = new[] { figures[0] as StbSecBeam_SRC_Haunch, figures[1] as StbSecBeam_SRC_Haunch, figures[2] as StbSecBeam_SRC_Haunch }; + StbSecBeam_SRC_Haunch start = haunch.First(fig => fig.pos == StbSecBeam_RC_HaunchPos.START); + StbSecBeam_SRC_Haunch center = haunch.First(fig => fig.pos == StbSecBeam_RC_HaunchPos.CENTER); + StbSecBeam_SRC_Haunch end = haunch.First(fig => fig.pos == StbSecBeam_RC_HaunchPos.END); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[0], start.depth, start.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[1], center.depth, center.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[2], center.depth, center.width, localAxis[1], localAxis[2]))); + curveList.Add(new PolylineCurve(SectionCornerPoints.BeamRect(sectionPoints[3], end.depth, end.width, localAxis[1], localAxis[2]))); + break; + default: + throw new Exception(); + } + + return curveList; + } + + private List SecSteelBeamToCurves(IReadOnlyList figures, IReadOnlyList sectionPoints) + { + var curveList = new List(); + string start, center, end; + Vector3d[] localAxis = Utils.CreateLocalAxis(sectionPoints); + + switch (figures.Count) + { + case 1: + var straight = figures[0] as StbSecSteelBeam_S_Straight; + center = straight.shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[0], Utils.SectionType.Beam, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[3], Utils.SectionType.Beam, localAxis)); + break; + case 2: + var tapers = new[] { figures[0] as StbSecSteelBeam_S_Taper, figures[1] as StbSecSteelBeam_S_Taper }; + start = tapers.First(sec => sec.pos == StbSecSteelBeam_S_TaperPos.START).shape; + end = tapers.First(sec => sec.pos == StbSecSteelBeam_S_TaperPos.END).shape; + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, start, sectionPoints[0], Utils.SectionType.Beam, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, end, sectionPoints[3], Utils.SectionType.Beam, localAxis)); + break; + case 3: + if (figures[0] is StbSecSteelBeam_S_Haunch) + { + var haunch = new[] { figures[0] as StbSecSteelBeam_S_Haunch, figures[1] as StbSecSteelBeam_S_Haunch, figures[2] as StbSecSteelBeam_S_Haunch }; + start = haunch.First(sec => sec.pos == StbSecSteelBeam_S_HaunchPos.START).shape; + center = haunch.First(sec => sec.pos == StbSecSteelBeam_S_HaunchPos.CENTER).shape; + end = haunch.First(sec => sec.pos == StbSecSteelBeam_S_HaunchPos.END).shape; + } + else + { + var joint = new[] { figures[0] as StbSecSteelBeam_S_Joint, figures[1] as StbSecSteelBeam_S_Joint, figures[2] as StbSecSteelBeam_S_Joint }; + start = joint.First(sec => sec.pos == StbSecSteelBeam_S_JointPos.START).shape; + center = joint.First(sec => sec.pos == StbSecSteelBeam_S_JointPos.CENTER).shape; + end = joint.First(sec => sec.pos == StbSecSteelBeam_S_JointPos.END).shape; + } + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, start, sectionPoints[0], Utils.SectionType.Beam, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[1], Utils.SectionType.Beam, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, center, sectionPoints[2], Utils.SectionType.Beam, localAxis)); + curveList.Add(SteelSections.GetCurve(_sections.StbSecSteel, end, sectionPoints[3], Utils.SectionType.Beam, localAxis)); + break; + case 5: + throw new ArgumentException("5 section steel is not supported"); + default: + throw new ArgumentException("Unmatched StbSecSteelBeam_S"); + } + + return curveList; + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Slab.cs b/HoaryFox/Component/Utils/Geometry/BrepMaker/Slab.cs new file mode 100644 index 00000000..7a198662 --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/BrepMaker/Slab.cs @@ -0,0 +1,51 @@ +using System; +using System.Linq; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry.BrepMaker +{ + public static class Slab + { + public static double GetDepth(StbSections sections, StbSlab slab) + { + double depth = 0; + + switch (slab.kind_structure) + { + case StbSlabKind_structure.RC: + object[] slabRc = sections.StbSecSlab_RC.First(sec => sec.id == slab.id_section).StbSecFigureSlab_RC.Items; + switch (slabRc.Length) + { + case 1: + var straight = slabRc[0] as StbSecSlab_RC_Straight; + depth = straight.depth; + break; + case 2: + var tapers = new[] { slabRc[0] as StbSecSlab_RC_Taper, slabRc[1] as StbSecSlab_RC_Taper }; + depth = tapers.First(sec => sec.pos == StbSecSlab_RC_TaperPos.TIP).depth; + break; + case 3: + var haunches = new[] + { + slabRc[0] as StbSecSlab_RC_Haunch, slabRc[1] as StbSecSlab_RC_Haunch, + slabRc[2] as StbSecSlab_RC_Haunch + }; + depth = haunches.First(sec => sec.pos == StbSecSlab_RC_HaunchPos.CENTER).depth; + break; + } + + break; + case StbSlabKind_structure.DECK: + // StbSecSlabDeck slabDeck = _sections.StbSecSlabDeck.FirstOrDefault(sec => sec.id == slab.id_section); + // break; + case StbSlabKind_structure.PRECAST: + // StbSecSlabPrecast slabPrecast = _sections.StbSecSlabPrecast.FirstOrDefault(sec => sec.id == slab.id_section); + // break; + default: + throw new ArgumentOutOfRangeException(); + } + + return depth; + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/SteelSections.cs b/HoaryFox/Component/Utils/Geometry/BrepMaker/SteelSections.cs new file mode 100644 index 00000000..7c092ccb --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/BrepMaker/SteelSections.cs @@ -0,0 +1,148 @@ +using System; +using System.Linq; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry.BrepMaker +{ + public static class SteelSections + { + public static Curve GetCurve(StbSecSteel secSteel, string shape, Point3d point, Utils.SectionType type, Vector3d[] localAxis) + { + // TODO: foreach なのに最初にマッチしたもので return しているのでが変なので直す。 + if (secSteel.StbSecBuildBOX != null) + { + foreach (var box in secSteel.StbSecBuildBOX.Where(box => box.name == shape)) + { + return CurveFromStbSecBox(localAxis, point, type, box.A, box.B); + } + } + + if (secSteel.StbSecRollBOX != null) + { + foreach (StbSecRollBOX box in secSteel.StbSecRollBOX.Where(box => box.name == shape)) + { + return CurveFromStbSecBox(localAxis, point, type, box.A, box.B); + } + } + + if (secSteel.StbSecFlatBar != null) + { + foreach (StbSecFlatBar flatBar in secSteel.StbSecFlatBar.Where(bar => bar.name == shape)) + { + return CurveFromStbSecBox(localAxis, point, type, flatBar.B, flatBar.t); + } + } + + if (secSteel.StbSecBuildH != null) + { + foreach (StbSecBuildH buildH in secSteel.StbSecBuildH.Where(buildH => buildH.name == shape)) + { + return CurveFromStbSecH(localAxis, point, type, buildH.A, buildH.B, buildH.t1, buildH.t2); + } + } + + if (secSteel.StbSecRollH != null) + { + foreach (StbSecRollH rollH in secSteel.StbSecRollH.Where(rollH => rollH.name == shape)) + { + return CurveFromStbSecH(localAxis, point, type, rollH.A, rollH.B, rollH.t1, rollH.t2); + } + } + + if (secSteel.StbSecRollL != null) + { + foreach (StbSecRollL rollL in secSteel.StbSecRollL.Where(rollL => rollL.name == shape)) + { + return CurveFromStbSecL(localAxis, point, type, rollL); + } + } + + if (secSteel.StbSecPipe != null) + { + foreach (StbSecPipe pipe in secSteel.StbSecPipe.Where(pipe => pipe.name == shape)) + { + return CurveFromStbSecPipe(localAxis, point, type, pipe.D); + } + } + + if (secSteel.StbSecRoundBar != null) + { + foreach (StbSecRoundBar bar in secSteel.StbSecRoundBar.Where(pipe => pipe.name == shape)) + { + return CurveFromStbSecPipe(localAxis, point, type, bar.R); + } + } + + // TODO: C 断面を実装する + if (secSteel.StbSecRollC != null || secSteel.StbSecLipC != null) + { + throw new ArgumentException("StbSecRollC & StbSecLipC is not supported"); + } + + throw new ArgumentException("There are no matching steel section"); + } + + private static Curve CurveFromStbSecPipe(Vector3d[] localAxis, Point3d point, Utils.SectionType type, double diameter) + { + switch (type) + { + case Utils.SectionType.Column: + case Utils.SectionType.Brace: + return SectionCornerPoints.ColumnPipe(point, diameter, localAxis[0]); + case Utils.SectionType.Beam: + return SectionCornerPoints.BeamPipe(point, diameter, localAxis[0]); + default: + throw new ArgumentOutOfRangeException(nameof(type), type, null); + } + } + + private static Curve CurveFromStbSecL(Vector3d[] localAxis, Point3d point, Utils.SectionType type, StbSecRollL rollL) + { + switch (type) + { + case Utils.SectionType.Column: + case Utils.SectionType.Brace: + return new PolylineCurve( + SectionCornerPoints.ColumnL(point, rollL.A, rollL.B, rollL.t1, rollL.t2, rollL.type, localAxis[1], localAxis[2])); + case Utils.SectionType.Beam: + return new PolylineCurve( + SectionCornerPoints.BeamL(point, rollL.A, rollL.B, rollL.t1, rollL.t2, rollL.type, localAxis[1], localAxis[2])); + default: + throw new ArgumentOutOfRangeException(nameof(type), type, null); + } + } + + private static Curve CurveFromStbSecBox(Vector3d[] localAxis, Point3d point, Utils.SectionType type, double A, double B) + { + switch (type) + { + case Utils.SectionType.Column: + case Utils.SectionType.Brace: + return new PolylineCurve( + SectionCornerPoints.ColumnRect(point, B, A, localAxis[1], localAxis[2])); + case Utils.SectionType.Beam: + return new PolylineCurve( + SectionCornerPoints.BeamRect(point, B, A, localAxis[1], localAxis[2])); + default: + throw new ArgumentOutOfRangeException(nameof(type), type, null); + } + } + + private static Curve CurveFromStbSecH(Vector3d[] localAxis, Point3d point, Utils.SectionType type, double A, double B, double t1, double t2) + { + switch (type) + { + case Utils.SectionType.Column: + case Utils.SectionType.Brace: + return new PolylineCurve( + SectionCornerPoints.ColumnH(point, A, B, t1, t2, localAxis[1], localAxis[2])); + case Utils.SectionType.Beam: + return new PolylineCurve( + SectionCornerPoints.BeamH(point, A, B, t1, t2, localAxis[1], localAxis[2])); + default: + throw new ArgumentOutOfRangeException(nameof(type), type, null); + } + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Utils.cs b/HoaryFox/Component/Utils/Geometry/BrepMaker/Utils.cs new file mode 100644 index 00000000..b0a4aab3 --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/BrepMaker/Utils.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using Rhino.Geometry; + +namespace HoaryFox.Component.Utils.Geometry.BrepMaker +{ + public static class Utils + { + public static Vector3d[] CreateLocalAxis(IReadOnlyList sectionPoints) + { + var xAxis = new Vector3d(sectionPoints[3] - sectionPoints[0]); + var yAxis = Vector3d.CrossProduct(Vector3d.ZAxis, xAxis); + if (yAxis == Vector3d.Zero) + { + yAxis = -Vector3d.XAxis; + } + var zAxis = Vector3d.CrossProduct(xAxis, yAxis); + xAxis.Unitize(); + yAxis.Unitize(); + zAxis.Unitize(); + return new Vector3d[] { xAxis, yAxis, zAxis }; + } + + public static void RotateCurveList(Vector3d rotateAxis, IReadOnlyList curveList, double stbRotateValue, IReadOnlyList sectionPoints) + { + double inPlaneAngle = stbRotateValue * Math.PI / 180; + switch (curveList.Count) + { + case 2: + curveList[0].Rotate(inPlaneAngle, rotateAxis, sectionPoints[0]); + curveList[1].Rotate(inPlaneAngle, rotateAxis, sectionPoints[3]); + break; + case 3: + curveList[0].Rotate(inPlaneAngle, rotateAxis, sectionPoints[0]); + curveList[2].Rotate(inPlaneAngle, rotateAxis, sectionPoints[3]); + if (sectionPoints[2] == sectionPoints[3]) + { + curveList[1].Rotate(inPlaneAngle, rotateAxis, sectionPoints[1]); + } + else + { + curveList[1].Rotate(inPlaneAngle, rotateAxis, sectionPoints[2]); + } + break; + case 4: + for (var i = 0; i < 4; i++) + { + curveList[i].Rotate(inPlaneAngle, rotateAxis, sectionPoints[i]); + } + break; + default: + throw new ArgumentException(); + } + } + + public enum SectionType + { + Column, + Beam, + Brace + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/BrepMaker/Wall.cs b/HoaryFox/Component/Utils/Geometry/BrepMaker/Wall.cs new file mode 100644 index 00000000..d7c580a4 --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/BrepMaker/Wall.cs @@ -0,0 +1,14 @@ +using System.Linq; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry.BrepMaker +{ + public static class Wall + { + public static double GetThickness(StbSections sections, StbWall wall) + { + return sections.StbSecWall_RC.First(sec => sec.id == wall.id_section) + .StbSecFigureWall_RC.StbSecWall_RC_Straight.t; + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/CreateLineFromStb.cs b/HoaryFox/Component/Utils/Geometry/CreateLineFromStb.cs new file mode 100644 index 00000000..d31402f8 --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/CreateLineFromStb.cs @@ -0,0 +1,129 @@ +using System.Collections.Generic; +using System.Linq; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry +{ + public class CreateLineFromStb + { + private readonly StbMembers _members; + private readonly StbNode[] _nodes; + + public CreateLineFromStb(ST_BRIDGE stBridge) + { + _members = stBridge.StbModel.StbMembers; + _nodes = stBridge.StbModel.StbNodes; + } + + public List Nodes() + { + return _nodes.Select(node => new Point3d(node.X, node.Y, node.Z)).ToList(); + } + + public GH_Structure Columns() + { + var lines = new GH_Structure(); + if (_members.StbColumns == null) + { + return lines; + } + + foreach ((StbColumn member, int i) in _members.StbColumns.Select((member, index) => (member, index))) + { + StbNode nodeBottom = _nodes.First(node => node.id == member.id_node_bottom); + StbNode nodeTop = _nodes.First(node => node.id == member.id_node_top); + + lines.Append(GH_LineFromStbNode(nodeBottom, nodeTop), new GH_Path(0, i)); + } + + return lines; + } + + public GH_Structure Girders() + { + var lines = new GH_Structure(); + if (_members.StbGirders == null) + { + return lines; + } + + foreach ((StbGirder member, int i) in _members.StbGirders.Select((member, index) => (member, index))) + { + StbNode nodeStart = _nodes.First(node => node.id == member.id_node_start); + StbNode nodeEnd = _nodes.First(node => node.id == member.id_node_end); + + lines.Append(GH_LineFromStbNode(nodeStart, nodeEnd), new GH_Path(0, i)); + } + + return lines; + } + + public GH_Structure Posts() + { + var lines = new GH_Structure(); + if (_members.StbPosts == null) + { + return lines; + } + + foreach ((StbPost member, int i) in _members.StbPosts.Select((member, index) => (member, index))) + { + StbNode nodeBottom = _nodes.First(node => node.id == member.id_node_bottom); + StbNode nodeTop = _nodes.First(node => node.id == member.id_node_top); + + lines.Append(GH_LineFromStbNode(nodeBottom, nodeTop), new GH_Path(0, i)); + } + + return lines; + } + + public GH_Structure Beams() + { + var lines = new GH_Structure(); + if (_members.StbBeams == null) + { + return lines; + } + + foreach ((StbBeam member, int i) in _members.StbBeams.Select((member, index) => (member, index))) + { + StbNode nodeStart = _nodes.First(node => node.id == member.id_node_start); + StbNode nodeEnd = _nodes.First(node => node.id == member.id_node_end); + + lines.Append(GH_LineFromStbNode(nodeStart, nodeEnd), new GH_Path(0, i)); + } + + return lines; + } + + public GH_Structure Braces() + { + var lines = new GH_Structure(); + if (_members.StbBraces == null) + { + return lines; + } + + foreach ((StbBrace member, int i) in _members.StbBraces.Select((member, index) => (member, index))) + { + StbNode nodeStart = _nodes.First(node => node.id == member.id_node_start); + StbNode nodeEnd = _nodes.First(node => node.id == member.id_node_end); + + lines.Append(GH_LineFromStbNode(nodeStart, nodeEnd), new GH_Path(0, i)); + } + + return lines; + } + + private static GH_Line GH_LineFromStbNode(StbNode from, StbNode to) + { + var ptFrom = new Point3d(from.X, from.Y, from.Z); + var ptTo = new Point3d(to.X, to.Y, to.Z); + + return new GH_Line(new Line(ptFrom, ptTo)); + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs b/HoaryFox/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs new file mode 100644 index 00000000..c4a63c51 --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/CreateMemberBrepListFromStb.cs @@ -0,0 +1,352 @@ +using System.Collections.Generic; +using System.Linq; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry +{ + public class CreateMemberBrepListFromStb + { + private readonly IEnumerable _nodes; + private readonly IReadOnlyList _tolerance; + private readonly StbSections _sections; + + public CreateMemberBrepListFromStb(StbSections sections, IEnumerable nodes, IReadOnlyList tolerance) + { + _nodes = nodes; + _tolerance = tolerance; + _sections = sections; + } + + public GH_Structure Column(IEnumerable columns) + { + var brepList = new GH_Structure(); + if (columns == null) + { + return brepList; + } + + foreach ((StbColumn column, int i) in columns.Select((column, index) => (column, index))) + { + StbColumnKind_structure kind = column.kind_structure; + + StbNode[] endNodes = + { + _nodes.First(node => node.id == column.id_node_bottom), + _nodes.First(node => node.id == column.id_node_top) + }; + Point3d[] offset = + { + new Point3d(column.offset_bottom_X, column.offset_bottom_Y, column.offset_bottom_Z), + new Point3d(column.offset_top_X, column.offset_top_Y, column.offset_top_Z) + }; + Point3d[] sectionPoints = + { + new Point3d(endNodes[0].X, endNodes[0].Y, endNodes[0].Z) + offset[0], + new Point3d(), + new Point3d(), + new Point3d(endNodes[1].X, endNodes[1].Y, endNodes[1].Z) + offset[1] + }; + Vector3d memberAxis = sectionPoints[3] - sectionPoints[0]; + sectionPoints[1] = sectionPoints[0] + memberAxis / memberAxis.Length * column.joint_bottom; + sectionPoints[2] = sectionPoints[3] - memberAxis / memberAxis.Length * column.joint_top; + + var brepMaker = new BrepMaker.Column(_sections, _tolerance); + brepList.Append(new GH_Brep(brepMaker.CreateColumnBrep(column.id_section, column.rotate, kind, sectionPoints, memberAxis)), new GH_Path(0, i)); + } + + return brepList; + } + + public GH_Structure Post(IEnumerable posts) + { + var brepList = new GH_Structure(); + if (posts == null) + { + return brepList; + } + + foreach ((StbPost post, int i) in posts.Select((post, index) => (post, index))) + { + StbColumnKind_structure kind = post.kind_structure; + + StbNode[] endNodes = + { + _nodes.First(node => node.id == post.id_node_bottom), + _nodes.First(node => node.id == post.id_node_top) + }; + Point3d[] offset = + { + new Point3d(post.offset_bottom_X, post.offset_bottom_Y, post.offset_bottom_Z), + new Point3d(post.offset_top_X, post.offset_top_Y, post.offset_top_Z) + }; + Point3d[] sectionPoints = + { + new Point3d(endNodes[0].X, endNodes[0].Y, endNodes[0].Z) + offset[0], + new Point3d(), + new Point3d(), + new Point3d(endNodes[1].X, endNodes[1].Y, endNodes[1].Z) + offset[1] + }; + Vector3d memberAxis = sectionPoints[3] - sectionPoints[0]; + sectionPoints[1] = sectionPoints[0] + memberAxis / memberAxis.Length * post.joint_bottom; + sectionPoints[2] = sectionPoints[3] - memberAxis / memberAxis.Length * post.joint_top; + + var brepMaker = new BrepMaker.Column(_sections, _tolerance); + brepList.Append(new GH_Brep(brepMaker.CreateColumnBrep(post.id_section, post.rotate, kind, sectionPoints, memberAxis)), new GH_Path(0, i)); + } + + return brepList; + } + + public GH_Structure Girder(IEnumerable girders) + { + var brepList = new GH_Structure(); + if (girders == null) + { + return brepList; + } + + foreach ((StbGirder girder, int i) in girders.Select((girder, index) => (girder, index))) + { + StbGirderKind_structure kind = girder.kind_structure; + + StbNode[] endNodes = + { + _nodes.First(node => node.id == girder.id_node_start), + _nodes.First(node => node.id == girder.id_node_end) + }; + Point3d[] offset = + { + new Point3d(girder.offset_start_X, girder.offset_start_Y, girder.offset_start_Z), + new Point3d(girder.offset_end_X, girder.offset_end_Y, girder.offset_end_Z) + }; + Point3d[] sectionPoints = + { + new Point3d(endNodes[0].X, endNodes[0].Y, endNodes[0].Z) + offset[0], + Point3d.Origin, + Point3d.Origin, + new Point3d(endNodes[1].X, endNodes[1].Y, endNodes[1].Z) + offset[1] + }; + Vector3d memberAxis = sectionPoints[3] - sectionPoints[0]; + sectionPoints[1] = sectionPoints[0] + memberAxis / memberAxis.Length * girder.joint_start; + sectionPoints[2] = sectionPoints[3] - memberAxis / memberAxis.Length * girder.joint_end; + + var brepMaker = new BrepMaker.Girder(_sections, _tolerance); + brepList.Append(new GH_Brep(brepMaker.CreateGirderBrep(girder.id_section, girder.rotate, kind, sectionPoints, memberAxis)), new GH_Path(0, i)); + } + + return brepList; + } + + public GH_Structure Beam(IEnumerable beams) + { + var brepList = new GH_Structure(); + if (beams == null) + { + return brepList; + } + + foreach ((StbBeam beam, int i) in beams.Select((beam, index) => (beam, index))) + { + StbGirderKind_structure kind = beam.kind_structure; + + StbNode[] endNodes = + { + _nodes.First(node => node.id == beam.id_node_start), + _nodes.First(node => node.id == beam.id_node_end) + }; + Point3d[] offset = + { + new Point3d(beam.offset_start_X, beam.offset_start_Y, beam.offset_start_Z), + new Point3d(beam.offset_end_X, beam.offset_end_Y, beam.offset_end_Z) + }; + Point3d[] sectionPoints = + { + new Point3d(endNodes[0].X, endNodes[0].Y, endNodes[0].Z) + offset[0], + Point3d.Origin, + Point3d.Origin, + new Point3d(endNodes[1].X, endNodes[1].Y, endNodes[1].Z) + offset[1] + }; + Vector3d memberAxis = sectionPoints[3] - sectionPoints[0]; + sectionPoints[1] = sectionPoints[0] + memberAxis / memberAxis.Length * beam.joint_start; + sectionPoints[2] = sectionPoints[3] - memberAxis / memberAxis.Length * beam.joint_end; + + var brepMaker = new BrepMaker.Girder(_sections, _tolerance); + brepList.Append(new GH_Brep(brepMaker.CreateGirderBrep(beam.id_section, beam.rotate, kind, sectionPoints, memberAxis)), new GH_Path(0, i)); + } + + return brepList; + } + + public GH_Structure Brace(IEnumerable braces) + { + var brepList = new GH_Structure(); + if (braces == null) + { + return brepList; + } + + foreach ((StbBrace brace, int i) in braces.Select((brace, index) => (brace, index))) + { + StbBraceKind_structure kind = brace.kind_structure; + + StbNode[] endNodes = + { + _nodes.First(node => node.id == brace.id_node_start), + _nodes.First(node => node.id == brace.id_node_end) + }; + Point3d[] offset = + { + new Point3d(brace.offset_start_X, brace.offset_start_Y, brace.offset_start_Z), + new Point3d(brace.offset_end_X, brace.offset_end_Y, brace.offset_end_Z) + }; + Point3d[] sectionPoints = + { + new Point3d(endNodes[0].X, endNodes[0].Y, endNodes[0].Z) + offset[0], + Point3d.Origin, + Point3d.Origin, + new Point3d(endNodes[1].X, endNodes[1].Y, endNodes[1].Z) + offset[1] + }; + Vector3d memberAxis = sectionPoints[3] - sectionPoints[0]; + sectionPoints[1] = sectionPoints[0] + memberAxis / memberAxis.Length * brace.joint_start; + sectionPoints[2] = sectionPoints[3] - memberAxis / memberAxis.Length * brace.joint_end; + + var brepMaker = new BrepMaker.Brace(_sections, _tolerance); + brepList.Append(new GH_Brep(brepMaker.CreateBraceBrep(brace.id_section, brace.rotate, kind, sectionPoints, memberAxis)), new GH_Path(0, i)); + } + + return brepList; + } + + public GH_Structure Slab(IEnumerable slabs) + { + var brepList = new GH_Structure(); + if (slabs == null) + { + return brepList; + } + + foreach ((StbSlab slab, int i) in slabs.Select((slab, index) => (slab, index))) + { + StbSlabOffset[] offsets = slab.StbSlabOffsetList; + var curveList = new PolylineCurve[2]; + double depth = BrepMaker.Slab.GetDepth(_sections, slab); + string[] nodeIds = slab.StbNodeIdOrder.Split(' '); + var topPts = new List(); + foreach (string nodeId in nodeIds) + { + var offsetVec = new Vector3d(); + if (offsets != null) + { + foreach (StbSlabOffset offset in offsets) + { + if (nodeId == offset.id_node) + { + offsetVec = new Vector3d(offset.offset_X, offset.offset_Y, offset.offset_Z); + } + } + } + + StbNode node = _nodes.First(n => n.id == nodeId); + topPts.Add(new Point3d(node.X, node.Y, node.Z) + offsetVec); + } + + topPts.Add(topPts[0]); + curveList[0] = new PolylineCurve(topPts); + brepList.Append(CreateSlabBrep(depth, curveList, topPts), new GH_Path(0, i)); + } + + return brepList; + } + + private GH_Brep CreateSlabBrep(double depth, IList curveList, IEnumerable topPts) + { + if (depth > 0) + { + Vector3d normal = Vector3d.CrossProduct(curveList[0].TangentAtEnd, curveList[0].TangentAtStart); + curveList[1] = new PolylineCurve(topPts.Select(pt => pt - normal * depth)); + Brep loftBrep = Brep.CreateFromLoft(curveList, Point3d.Unset, Point3d.Unset, LoftType.Straight, false)[0]; + Brep capedBrep = loftBrep.CapPlanarHoles(_tolerance[0]); + + return capedBrep == null ? NonPlanarBrep(depth, curveList) : new GH_Brep(capedBrep); + } + else + { + Brep[] planarBrep = Brep.CreatePlanarBreps(new[] { curveList[0] }, _tolerance[0]); + return new GH_Brep(planarBrep != null + ? planarBrep[0] + : Brep.CreatePatch(new[] { curveList[0] }, 5, 5, _tolerance[0])); + } + } + + private GH_Brep NonPlanarBrep(double depth, IList curveList) + { + var nonPlanarBrep = new List(); + var topBrep = Brep.CreatePatch(new[] { curveList[0] }, 5, 5, _tolerance[0]); + nonPlanarBrep.Add(topBrep); + + BrepFace face = topBrep.Faces[0]; + Vector3d faceNormal = face.NormalAt(face.Domain(0).Mid, face.Domain(1).Mid); + if (Vector3d.VectorAngle(faceNormal, Vector3d.ZAxis) < Vector3d.VectorAngle(faceNormal, -Vector3d.ZAxis)) + { + faceNormal = -faceNormal; + } + + Brep bottomBrep = topBrep.DuplicateBrep(); + bottomBrep.Translate(faceNormal * depth); + nonPlanarBrep.Add(bottomBrep); + + IEnumerable edgeCurveList = topBrep.Edges.Select(edge => edge.DuplicateCurve()); + nonPlanarBrep.AddRange(edgeCurveList.Select(edgeCurve => + Surface.CreateExtrusion(edgeCurve, faceNormal * depth).ToBrep())); + return new GH_Brep(Brep.JoinBreps(nonPlanarBrep, _tolerance[0])[0] ?? topBrep); + } + + public GH_Structure Wall(IEnumerable walls) + { + var brepList = new GH_Structure(); + if (walls == null) + { + return brepList; + } + + foreach ((StbWall wall, int i) in walls.Select((wall, index) => (wall, index))) + { + StbWallOffset[] offsets = wall.StbWallOffsetList; + var curveList = new PolylineCurve[2]; + double thickness = BrepMaker.Wall.GetThickness(_sections, wall); + string[] nodeIds = wall.StbNodeIdOrder.Split(' '); + var topPts = new List(); + foreach (string nodeId in nodeIds) + { + var offsetVec = new Vector3d(); + if (offsets != null) + { + foreach (StbWallOffset offset in offsets) + { + if (nodeId == offset.id_node) + { + offsetVec = new Vector3d(offset.offset_X, offset.offset_Y, offset.offset_Z); + break; + } + } + } + + StbNode node = _nodes.First(n => n.id == nodeId); + topPts.Add(new Point3d(node.X, node.Y, node.Z) + offsetVec); + } + + topPts.Add(topPts[0]); + var centerCurve = new PolylineCurve(topPts); + Vector3d normal = Vector3d.CrossProduct(centerCurve.TangentAtEnd, centerCurve.TangentAtStart); + curveList[0] = new PolylineCurve(topPts.Select(pt => pt + normal * thickness / 2)); + curveList[1] = new PolylineCurve(topPts.Select(pt => pt - normal * thickness / 2)); + brepList.Append(new GH_Brep(Brep.CreateFromLoft(curveList, Point3d.Unset, Point3d.Unset, LoftType.Straight, false)[0].CapPlanarHoles(_tolerance[0])), new GH_Path(0, i)); + } + + return brepList; + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/GeometryBaker.cs b/HoaryFox/Component/Utils/Geometry/GeometryBaker.cs new file mode 100644 index 00000000..99c2c85c --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/GeometryBaker.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using Rhino; +using Rhino.DocObjects; + +namespace HoaryFox.Component.Utils.Geometry +{ + public class GeometryBaker + { + public static void MakeParentLayers( + RhinoDoc activeDoc, + IEnumerable parentLayerNames, + IReadOnlyList layerColors) + { + foreach ((string name, int index) in parentLayerNames.Select((name, index) => (name, index))) + { + var parentLayer = new Layer { Name = name, Color = layerColors[index] }; + activeDoc.Layers.Add(parentLayer); + } + } + } +} diff --git a/HoaryFox/Component/Utils/Geometry/SectionCornerPoints.cs b/HoaryFox/Component/Utils/Geometry/SectionCornerPoints.cs new file mode 100644 index 00000000..88c6215b --- /dev/null +++ b/HoaryFox/Component/Utils/Geometry/SectionCornerPoints.cs @@ -0,0 +1,204 @@ +using System; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace HoaryFox.Component.Utils.Geometry +{ + public static class SectionCornerPoints + { + // Y 3 - 2 + // ^ | o | + // o > X 0 - 1 + public static Point3d[] ColumnRect(Point3d pt, double width, double height, Vector3d xAxis, Vector3d yAxis) + { + return new[] + { + pt - xAxis * width / 2 - yAxis * height / 2, + pt + xAxis * width / 2 - yAxis * height / 2, + pt + xAxis * width / 2 + yAxis * height / 2, + pt - xAxis * width / 2 + yAxis * height / 2, + pt - xAxis * width / 2 - yAxis * height / 2, + }; + } + + // 7 - - - - 6 + // 8 - 9 4 - 5 + // Y |o| + // ^ 11-10 3 - 2 + // o > X 0 - - - - 1 + public static Point3d[] ColumnH(Point3d pt, double height, double width, double tw, double tf, Vector3d xAxis, Vector3d yAxis) + { + return new[] + { + pt - xAxis * width / 2 - yAxis * height / 2, + pt + xAxis * width / 2 - yAxis * height / 2, + pt + xAxis * width / 2 - yAxis * (height / 2 - tf), + pt + xAxis * tw / 2 - yAxis * (height / 2 - tf), + pt + xAxis * tw / 2 + yAxis * (height / 2 - tf), + pt + xAxis * width / 2 + yAxis * (height / 2 - tf), + pt + xAxis * width / 2 + yAxis * height / 2, + pt - xAxis * width / 2 + yAxis * height / 2, + pt - xAxis * width / 2 + yAxis * (height / 2 - tf), + pt - xAxis * tw / 2 + yAxis * (height / 2 - tf), + pt - xAxis * tw / 2 - yAxis * (height / 2 - tf), + pt - xAxis * width / 2 - yAxis * (height / 2 - tf), + pt - xAxis * width / 2 - yAxis * height / 2, + }; + } + + public static Point3d[] ColumnL(Point3d pt, double height, double width, double tw, double tf, StbSecRollLType type, Vector3d xAxis, Vector3d yAxis) + { + switch (type) + { + case StbSecRollLType.SINGLE: + return ColumnLSingle(pt, height, width, tw, tf, xAxis, yAxis); + case StbSecRollLType.BACKTOBACK: + return ColumnLBackToBack(pt, height, width, tw, tf, xAxis, yAxis); + case StbSecRollLType.FACETOFACE: + return ColumnLFaceToFace(pt, height, width, tw, tf, xAxis, yAxis); + default: + throw new ArgumentOutOfRangeException(nameof(type), type, null); + } + } + + // TODO: 重心位置をちゃんと計算する + // 今は バウンディングボックスの図心 = STBの節点位置 になっている。 + // 5 - - 4 + // Y | 2 - 3 + // ^ | | o + // o > X 0 1 + private static Point3d[] ColumnLSingle(Point3d pt, double height, double width, double tw, double tf, Vector3d xAxis, Vector3d yAxis) + { + return new[] + { + pt - xAxis * width / 2 - yAxis * height / 2, + pt - xAxis * (width / 2 - tw) - yAxis * height / 2, + pt - xAxis * (width / 2 - tw) + yAxis * (height / 2 - tf), + pt + xAxis * width / 2 + yAxis * (height / 2 - tf), + pt + xAxis * width / 2 + yAxis * height / 2, + pt - xAxis * width / 2 + yAxis * height / 2, + pt - xAxis * width / 2 - yAxis * height / 2, + }; + } + + // 5 - - - - - 4 + // Y 6 - 7 2 - 3 + // ^ | o | + // o > X 0 - 1 + private static Point3d[] ColumnLBackToBack(Point3d pt, double height, double width, double tw, double tf, Vector3d xAxis, Vector3d yAxis) + { + throw new NotImplementedException(); + } + + private static Point3d[] ColumnLFaceToFace(Point3d pt, double height, double width, double tw, double tf, Vector3d xAxis, Vector3d yAxis) + { + throw new NotImplementedException(); + } + + internal static Curve ColumnPipe(Point3d pt, double d, Vector3d zAxis) + { + Plane plane = new Plane(pt, zAxis); + return new ArcCurve(new Circle(plane, d / 2)); + } + + // Z 3 o 2 + // ^ | | + // o > Y 0 - 1 + public static Point3d[] BeamRect(Point3d pt, double depth, double width, Vector3d yAxis, Vector3d zAxis) + { + return new[] + { + pt - yAxis * width / 2 - zAxis * depth, + pt + yAxis * width / 2 - zAxis * depth, + pt + yAxis * width / 2, + pt - yAxis * width / 2, + pt - yAxis * width / 2 - zAxis * depth, + }; + } + + // 7 - -o- - 6 + // 8 - 9 4 - 5 + // Z | | + // ^ 11-10 3 - 2 + // o > Y 0 - - - - 1 + public static Point3d[] BeamH(Point3d pt, double height, double width, double tw, double tf, Vector3d yAxis, Vector3d zAxis) + { + return new[] + { + pt - yAxis * width / 2 - zAxis * height, + pt + yAxis * width / 2 - zAxis * height, + pt + yAxis * width / 2 - zAxis * (height - tf), + pt + yAxis * tw / 2 - zAxis * (height - tf), + pt + yAxis * tw / 2 - zAxis * tf, + pt + yAxis * width / 2 - zAxis * tf, + pt + yAxis * width / 2, + pt - yAxis * width / 2, + pt - yAxis * width / 2 - zAxis * tf, + pt - yAxis * tw / 2 - zAxis * tf, + pt - yAxis * tw / 2 - zAxis * (height - tf), + pt - yAxis * width / 2 - zAxis * (height - tf), + pt - yAxis * width / 2 - zAxis * height, + }; + } + + public static Point3d[] BeamL(Point3d pt, double height, double width, double tw, double tf, StbSecRollLType type, Vector3d yAxis, Vector3d zAxis) + { + switch (type) + { + case StbSecRollLType.SINGLE: + return BeamLSingle(pt, height, width, tw, tf, yAxis, zAxis); + case StbSecRollLType.BACKTOBACK: + return BeamLBackToBack(pt, height, width, tw, tf, yAxis, zAxis); + case StbSecRollLType.FACETOFACE: + return BeamLFaceToFace(pt, height, width, tw, tf, yAxis, zAxis); + default: + throw new ArgumentOutOfRangeException(nameof(type), type, null); + } + } + + // TODO: 断面の原点位置はここでよい？今は4と5の中心 + // 5 - o - 4 + // Z | 2 - - 3 + // ^ | | + // o > Y 0 1 + private static Point3d[] BeamLSingle(Point3d pt, double height, double width, double tw, double tf, Vector3d yAxis, Vector3d zAxis) + { + return new[] + { + pt - yAxis * width / 2 - zAxis * height, + pt - yAxis * (width / 2 - tw) - zAxis * height, + pt - yAxis * (width / 2 - tw) - zAxis * tf, + pt + yAxis * width / 2 - zAxis * tf, + pt + yAxis * width / 2, + pt - yAxis * width / 2, + pt - yAxis * width / 2 - zAxis * height + }; + } + + // 5 - - o - - 4 + // Z 6 - 7 2 - 3 + // ^ | | + // o > Y 0 - 1 + private static Point3d[] BeamLBackToBack(Point3d pt, double height, double width, double tw, double tf, Vector3d yAxis, Vector3d zAxis) + { + throw new NotImplementedException(); + } + + // 7 - - o - - 6 + // Z | 2 - 3 | + // ^ | | | | + // o > Y 0 - 1 4 - 5 + private static Point3d[] BeamLFaceToFace(Point3d pt, double height, double width, double tw, double tf, Vector3d yAxis, Vector3d zAxis) + { + throw new NotImplementedException(); + } + + + internal static Curve BeamPipe(Point3d pt, double d, Vector3d xAxis) + { + var centerPt = new Point3d(pt.X, pt.Y, pt.Z - d / 2); + var plane = new Plane(centerPt, xAxis); + return new ArcCurve(new Circle(plane, d / 2)); + } + } +} diff --git a/HoaryFox/Component/Utils/TagUtils.cs b/HoaryFox/Component/Utils/TagUtils.cs new file mode 100644 index 00000000..4f2a1ffa --- /dev/null +++ b/HoaryFox/Component/Utils/TagUtils.cs @@ -0,0 +1,440 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using Grasshopper.Kernel.Data; +using Grasshopper.Kernel.Types; +using Rhino.Geometry; +using STBDotNet.v202; + + +namespace HoaryFox.Component.Utils +{ + internal static class TagUtils + { + internal static Point3d GetFrameTagPosition(string idStart, string idEnd, IEnumerable nodes) + { + StbNode startNode = nodes.First(node => node.id == idStart); + StbNode endNode = nodes.First(node => node.id == idEnd); + + return new Point3d((startNode.X + endNode.X) / 2.0, (startNode.Y + endNode.Y) / 2.0, (startNode.Z + endNode.Z) / 2.0 + ); + } + + internal static Point3d GetSlabTagPosition(string idOrder, StbSlabOffset[] offsets, IEnumerable nodes) + { + string[] nodeIds = idOrder.Split(' '); + var pts = new Point3d[nodeIds.Length]; + for (int i = 0; i < nodeIds.Length; i++) + { + string nodeId = nodeIds[i]; + StbNode node = nodes.First(n => n.id == nodeId); + var offsetVec = new Vector3d(); + if (offsets != null) + { + foreach (var offset in offsets.Where(offset => nodeId == offset.id_node)) + { + offsetVec = new Vector3d(offset.offset_X, offset.offset_Y, offset.offset_Z); + } + } + pts[i] = new Point3d(node.X, node.Y, node.Z) + offsetVec; + } + + return new Point3d(pts.Average(n => n.X), pts.Average(n => n.Y), pts.Average(n => n.Z)); + } + + internal static Point3d GetWallTagPosition(string idOrder, StbWallOffset[] offsets, IEnumerable nodes) + { + string[] nodeIds = idOrder.Split(' '); + var pts = new Point3d[nodeIds.Length]; + for (int i = 0; i < nodeIds.Length; i++) + { + string nodeId = nodeIds[i]; + StbNode node = nodes.First(n => n.id == nodeId); + var offsetVec = new Vector3d(); + if (offsets != null) + { + foreach (var offset in offsets.Where(offset => nodeId == offset.id_node)) + { + offsetVec = new Vector3d(offset.offset_X, offset.offset_Y, offset.offset_Z); + } + } + pts[i] = new Point3d(node.X, node.Y, node.Z) + offsetVec; + } + + return new Point3d(pts.Average(n => n.X), pts.Average(n => n.Y), pts.Average(n => n.Z)); + } + + internal static IEnumerable GetBeamRcSection(object rcFigure, string strength) + { + var ghSecStrings = new GH_Structure(); + switch (rcFigure) + { + case StbSecBeam_RC_Straight figure: + ghSecStrings.Append(new GH_String("BD-" + figure.width + "x" + figure.depth + "(" + strength + ")")); + break; + case StbSecBeam_RC_Haunch figure: + ghSecStrings.Append(new GH_String(figure.pos + ": BD-" + figure.width + "x" + figure.depth + "(" + strength + ")")); + break; + case StbSecBeam_RC_Taper figure: + ghSecStrings.Append(new GH_String(figure.pos + ": BD-" + figure.width + "x" + figure.depth + "(" + strength + ")")); + break; + case StbSecBeam_SRC_Straight figure: + ghSecStrings.Append(new GH_String("BD-" + figure.width + "x" + figure.depth + "(" + strength + ")")); + break; + case StbSecBeam_SRC_Haunch figure: + ghSecStrings.Append(new GH_String(figure.pos + ": BD-" + figure.width + "x" + figure.depth + "(" + strength + ")")); + break; + case StbSecBeam_SRC_Taper figure: + ghSecStrings.Append(new GH_String(figure.pos + ": BD-" + figure.width + "x" + figure.depth + "(" + strength + ")")); + break; + } + + return ghSecStrings; + } + + internal static IEnumerable GetColumnRcSection(object rcFigure, string strength) + { + var ghSecStrings = new GH_Structure(); + switch (rcFigure) + { + case StbSecColumn_RC_Rect figure: + ghSecStrings.Append(new GH_String("CD-" + figure.width_X + "x" + figure.width_Y + "(" + strength + ")")); + break; + case StbSecColumn_RC_Circle figure: + ghSecStrings.Append(new GH_String("P-" + figure.D + "(" + strength + ")")); + break; + case StbSecColumn_SRC_Rect figure: + ghSecStrings.Append(new GH_String("CD-" + figure.width_X + "x" + figure.width_Y + "(" + strength + ")")); + break; + case StbSecColumn_SRC_Circle figure: + ghSecStrings.Append(new GH_String("P-" + figure.D + "(" + strength + ")")); + break; + } + + return ghSecStrings; + } + + internal static IEnumerable GetBeamSSection(object steelFigure) + { + var ghSecStrings = new GH_Structure(); + switch (steelFigure) + { + case StbSecSteelBeam_S_Haunch figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBeam_S_FiveTypes figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBeam_S_Taper figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBeam_S_Straight figure: + ghSecStrings.Append(new GH_String(figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBeam_SRC_Haunch figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBeam_SRC_FiveTypes figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBeam_SRC_Taper figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBeam_SRC_Straight figure: + ghSecStrings.Append(new GH_String(figure.shape + "(" + figure.strength_main + ")")); + break; + } + + return ghSecStrings; + } + + internal static IEnumerable GetBraceSSection(object steelFigure) + { + var ghSecStrings = new GH_Structure(); + switch (steelFigure) + { + case StbSecSteelBrace_S_Same figure: + ghSecStrings.Append(new GH_String(figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBrace_S_NotSame figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelBrace_S_ThreeTypes figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + } + + return ghSecStrings; + } + + internal static IEnumerable GetColumnSSection(object steelFigure) + { + var ghSecStrings = new GH_Structure(); + switch (steelFigure) + { + case StbSecSteelColumn_S_Same figure: + ghSecStrings.Append(new GH_String(figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelColumn_S_NotSame figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelColumn_S_ThreeTypes figure: + ghSecStrings.Append(new GH_String(figure.pos + ":" + figure.shape + "(" + figure.strength_main + ")")); + break; + case StbSecSteelColumn_SRC_Same figure: + ghSecStrings.Append(GetColumnSrcInnerSteelShape(figure.Item, string.Empty)); + break; + case StbSecSteelColumn_SRC_NotSame figure: + ghSecStrings.Append(GetColumnSrcInnerSteelShape(figure.Item, figure.pos.ToString())); + break; + case StbSecSteelColumn_SRC_ThreeTypes figure: + ghSecStrings.Append(GetColumnSrcInnerSteelShape(figure.Item, figure.pos.ToString())); + break; + } + + return ghSecStrings; + } + + private static GH_String GetColumnSrcInnerSteelShape(object figure, string pos) + { + switch (figure) + { + // Shape H + case StbSecColumn_SRC_SameShapeH shape: + return new GH_String(shape.shape + "(" + shape.strength_main + ")"); + case StbSecColumn_SRC_NotSameShapeH shape: + return new GH_String(pos + ":" + shape.shape + "(" + shape.strength_main + ")"); + case StbSecColumn_SRC_ThreeTypesShapeH shape: + return new GH_String(pos + ":" + shape.shape + "(" + shape.strength_main + ")"); + // Shape Box + case StbSecColumn_SRC_SameShapeBox shape: + return new GH_String(shape.shape + "(" + shape.strength + ")"); + case StbSecColumn_SRC_NotSameShapeBox shape: + return new GH_String(pos + ":" + shape.shape + "(" + shape.strength + ")"); + case StbSecColumn_SRC_ThreeTypesShapeBox shape: + return new GH_String(pos + ":" + shape.shape + "(" + shape.strength + ")"); + // Shape Pipe + case StbSecColumn_SRC_SameShapePipe shape: + return new GH_String(shape.shape + "(" + shape.strength + ")"); + case StbSecColumn_SRC_NotSameShapePipe shape: + return new GH_String(pos + ":" + shape.shape + "(" + shape.strength + ")"); + case StbSecColumn_SRC_ThreeTypesShapePipe shape: + return new GH_String(pos + ":" + shape.shape + "(" + shape.strength + ")"); + // Shape Cross + case StbSecColumn_SRC_SameShapeCross shape: + return new GH_String("X:" + shape.shape_X + "(" + shape.strength_main_X + ")" + "Y:" + shape.shape_Y + "(" + shape.strength_main_Y + ")"); + case StbSecColumn_SRC_NotSameShapeCross shape: + return new GH_String(pos + ":" + "X:" + shape.shape_X + "(" + shape.strength_main_X + ")" + "Y:" + shape.shape_Y + "(" + shape.strength_main_Y + ")"); + case StbSecColumn_SRC_ThreeTypesShapeCross shape: + return new GH_String(pos + ":" + "X:" + shape.shape_X + "(" + shape.strength_main_X + ")" + "Y:" + shape.shape_Y + "(" + shape.strength_main_Y + ")"); + // Shape T + case StbSecColumn_SRC_SameShapeT shape: + return new GH_String("H:" + shape.shape_H + "(" + shape.strength_main_H + ")" + "T:" + shape.shape_T + "(" + shape.strength_main_T + ")"); + case StbSecColumn_SRC_NotSameShapeT shape: + return new GH_String(pos + ":" + "H:" + shape.shape_H + "(" + shape.strength_main_H + ")" + "T:" + shape.shape_T + "(" + shape.strength_main_T + ")"); + case StbSecColumn_SRC_ThreeTypesShapeT shape: + return new GH_String(pos + ":" + "H:" + shape.shape_H + "(" + shape.strength_main_H + ")" + "T:" + shape.shape_T + "(" + shape.strength_main_T + ")"); + default: + throw new ArgumentException("Unsupported SRC inner Steel type"); + } + } + + internal static IEnumerable GetSlabRcSection(object slabFigure, string strength) + { + var ghSecString = new GH_Structure(); + switch (slabFigure) + { + case StbSecSlab_RC_Straight figure: + ghSecString.Append(new GH_String("t=" + figure.depth + "(" + strength + ")")); + break; + case StbSecSlab_RC_Taper figure: + ghSecString.Append(new GH_String("t=" + figure.pos + ":" + figure.depth + "(" + strength + ")")); + break; + case StbSecSlab_RC_Haunch figure: + ghSecString.Append(new GH_String("t=" + figure.pos + ":" + figure.depth + "(" + strength + ")")); + break; + } + + return ghSecString; + } + + internal static IEnumerable GetSlabDeckSection(StbSecSlabDeckStraight figure, string strength) + { + var ghSecString = new GH_Structure(); + ghSecString.Append(new GH_String("t=" + figure.depth + "(" + strength + ")")); + + return ghSecString; + } + + internal static IEnumerable GetSlabPrecastSection(StbSecSlabPrecastPrecast_type type, StbSecProductSlabPrecast figure, string strength) + { + var ghSecString = new GH_Structure(); + ghSecString.Append(new GH_String("t=" + figure.depth + "(" + strength + ", type:" + type + ")")); + + return ghSecString; + } + + internal static IEnumerable GetWallRcSection(StbSecWall_RC_Straight figure, string strength) + { + var ghSecString = new GH_Structure(); + ghSecString.Append(new GH_String("t=" + figure.t + "(" + strength + ")")); + + return ghSecString; + } + + public static Dictionary[][] GetAllSectionInfoArray(StbMembers members, StbSections sections) + { + var allTagList = new Dictionary[7][]; + + var memberArray = new object[][] { members.StbColumns, members.StbGirders, members.StbPosts, members.StbBeams, members.StbBraces, members.StbSlabs, members.StbWalls }; + for (var i = 0; i < 7; i++) + { + allTagList[i] = memberArray[i] != null ? StbMembersToDictArray(memberArray[i], sections) : Array.Empty>(); + } + + return allTagList; + } + + private static Dictionary[] StbMembersToDictArray(IReadOnlyList members, StbSections sections) + { + var propertiesArray = new Dictionary[members.Count]; + + object item = members[0]; + Type t = item.GetType(); + + foreach ((object member, int index) in members.Select((column, index) => (column, index))) + { + propertiesArray[index] = GetMemberInfoDictionary(t, member, sections); + } + + return propertiesArray; + } + + private static Dictionary GetMemberInfoDictionary(Type type, object member, StbSections sections) + { + PropertyInfo[] props = type.GetProperties(); + var instanceProps = new Dictionary { { "stb_element_type", type.Name } }; + foreach (PropertyInfo prop in props) + { + if (prop.GetValue(member) == null) + { + continue; + } + try + { + instanceProps.Add(prop.Name, prop.GetValue(member).ToString()); + } + catch + { + // ignored + } + } + AppendSectionInfos(instanceProps, sections); + + return instanceProps; + } + + private static void AppendSectionInfos(IDictionary pDict, StbSections sections) + { + var sectionInfo = new List(); + switch (pDict["stb_element_type"]) + { + case "StbColumn": + case "StbPost": + switch (pDict["kind_structure"]) + { + case "RC": + StbSecColumn_RC columnRc = sections.StbSecColumn_RC.First(sec => sec.id == pDict["id_section"]); + sectionInfo = GetColumnRcSection(columnRc.StbSecFigureColumn_RC.Item, columnRc.strength_concrete).ToList(); + break; + case "SRC": + StbSecColumn_SRC columnSrc = sections.StbSecColumn_SRC.First(sec => sec.id == pDict["id_section"]); + sectionInfo = GetColumnRcSection(columnSrc.StbSecFigureColumn_SRC.Item, columnSrc.strength_concrete).ToList(); + foreach (object item in columnSrc.StbSecSteelFigureColumn_SRC.Items) + { + sectionInfo.AddRange(GetColumnSSection(item).ToList()); + } + break; + case "S": + StbSecSteelFigureColumn_S sFigure = sections.StbSecColumn_S.First(sec => sec.id == pDict["id_section"]).StbSecSteelFigureColumn_S; + foreach (object item in sFigure.Items) + { + sectionInfo.AddRange(GetColumnSSection(item).ToList()); + } + break; + } + break; + case "StbGirder": + case "StbBeam": + switch (pDict["kind_structure"]) + { + case "RC": + StbSecBeam_RC beamRc = sections.StbSecBeam_RC.First(sec => sec.id == pDict["id_section"]); + foreach (object item in beamRc.StbSecFigureBeam_RC.Items) + { + sectionInfo.AddRange(GetBeamRcSection(item, beamRc.strength_concrete)); + } + break; + case "SRC": + StbSecBeam_SRC beamSrc = sections.StbSecBeam_SRC.First(sec => sec.id == pDict["id_section"]); + foreach (object item in beamSrc.StbSecFigureBeam_SRC.Items) + { + sectionInfo.AddRange(GetBeamRcSection(item, beamSrc.strength_concrete)); + } + + foreach (object item in beamSrc.StbSecSteelFigureBeam_SRC.Items) + { + sectionInfo.AddRange(GetBeamSSection(item).ToList()); + } + break; + case "S": + StbSecSteelFigureBeam_S sFigure = sections.StbSecBeam_S.First(sec => sec.id == pDict["id_section"]).StbSecSteelFigureBeam_S; + foreach (object item in sFigure.Items) + { + sectionInfo.AddRange(GetBeamSSection(item).ToList()); + } + break; + } + break; + case "StbBrace": + switch (pDict["kind_structure"]) + { + case "S": + StbSecSteelFigureBrace_S sFigure = sections.StbSecBrace_S.First(sec => sec.id == pDict["id_section"]).StbSecSteelFigureBrace_S; + foreach (object item in sFigure.Items) + { + sectionInfo.AddRange(GetBraceSSection(item).ToList()); + } + break; + } + break; + case "StbSlab": + switch (pDict["kind_structure"]) + { + case "RC": + StbSecSlab_RC slabRc = sections.StbSecSlab_RC.First(sec => sec.id == pDict["id_section"]); + foreach (object item in slabRc.StbSecFigureSlab_RC.Items) + { + sectionInfo.AddRange(GetSlabRcSection(item, slabRc.strength_concrete).ToList()); + } + break; + case "DECK": + case "PRECAST": + break; + } + break; + case "StbWall": // RC しかない + StbSecWall_RC wallRc = sections.StbSecWall_RC.First(sec => sec.id == pDict["id_section"]); + sectionInfo = GetWallRcSection(wallRc.StbSecFigureWall_RC.StbSecWall_RC_Straight, wallRc.strength_concrete).ToList(); + break; + } + + foreach ((string str, int i) in sectionInfo.Select((str, i) => (str.ToString(), i))) + { + pDict.Add($"Figure{i}", str); + } + } + + } +} diff --git a/HoaryFox/HoaryFox.csproj b/HoaryFox/HoaryFox.csproj index f2db0c4b..e123cd2d 100644 --- a/HoaryFox/HoaryFox.csproj +++ b/HoaryFox/HoaryFox.csproj @@ -1,148 +1,41 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {9637855D-D144-4448-9F56-A391A3575DAC} - Library - Properties - HoaryFox - HoaryFox - v4.7.2 - 512 - false - - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - false - - - pdbonly - true - bin\ - TRACE - prompt - 4 + net48 + 1.0 + HoaryFox + Description of HoaryFox + .gha + hrntsm + true + true + true + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True + + + + + + + True + True Resource.resx + - - False - Library\STBReader.dll - True - - - - - - - - - - - - - - - - - - - - - - - - - - - + ResXFileCodeGenerator Resource.Designer.cs - - - - - - - - - - - - 6.20.19322.20361 - compile; build; native; contentfiles; analyzers; buildtransitive - - - 6.20.19322.20361 - compile; build; native; contentfiles; analyzers; buildtransitive - - - - - - - Copy "$(TargetPath)" "$(TargetDir)$(ProjectName).gha" -Erase "$(TargetPath)" - - - en-US - - + + C:\Program Files\Rhino 6\System\Rhino.exe - - + Program + \ No newline at end of file diff --git a/HoaryFox/Library/STBReader.dll b/HoaryFox/Library/STBReader.dll deleted file mode 100644 index c2851d80..00000000 Binary files a/HoaryFox/Library/STBReader.dll and /dev/null differ diff --git a/HoaryFox/Member/CreateBar.cs b/HoaryFox/Member/CreateBar.cs deleted file mode 100644 index 61f14e26..00000000 --- a/HoaryFox/Member/CreateBar.cs +++ /dev/null @@ -1,255 +0,0 @@ -//using System; -//using System.Collections.Generic; -//using Rhino.Geometry; - -//using HoaryFox.STB; -//using HoaryFox.Component.Bar; - -//namespace HoaryFox.Util -//{ -// public class CreateBar -// { -// private readonly StbNodes _nodes; - -// public CreateBar(StbNodes nodes) -// { -// this._nodes = nodes; -// } - -// public List Slab(StbSlabs slabs) -// { -// List brep = new List(); -// return brep; -// } - -// public List Wall(StbWalls walls) -// { -// List brep = new List(); -// return brep; -// } - -// public List Frame(StbFrame frame) -// { -// List brep = new List(); - -// double height = -1; -// double width = -1; -// string shape = string.Empty; -// ShapeTypes shapeType = ShapeTypes.H; - -// for (int eNum = 0; eNum < frame.Id.Count; eNum++) -// { -// int idSection = frame.IdSection[eNum]; -// KindsStructure kind = frame.KindStructure[eNum]; - -// // 始点と終点の座標取得 -// int nodeIndexStart = _nodes.Id.IndexOf(frame.IdNodeStart[eNum]); -// int nodeIndexEnd = _nodes.Id.IndexOf(frame.IdNodeEnd[eNum]); -// Point3d nodeStart = new Point3d(_nodes.X[nodeIndexStart], _nodes.Y[nodeIndexStart], _nodes.Z[nodeIndexStart]); -// Point3d nodeEnd = new Point3d(_nodes.X[nodeIndexEnd], _nodes.Y[nodeIndexEnd], _nodes.Z[nodeIndexEnd]); - -// int secIndex = -1; -// if (kind == KindsStructure.RC) -// { -// switch (frame.FrameType) -// { -// case FrameType.Column: -// case FrameType.Post: -// secIndex = Stb2Bar.SecColumnRc.Id.IndexOf(idSection); -// height = Stb2Bar.SecColumnRc.Height[secIndex]; -// width = Stb2Bar.SecColumnRc.Width[secIndex]; -// break; -// case FrameType.Girder: -// case FrameType.Beam: -// secIndex = Stb2Bar.SecBeamRc.Id.IndexOf(idSection); -// height = Stb2Bar.SecBeamRc.Depth[secIndex]; -// width = Stb2Bar.SecBeamRc.Width[secIndex]; -// break; -// } - -// shapeType = height <= 0 ? ShapeTypes.Pipe : ShapeTypes.BOX; -// } - -// // 配筋の作成 -// if (kind == KindsStructure.RC) { -// if (shapeType == ShapeTypes.BOX) { -// switch (frame.FrameType) { -// case FrameType.Column: -// case FrameType.Post: -// brep.AddRange(Column(secIndex, nodeStart, nodeEnd, width, height, eNum)); -// break; -// case FrameType.Girder: -// case FrameType.Beam: -// brep.AddRange(Beam(secIndex, nodeStart, nodeEnd, width, height, eNum)); -// break; -// } -// } -// } -// } -// return brep; -// } - -// private List Beam(int index, Point3d nodeStart, Point3d nodeEnd, double width, double height, int eNum) -// { -// var brep = new List(); -// return brep; -// } - -// private List Column(int index, Point3d nodeStart, Point3d nodeEnd, double width, double height, int eNum) -// { -// var brep = new List(); - -// // かぶり、鉄筋径はとりあえずで設定 -// const double kaburi = 50; -// const double bandD = 10; -// const double mainD = 25; -// const double bandSpace = 2 * kaburi + bandD; -// const double main1Space = bandSpace + bandD + mainD; -// double barSpace = Math.Max(1.5 * mainD, 25); // 鉄筋のあき -// double main2Space = main1Space + 2 * (mainD + barSpace); - -// Point3d[,] hoopPos = GetColumnCorner(nodeStart, nodeEnd, width - bandSpace, height - bandSpace); -// Point3d[,] main1Pos = GetColumnCorner(nodeStart, nodeEnd, width - main1Space, height - main1Space); -// Point3d[,] mainX2Pos = GetColumnCorner(nodeStart, nodeEnd, width - main1Space, height - main2Space); -// Point3d[,] mainY2Pos = GetColumnCorner(nodeStart, nodeEnd, width - main2Space, height - main1Space); - -// brep.AddRange(Hoop(hoopPos, bandD, index)); -// brep.AddRange(ColumnMainBar(main1Pos, mainX2Pos, mainY2Pos, barSpace, mainD)); - -// return brep; -// } - -// /// -// /// かぶりを考慮した部材の角のポジションを返す。 -// /// [0, n]はスタート側、[1, n]はエンド側 -// /// -// /// -// /// -// /// -// /// -// /// -// private static Point3d[,] GetColumnCorner(Point3d nodeStart, Point3d nodeEnd, double width, double height) -// { -// // Z 4 - 3 -// // ^ | 0 | -// // o > X 1 - 2 -// Point3d[,] cornerPoint = new Point3d[2, 5]; -// Point3d node = nodeStart; -// double dx = nodeEnd.X - nodeStart.X; -// double dy = nodeEnd.Y - nodeStart.Y; -// double dz = nodeEnd.Z - nodeStart.Z; -// double angleX = -1.0 * Math.Atan2(dx, dy); -// double angleZ = -1.0 * Math.Atan2(dz, dy); - -// for (int i = 0; i < 2; i++) { -// cornerPoint[i, 0] = node; -// cornerPoint[i, 1] = new Point3d(node.X - width / 2.0 * Math.Cos(angleX), -// node.Y - height / 2.0 * Math.Cos(angleZ), -// node.Z - width / 2.0 * Math.Sin(angleX) - height / 2.0 * Math.Sin(angleZ) -// ); -// cornerPoint[i, 2] = new Point3d(node.X + width / 2.0 * Math.Cos(angleX), -// node.Y - height / 2.0 * Math.Cos(angleZ), -// node.Z + width / 2.0 * Math.Sin(angleX) + height / 2.0 * Math.Sin(angleZ) -// ); -// cornerPoint[i, 3] = new Point3d(node.X + width / 2.0 * Math.Cos(angleX), -// node.Y + height / 2.0 * Math.Cos(angleZ), -// node.Z + width / 2.0 * Math.Sin(angleX) + height / 2.0 * Math.Sin(angleZ) -// ); -// cornerPoint[i, 4] = new Point3d(node.X - width / 2.0 * Math.Cos(angleX), -// node.Y + height / 2.0 * Math.Cos(angleZ), -// node.Z - width / 2.0 * Math.Sin(angleX) - height / 2.0 * Math.Sin(angleZ) -// ); -// node = nodeEnd; -// } -// return (cornerPoint); -// } - -// private static List Hoop(Point3d[,] cornerPos, double bandD, int index) -// { -// var brep = new List(); -// double pitch = Stb2Bar.SecColumnRc.BarList[index][5]; -// int dirXNum = Stb2Bar.SecColumnRc.BarList[index][6]; -// int dirYNum = Stb2Bar.SecColumnRc.BarList[index][7]; -// int sumBar = dirXNum + dirYNum; -// Curve crv = new LineCurve(cornerPos[0, 0], cornerPos[1, 0]); -// double distance = crv.GetLength(); -// List pts = new List(); - -// // 中子も含めたpointを求める。 -// Point3d[,] hoopPos = GetBandPos(cornerPos, dirXNum, dirYNum); - -// for (int i = 0; i < dirXNum + dirYNum; i++) -// { -// var rail = new LineCurve(hoopPos[0, 2*i], hoopPos[0, 2*i+1]); -// brep.AddRange(Brep.CreatePipe(rail, bandD / 2.0, true, PipeCapMode.Flat, true, Stb2Bar.LengthTolerance, Stb2Bar.AngleTolerance)); -// } -// for (int i = 0; i < dirXNum + dirYNum; i++) -// { -// var rail = new LineCurve(hoopPos[1, 2*i], hoopPos[1, 2*i+1]); -// brep.AddRange(Brep.CreatePipe(rail, bandD / 2.0, true, PipeCapMode.Flat, true, Stb2Bar.LengthTolerance, Stb2Bar.AngleTolerance)); -// } -// // 始点と終点の間のフープを作成 -// //for (int i = 0; i < dirXNum + dirYNum; i++) -// //{ -// // Point3d[] pts1; -// // Point3d[] pts2; -// // var crv1 = new LineCurve(hoopPos[0, 2 * i], hoopPos[1, 2 * i]); -// // var crv2 = new LineCurve(hoopPos[0, 2 * i + 1], hoopPos[1, 2 * i + 1]); -// // crv1.DivideByCount((int)(distance/pitch), true, out pts1); -// // crv2.DivideByCount((int)(distance/pitch), true, out pts2); - -// // for (int j = 0; j < (int)(distance/pitch); j++) -// // { -// // var rail = new LineCurve(pts1[j], pts2[j]); -// // brep.AddRange(Brep.CreatePipe(rail, bandD / 2.0, true, PipeCapMode.Flat, true, Stb2Bar.LengthTolerance, Stb2Bar.AngleTolerance)); -// // } -// //} - -// return brep; -// } - -// static Point3d[,] GetBandPos(Point3d[,] cornerPos, int dirXNum, int dirYNum) { -// Point3d[,] bandPos = new Point3d[2, 2 * (dirXNum + dirYNum)]; -// Point3d[] pts1; -// Point3d[] pts2; - -// // dir_X -// for (int j = 0; j < 2; j++) { -// var crv1 = new LineCurve(cornerPos[j, 1], cornerPos[j, 4]); -// var crv2 = new LineCurve(cornerPos[j, 2], cornerPos[j, 3]); - -// crv1.DivideByCount(dirXNum, true, out pts1); -// crv2.DivideByCount(dirXNum, true, out pts2); - -// for (int i = 0; i < dirXNum; i++) -// { -// bandPos[j, 2 * i] = pts1[i]; -// bandPos[j, 2 * i + 1] = pts2[i]; -// } -// } -// // dir_Y -// for (int j = 0; j < 2; j++) { -// var crv1 = new LineCurve(cornerPos[j, 1], cornerPos[j, 2]); -// var crv2 = new LineCurve(cornerPos[j, 4], cornerPos[j, 3]); - -// crv1.DivideByCount(dirXNum, true, out pts1); -// crv2.DivideByCount(dirXNum, true, out pts2); - -// for (int i = dirXNum; i < dirXNum + dirYNum; i++) -// { -// bandPos[j, 2 * i] = pts1[i - dirXNum]; -// bandPos[j, 2 * i + 1] = pts2[i - dirXNum]; -// } -// } - -// return (bandPos); -// } - -// private static List ColumnMainBar(Point3d[,] main1Pos, Point3d[,] mainX2Pos, Point3d[,] mainY2Pos, double barSpace, double mainD) -// { -// var brep = new List(); - -// return brep; -// } -// } -//} diff --git a/HoaryFox/Member/CreateBreps.cs b/HoaryFox/Member/CreateBreps.cs deleted file mode 100644 index 2104f7bb..00000000 --- a/HoaryFox/Member/CreateBreps.cs +++ /dev/null @@ -1,182 +0,0 @@ -using System; -using System.Collections.Generic; -using Rhino.Geometry; -using STBReader; -using STBReader.Member; -using STBReader.Section; - -namespace HoaryFox.Member -{ - public static class CreateBreps - { - public static IEnumerable FromEndPoint(StbData stbData, ShapeInfo shapeInfo, ShapeTypes shapeType, FrameType frameType) - { - Vector3d dVector = shapeInfo.NodeEnd - shapeInfo.NodeStart; - var angles = new List - { - -1 * Math.Atan2(dVector.Y, dVector.X), - -1 * Math.Atan2(dVector.Z, dVector.X) - }; - - List> origins = GetOriginPoints(frameType, shapeInfo, angles); - List breps = GetSecBrep(stbData, shapeType, origins, shapeInfo); - IEnumerable brepRot = ApplyRotation(breps, shapeInfo.Rotate, frameType, origins); - return brepRot; - } - - private static IEnumerable ApplyRotation(IReadOnlyCollection breps, double rotate, FrameType frameType, IReadOnlyList> origins) - { - double rotateAngle = rotate * Math.PI / 180d; - var rotationCenter = new Point3d[2]; - if (frameType == FrameType.Girder || frameType == FrameType.Beam) - { - rotationCenter[0] = new Point3d(origins[0][4]); - rotationCenter[1] = new Point3d(origins[0][4]); - } - else - { - rotationCenter[0] = new Point3d( - (origins[0][1].X + origins[0][4].X) / 2, (origins[0][1].Y + origins[0][4].Y) / 2, (origins[0][1].Z + origins[0][4].Z) / 2 - ); - rotationCenter[1] = new Point3d( - (origins[1][1].X + origins[1][4].X) / 2, (origins[1][1].Y + origins[1][4].Y) / 2, (origins[1][1].Z + origins[1][4].Z) / 2 - ); - } - var rotationAxis = new Vector3d(rotationCenter[1] - rotationCenter[0]); - foreach (Brep b in breps) - { - b.Rotate(rotateAngle, rotationAxis, rotationCenter[0]); - } - return breps; - } - - private static List GetSecBrep(StbData stbData, ShapeTypes shapeType, IReadOnlyList> origins, ShapeInfo shapeInfo) - { - var secBrep = new SteelCroSecBrep(stbData, origins); - switch (shapeType) - { - case ShapeTypes.H: - return secBrep.HShape(); - case ShapeTypes.BOX: - case ShapeTypes.BuildBOX: - case ShapeTypes.RollBOX: - case ShapeTypes.FB: - return secBrep.BoxShape(); - case ShapeTypes.Bar: - case ShapeTypes.Pipe: - return secBrep.PipeShape(shapeInfo); - case ShapeTypes.L: - return secBrep.LShape(); - case ShapeTypes.T: - return secBrep.TShape(); - case ShapeTypes.C: - return secBrep.CShape(); - default: - throw new ArgumentOutOfRangeException(nameof(shapeType), shapeType, null); - } - } - - // 梁は部材天端の中心が起点に対して、柱・ブレースは部材芯が起点なので場合分け - private static List> GetOriginPoints(FrameType frameType, ShapeInfo shapeInfo, IReadOnlyList angles) - { - var origin = new List>(); - switch (frameType) - { - case FrameType.Column: - case FrameType.Post: - origin.Add(FramePoints.Column(shapeInfo.NodeStart, shapeInfo.Width, shapeInfo.Height, angles[1])); - origin.Add(FramePoints.Column(shapeInfo.NodeEnd, shapeInfo.Width, shapeInfo.Height, angles[1])); - break; - case FrameType.Girder: - case FrameType.Beam: - origin.Add(FramePoints.Girder(shapeInfo.NodeStart, shapeInfo.Width, shapeInfo.Height, angles[0])); - origin.Add(FramePoints.Girder(shapeInfo.NodeEnd, shapeInfo.Width, shapeInfo.Height, angles[0])); - break; - case FrameType.Brace: - origin.Add(FramePoints.Brace(shapeInfo.NodeStart, shapeInfo.Width, angles[0])); - origin.Add(FramePoints.Brace(shapeInfo.NodeEnd, shapeInfo.Width, angles[0])); - break; - default: - throw new ArgumentOutOfRangeException(nameof(frameType), frameType, null); - } - - return origin; - } - - - public static Brep PlaneWithOpens(StbData stbData, Point3d[] pts, StbOpen open) - { - Brep brep; - double tol = stbData.ToleLength; - - try - { - brep = CreatePlaneBreps(pts, tol); - } - catch (NullReferenceException) - { - brep = null; - } - - Brep planeWithOpens = ApplyOpens(brep, pts, open, tol); - - return planeWithOpens; - } - - private static Brep ApplyOpens(Brep brep, IReadOnlyCollection pts, StbOpen open, double tol) - { - Brep planeWithOpens = brep; - if (open == null || pts.Count != 4 || open.Id.Count == 0 || brep == null) - { - return planeWithOpens; - } - - Surface surface = brep.Surfaces[0]; - var trimSurf = new List(); - - try - { - for (var i = 0; i < open.Id.Count; i++) - { - var intervalX = new Interval(open.PositionX[i], open.PositionX[i] + open.LengthX[i]); - var intervalY = new Interval(open.PositionY[i], open.PositionY[i] + open.LengthY[i]); - trimSurf.Add(surface.Trim(intervalX, intervalY).ToBrep()); - } - planeWithOpens = Brep.CreateBooleanDifference(new[] { brep }, trimSurf, tol)[0]; - } - catch (NullReferenceException) - { - planeWithOpens = brep; - } - - return planeWithOpens; - } - - private static Brep CreatePlaneBreps(IReadOnlyList pts, double tol) - { - switch (pts.Count) - { - case 3: - return Brep.CreateFromCornerPoints(pts[0], pts[1], pts[2], tol); - case 4: - return Brep.CreateFromCornerPoints(pts[0], pts[1], pts[2], pts[3], tol); - default: - var centerPt = new Point3d(); - - foreach (Point3d pt in pts) - { - centerPt.X += pt.X / pts.Count; - centerPt.Y += pt.Y / pts.Count; - centerPt.Z += pt.Z / pts.Count; - } - var brep = Brep.CreateFromCornerPoints(pts[0], pts[1], centerPt, tol); - for (var i = 0; i < pts.Count - 2; i++) - { - brep.Join(Brep.CreateFromCornerPoints(pts[i + 1], pts[i + 2], centerPt, tol), tol, false); - } - brep.Join(Brep.CreateFromCornerPoints(pts[pts.Count - 1], pts[0], centerPt, tol), tol, true); - return brep; - } - } - } -} diff --git a/HoaryFox/Member/CreateTag.cs b/HoaryFox/Member/CreateTag.cs deleted file mode 100644 index 2c773dbc..00000000 --- a/HoaryFox/Member/CreateTag.cs +++ /dev/null @@ -1,223 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using Grasshopper.GUI; -using Grasshopper.Kernel.Data; -using Grasshopper.Kernel.Types; -using Rhino.Geometry; -using STBReader; -using STBReader.Member; -using STBReader.Model; -using STBReader.Section; - -namespace HoaryFox.Member -{ - public class CreateTag - { - private readonly StbNodes _nodes; - private readonly StbSecColumnRc _colRc; - private readonly StbSecColumnS _colS; - private readonly StbSecBeamRc _beamRc; - private readonly StbSecBeamS _beamS; - private readonly StbSecBraceS _braceS; - private readonly StbSecSteel _secSteel; - public List Position { get; } = new List(); - - public CreateTag(StbNodes nodes, StbSecColumnRc colRc, StbSecColumnS colS, StbSecBeamRc beamRc, StbSecBeamS beamS, StbSecBraceS braceS, StbSecSteel secSteel) - { - _nodes = nodes; - _secSteel = secSteel; - _braceS = braceS; - _beamS = beamS; - _beamRc = beamRc; - _colS = colS; - _colRc = colRc; - } - - public GH_Structure FrameGHStructure(StbFrame frameData) - { - var ghSecStrings = new GH_Structure(); - - for (var eNum = 0; eNum < frameData.Id.Count; eNum++) - { - TagInfo tagInfo; - int idSection = frameData.IdSection[eNum]; - var ghPath = new GH_Path(new[] { eNum }); - KindsStructure kind = frameData.KindStructure[eNum]; - SetTagPosition(frameData, eNum); - - switch (kind) - { - case KindsStructure.Rc: - tagInfo = TagRc(frameData, idSection); - break; - case KindsStructure.S: - tagInfo = TagSteel(frameData, idSection); - break; - case KindsStructure.Src: - case KindsStructure.Cft: - case KindsStructure.Deck: - case KindsStructure.Precast: - case KindsStructure.Other: - throw new ArgumentException("Wrong kind structure"); - default: - throw new ArgumentOutOfRangeException(); - } - - ghSecStrings.Append(new GH_String(tagInfo.Name), ghPath); - ghSecStrings.Append(new GH_String(tagInfo.ShapeTypes.ToString()), ghPath); - ghSecStrings.Append(new GH_String(tagInfo.P1.ToString(CultureInfo.InvariantCulture)), ghPath); - ghSecStrings.Append(new GH_String(tagInfo.P2.ToString(CultureInfo.InvariantCulture)), ghPath); - ghSecStrings.Append(new GH_String(tagInfo.P3.ToString(CultureInfo.InvariantCulture)), ghPath); - ghSecStrings.Append(new GH_String(tagInfo.P4.ToString(CultureInfo.InvariantCulture)), ghPath); - } - - return ghSecStrings; - } - - public List> FrameList(StbFrame frameData) - { - var tags = new List>(); - - for (var eNum = 0; eNum < frameData.Id.Count; eNum++) - { - TagInfo tagInfo; - var tag = new List(); - int idSection = frameData.IdSection[eNum]; - KindsStructure kind = frameData.KindStructure[eNum]; - SetTagPosition(frameData, eNum); - - switch (kind) - { - case KindsStructure.Rc: - tagInfo = TagRc(frameData, idSection); - break; - case KindsStructure.S: - tagInfo = TagSteel(frameData, idSection); - break; - case KindsStructure.Src: - case KindsStructure.Cft: - case KindsStructure.Deck: - case KindsStructure.Precast: - case KindsStructure.Other: - throw new ArgumentException("Wrong kind structure"); - default: - throw new ArgumentOutOfRangeException(); - } - - tag.Add(tagInfo.Name); - tag.Add(tagInfo.ShapeTypes.ToString()); - tag.Add(tagInfo.P1.ToString()); - tag.Add(tagInfo.P2.ToString()); - tag.Add(tagInfo.P3.ToString()); - tag.Add(tagInfo.P4.ToString()); - tag.Add(kind.ToString()); - tags.Add(tag); - } - - return tags; - } - - private void SetTagPosition(StbFrame frame, int eNum) - { - // 始点と終点の座標取得 - int startIndex = _nodes.Id.IndexOf(frame.IdNodeStart[eNum]); - int endIndex = _nodes.Id.IndexOf(frame.IdNodeEnd[eNum]); - var nodeStart = new Point3d(_nodes.X[startIndex], _nodes.Y[startIndex], _nodes.Z[startIndex]); - var nodeEnd = new Point3d(_nodes.X[endIndex], _nodes.Y[endIndex], _nodes.Z[endIndex]); - Position.Add(new Point3d((nodeStart.X + nodeEnd.X) / 2.0, (nodeStart.Y + nodeEnd.Y) / 2.0, (nodeStart.Z + nodeEnd.Z) / 2.0)); - } - - private TagInfo TagSteel(StbFrame frame, int idSection) - { - int idShape; - string shapeName; - switch (frame.FrameType) - { - case FrameType.Column: - case FrameType.Post: - idShape = _colS.Id.IndexOf(idSection); - shapeName = _colS.Shape[idShape]; - break; - case FrameType.Girder: - case FrameType.Beam: - idShape = _beamS.Id.IndexOf(idSection); - shapeName = _beamS.Shape[idShape]; - break; - case FrameType.Brace: - idShape = _braceS.Id.IndexOf(idSection); - shapeName = _braceS.Shape[idShape]; - break; - case FrameType.Slab: - case FrameType.Wall: - case FrameType.Any: - throw new ArgumentException("Wrong frame type"); - default: - throw new ArgumentOutOfRangeException(); - } - - int secIndex = _secSteel.Name.IndexOf(shapeName); - var tagInfo = new TagInfo - { - Name = _secSteel.Name[secIndex], - ShapeTypes = _secSteel.ShapeType[secIndex], - P1 = _secSteel.P1[secIndex], - P2 = _secSteel.P2[secIndex], - P3 = _secSteel.P3[secIndex], - P4 = _secSteel.P4[secIndex] - }; - return tagInfo; - } - - private TagInfo TagRc(StbFrame frame, int idSection) - { - int secIndex; - TagInfo tagInfo; - switch (frame.FrameType) - { - case FrameType.Column: - case FrameType.Post: - secIndex = _colRc.Id.IndexOf(idSection); - tagInfo = new TagInfo(_colRc.Name[secIndex], _colRc.Height[secIndex], _colRc.Width[secIndex], 0d, 0d); - break; - case FrameType.Girder: - case FrameType.Beam: - secIndex = _beamRc.Id.IndexOf(idSection); - tagInfo = new TagInfo(_beamRc.Name[secIndex], _beamRc.Depth[secIndex], _beamRc.Width[secIndex], 0d, 0d); - break; - case FrameType.Brace: - case FrameType.Slab: - case FrameType.Wall: - case FrameType.Any: - throw new ArgumentException("Wrong frame type"); - default: - throw new ArgumentOutOfRangeException(); - } - tagInfo.ShapeTypes = tagInfo.P1 <= 0 ? ShapeTypes.Pipe : ShapeTypes.BOX; - return tagInfo; - } - } - - public class TagInfo - { - public string Name { get; set; } - public ShapeTypes ShapeTypes { get; set; } - public double P1 { get; set; } - public double P2 { get; set; } - public double P3 { get; set; } - public double P4 { get; set; } - - public TagInfo() - { - } - - public TagInfo(string name, double p1, double p2, double p3, double p4) - { - Name = name; - P1 = p1; - P2 = p2; - P3 = p3; - P4 = p4; - } - } -} diff --git a/HoaryFox/Member/FrameBreps.cs b/HoaryFox/Member/FrameBreps.cs deleted file mode 100644 index 10879705..00000000 --- a/HoaryFox/Member/FrameBreps.cs +++ /dev/null @@ -1,167 +0,0 @@ -using System; -using System.Collections.Generic; -using Rhino.Geometry; -using STBReader; -using STBReader.Member; -using STBReader.Model; -using STBReader.Section; - -namespace HoaryFox.Member -{ - public class FrameBreps - { - private readonly StbData _stbData; - - public FrameBreps(StbData stbData) - { - _stbData = stbData; - } - - public List Slab(StbSlabs slabs) - { - var brep = new List(); - var count = 0; - - foreach (List nodeIds in slabs.NodeIdList) - { - var index = new int[nodeIds.Count]; - var pts = new Point3d[nodeIds.Count]; - double offset = slabs.Level[count]; - - for (var i = 0; i < nodeIds.Count; i++) - { - index[i] = _stbData.Nodes.Id.IndexOf(nodeIds[i]); - pts[i] = new Point3d(_stbData.Nodes.X[index[i]], _stbData.Nodes.Y[index[i]], _stbData.Nodes.Z[index[i]] + offset); - } - - brep.Add(CreateBreps.PlaneWithOpens(_stbData, pts, null)); - count++; - } - - return brep; - } - - public List Wall(StbWalls walls) - { - var brep = new List(); - var count = 0; - - foreach (List nodeIds in walls.NodeIdList) - { - var index = new int[nodeIds.Count]; - var pts = new Point3d[nodeIds.Count]; - - for (var i = 0; i < nodeIds.Count; i++) - { - index[i] = _stbData.Nodes.Id.IndexOf(nodeIds[i]); - pts[i] = new Point3d(_stbData.Nodes.X[index[i]], _stbData.Nodes.Y[index[i]], _stbData.Nodes.Z[index[i]]); - } - - brep.Add(CreateBreps.PlaneWithOpens(_stbData, pts, walls.Opens[count])); - count++; - } - - return brep; - } - - public List Frame(StbFrame frameData) - { - var brep = new List(); - - double height = -1; - double width = -1; - var shape = string.Empty; - var shapeType = ShapeTypes.H; - - for (var eNum = 0; eNum < frameData.Id.Count; eNum++) - { - int idSection = frameData.IdSection[eNum]; - KindsStructure kind = frameData.KindStructure[eNum]; - double rotate = frameData.Rotate[eNum]; - - // 始点と終点の座標取得 - int nodeIndexStart = _stbData.Nodes.Id.IndexOf(frameData.IdNodeStart[eNum]); - int nodeIndexEnd = _stbData.Nodes.Id.IndexOf(frameData.IdNodeEnd[eNum]); - var nodeStart = new Point3d(_stbData.Nodes.X[nodeIndexStart], _stbData.Nodes.Y[nodeIndexStart], _stbData.Nodes.Z[nodeIndexStart]); - var nodeEnd = new Point3d(_stbData.Nodes.X[nodeIndexEnd], _stbData.Nodes.Y[nodeIndexEnd], _stbData.Nodes.Z[nodeIndexEnd]); - - int secIndex; - switch (kind) - { - case KindsStructure.Rc: - switch (frameData.FrameType) - { - case FrameType.Column: - case FrameType.Post: - secIndex = _stbData.SecColumnRc.Id.IndexOf(idSection); - height = _stbData.SecColumnRc.Height[secIndex]; - width = _stbData.SecColumnRc.Width[secIndex]; - break; - case FrameType.Girder: - case FrameType.Beam: - secIndex = _stbData.SecBeamRc.Id.IndexOf(idSection); - height = _stbData.SecBeamRc.Depth[secIndex]; - width = _stbData.SecBeamRc.Width[secIndex]; - break; - case FrameType.Brace: - case FrameType.Slab: - case FrameType.Wall: - case FrameType.Any: - break; - default: - throw new ArgumentOutOfRangeException(); - } - - shapeType = height <= 0 ? ShapeTypes.Pipe : ShapeTypes.BOX; - break; - case KindsStructure.S: - { - int idShape; - switch (frameData.FrameType) - { - case FrameType.Column: - case FrameType.Post: - idShape = _stbData.SecColumnS.Id.IndexOf(idSection); - shape = _stbData.SecColumnS.Shape[idShape]; - break; - case FrameType.Girder: - case FrameType.Beam: - idShape = _stbData.SecBeamS.Id.IndexOf(idSection); - shape = _stbData.SecBeamS.Shape[idShape]; - break; - case FrameType.Brace: - idShape = _stbData.SecBraceS.Id.IndexOf(idSection); - shape = _stbData.SecBraceS.Shape[idShape]; - break; - case FrameType.Slab: - case FrameType.Wall: - case FrameType.Any: - break; - default: - throw new ArgumentOutOfRangeException(); - } - - secIndex = _stbData.SecSteel.Name.IndexOf(shape); - height = _stbData.SecSteel.P1[secIndex]; - width = _stbData.SecSteel.P2[secIndex]; - shapeType = _stbData.SecSteel.ShapeType[secIndex]; - break; - } - case KindsStructure.Src: - case KindsStructure.Cft: - case KindsStructure.Deck: - case KindsStructure.Precast: - case KindsStructure.Other: - break; - default: - throw new ArgumentOutOfRangeException(); - } - - var shapeInfo = new ShapeInfo(nodeStart, nodeEnd, height, width, rotate); - brep.AddRange(CreateBreps.FromEndPoint(_stbData, shapeInfo, shapeType, frameData.FrameType)); - } - - return brep; - } - } -} diff --git a/HoaryFox/Member/FrameLines.cs b/HoaryFox/Member/FrameLines.cs deleted file mode 100644 index 511693b3..00000000 --- a/HoaryFox/Member/FrameLines.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Rhino.Geometry; -using STBReader; -using STBReader.Member; -using STBReader.Model; - -namespace HoaryFox.Member -{ - public class FrameLines - { - private readonly StbData _stbData; - private readonly StbNodes _nodes; - - public FrameLines(StbData stbData) - { - _stbData = stbData; - _nodes = stbData.Nodes; - } - - public List Columns() - { - return CreateFrameLines(_stbData.Columns); - } - - public List Girders() - { - return CreateFrameLines(_stbData.Girders); - } - - public List Posts() - { - return CreateFrameLines(_stbData.Posts); - } - - public List Beams() - { - return CreateFrameLines(_stbData.Beams); - } - - public List Braces() - { - return CreateFrameLines(_stbData.Braces); - } - - public List Nodes() - { - return _nodes.Position.Select(point => new Point3d(point.X, point.Y, point.Z)).ToList(); - } - - private List CreateFrameLines(StbFrame frame) - { - var lines = new List(); - for (var i = 0; i < frame.Id.Count; i++) - { - int idNodeStart = _nodes.Id.IndexOf(frame.IdNodeStart[i]); - int idNodeEnd = _stbData.Nodes.Id.IndexOf(frame.IdNodeEnd[i]); - var ptStart = new Point3d(_nodes.X[idNodeStart], _nodes.Y[idNodeStart], _nodes.Z[idNodeStart]); - var ptEnd = new Point3d(_nodes.X[idNodeEnd], _nodes.Y[idNodeEnd], _nodes.Z[idNodeEnd]); - lines.Add(new Line(ptStart, ptEnd)); - } - return lines; - } - } -} diff --git a/HoaryFox/Member/FramePoints.cs b/HoaryFox/Member/FramePoints.cs deleted file mode 100644 index f6e6248d..00000000 --- a/HoaryFox/Member/FramePoints.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System; -using System.Collections.Generic; -using Rhino.Geometry; - -namespace HoaryFox.Member -{ - public static class FramePoints - { - // Y 3 - 4 - 5 - // ^ | | | - // o > X 0 - 1 - 2 - public static List Column(Point3d node, double width, double height, double angle) - { - var points = new List - { - new Point3d(node.X - width / 2 * Math.Sin(angle), node.Y - height / 2, node.Z - width / 2 * Math.Cos(angle)), - new Point3d(node.X, node.Y + height / 2, node.Z), - new Point3d(node.X + width / 2 * Math.Sin(angle), node.Y - height / 2, node.Z + width / 2 * Math.Cos(angle)), - new Point3d(node.X - width / 2 * Math.Sin(angle), node.Y + height / 2, node.Z - width / 2 * Math.Cos(angle)), - new Point3d(node.X, node.Y - height / 2, node.Z), - new Point3d(node.X + width / 2 * Math.Sin(angle), node.Y + height / 2, node.Z + width / 2 * Math.Cos(angle)) - }; - - return points; - } - - public static List Girder(Point3d node, double width, double height, double angle) - { - var points = new List - { - new Point3d(node.X + width / 2 * Math.Sin(angle), node.Y + width / 2 * Math.Cos(angle), node.Z - height), - new Point3d(node.X, node.Y, node.Z - height), - new Point3d(node.X - width / 2 * Math.Sin(angle), node.Y - width / 2 * Math.Cos(angle), node.Z - height), - new Point3d(node.X + width / 2 * Math.Sin(angle), node.Y + width / 2 * Math.Cos(angle), node.Z), - new Point3d(node.X, node.Y, node.Z), - new Point3d(node.X - width / 2 * Math.Sin(angle), node.Y - width / 2 * Math.Cos(angle), node.Z) - }; - - return points; - } - - public static List Brace(Point3d node, double width, double angle) - { - var points = new List - { - new Point3d(node.X + width / 2 * Math.Sin(angle), node.Y + width / 2 * Math.Cos(angle), node.Z - width / 2), - new Point3d(node.X, node.Y, node.Z - width / 2), - new Point3d(node.X - width / 2 * Math.Sin(angle), node.Y - width / 2 * Math.Cos(angle), node.Z - width / 2), - new Point3d(node.X + width / 2 * Math.Sin(angle), node.Y + width / 2 * Math.Cos(angle), node.Z + width / 2), - new Point3d(node.X, node.Y, node.Z + width / 2), - new Point3d(node.X - width / 2 * Math.Sin(angle), node.Y - width / 2 * Math.Cos(angle), node.Z + width / 2) - }; - - return points; - } - } -} diff --git a/HoaryFox/Member/ShapeInfo.cs b/HoaryFox/Member/ShapeInfo.cs deleted file mode 100644 index d6a0d0f2..00000000 --- a/HoaryFox/Member/ShapeInfo.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using Rhino.Geometry; - -namespace HoaryFox.Member -{ - public readonly struct ShapeInfo : IEquatable - { - public Point3d NodeStart { get; } - public Point3d NodeEnd { get; } - public double Height { get; } - public double Width { get; } - public double Rotate { get; } - - public ShapeInfo(Point3d nodeStart, Point3d nodeEnd, double height, double width, double rotate) - { - NodeStart = nodeStart; - NodeEnd = nodeEnd; - Height = height; - Width = width; - Rotate = rotate; - } - - public bool Equals(ShapeInfo other) - { - return NodeStart.Equals(other.NodeStart) && NodeEnd.Equals(other.NodeEnd) && Height.Equals(other.Height) && Width.Equals(other.Width) && Rotate.Equals(other.Rotate); - } - - public override bool Equals(object obj) - { - return obj is ShapeInfo other && Equals(other); - } - - public override int GetHashCode() - { - unchecked - { - int hashCode = NodeStart.GetHashCode(); - hashCode = (hashCode * 397) ^ NodeEnd.GetHashCode(); - hashCode = (hashCode * 397) ^ Height.GetHashCode(); - hashCode = (hashCode * 397) ^ Width.GetHashCode(); - hashCode = (hashCode * 397) ^ Rotate.GetHashCode(); - return hashCode; - } - } - } -} diff --git a/HoaryFox/Member/SteelCroSecBrep.cs b/HoaryFox/Member/SteelCroSecBrep.cs deleted file mode 100644 index 5f79ae3a..00000000 --- a/HoaryFox/Member/SteelCroSecBrep.cs +++ /dev/null @@ -1,160 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Security.Permissions; -using Rhino.Geometry; -using STBReader; - -namespace HoaryFox.Member -{ - public class SteelCroSecBrep - { - private readonly StbData _stbData; - private readonly double _tol; - private readonly List _pointStart; - private readonly List _pointEnd; - - public SteelCroSecBrep(StbData stbData, IReadOnlyList> origins) - { - _stbData = stbData; - _tol = _stbData.ToleLength; - _pointStart = origins[0]; - _pointEnd = origins[1]; - } - - public List CShape() - { - var breps = new List - { - Brep.CreateFromCornerPoints(_pointStart[2], _pointStart[1], _pointEnd[1], _pointEnd[2], _tol), - Brep.CreateFromCornerPoints(_pointStart[1], _pointStart[4], _pointEnd[4], _pointEnd[1], _tol), - Brep.CreateFromCornerPoints(_pointStart[4], _pointStart[5], _pointEnd[5], _pointEnd[4], _tol) - }; - List joinedBrep = Brep.JoinBreps(breps, _tol).ToList(); - - return joinedBrep; - } - - public List TShape() - { - Point3d[] pointIs = MakeHInnerPoint(_pointStart); - Point3d[] pointIe = MakeHInnerPoint(_pointEnd); - - var breps = new List - { - Brep.CreateFromCornerPoints(_pointStart[3], _pointStart[5], _pointEnd[5], _pointEnd[3], _tol), - Brep.CreateFromCornerPoints(_pointStart[5], pointIs[5], pointIe[5], _pointEnd[5], _tol), - Brep.CreateFromCornerPoints(pointIs[5], pointIs[4], pointIe[4], pointIe[5], _tol), - Brep.CreateFromCornerPoints(pointIs[4], pointIs[1], pointIe[1], pointIe[4], _tol), - Brep.CreateFromCornerPoints(pointIs[1], pointIs[0], pointIe[0], pointIe[1], _tol), - Brep.CreateFromCornerPoints(pointIs[0], pointIs[3], pointIe[3], pointIe[0], _tol), - Brep.CreateFromCornerPoints(pointIs[3], pointIs[2], pointIe[2], pointIe[3], _tol), - Brep.CreateFromCornerPoints(pointIs[2], _pointStart[3], _pointEnd[3], pointIe[2], _tol), - }; - List joinedBrep = Brep.JoinBreps(breps, _tol).ToList(); - - return joinedBrep.Select(b => b.CapPlanarHoles(_tol)).ToList(); - } - - // o3 - - o4 - - o5 - // | | - // Y i2 - i3 i4 - i5 - // ^ | | - // o > X o0 - i0 - o1 - i1 - o2 - private static Point3d[] MakeTInnerPoint(IReadOnlyList outPoints) - { - var points = new Point3d[6]; - - points[0] = 0.55 * outPoints[0] + 0.45 * outPoints[2]; - points[1] = 0.55 * outPoints[2] + 0.45 * outPoints[0]; - points[2] = 0.95 * outPoints[3] + 0.05 * outPoints[0]; - points[5] = 0.95 * outPoints[5] + 0.05 * outPoints[2]; - - points[3] = 0.55 * points[5] + 0.45 * points[2]; - points[4] = 0.55 * points[2] + 0.45 * points[5]; - - return points; - } - - public List HShape() - { - Point3d[] pointIs = MakeHInnerPoint(_pointStart); - Point3d[] pointIe = MakeHInnerPoint(_pointEnd); - - var breps = new List - { - Brep.CreateFromCornerPoints(_pointStart[3], _pointStart[5], _pointEnd[5], _pointEnd[3], _tol), - Brep.CreateFromCornerPoints(_pointStart[5], pointIs[7], pointIe[7], _pointEnd[5], _tol), - Brep.CreateFromCornerPoints(pointIs[7], pointIs[6], pointIe[6], pointIe[7], _tol), - Brep.CreateFromCornerPoints(pointIs[6], pointIs[2], pointIe[2], pointIe[6], _tol), - Brep.CreateFromCornerPoints(pointIs[2], pointIs[3], pointIe[3], pointIe[2], _tol), - Brep.CreateFromCornerPoints(pointIs[3], _pointStart[2], _pointEnd[2], pointIe[3], _tol), - Brep.CreateFromCornerPoints(_pointStart[2], _pointStart[0], _pointEnd[0], _pointEnd[2], _tol), - Brep.CreateFromCornerPoints(_pointStart[0], pointIs[0], pointIe[0], _pointEnd[0], _tol), - Brep.CreateFromCornerPoints(pointIs[0], pointIs[1], pointIe[1], pointIe[0], _tol), - Brep.CreateFromCornerPoints(pointIs[1], pointIs[5], pointIe[5], pointIe[1], _tol), - Brep.CreateFromCornerPoints(pointIs[5], pointIs[4], pointIe[4], pointIe[5], _tol), - Brep.CreateFromCornerPoints(pointIs[4], _pointStart[3], _pointEnd[3], pointIe[4], _tol), - }; - List joinedBrep = Brep.JoinBreps(breps, _tol).ToList(); - - return joinedBrep.Select(b => b.CapPlanarHoles(_tol)).ToList(); - } - - // o3 - o4 - o5 - // | | - // i4 - i5 i6 - i7 - // | | - // Y i0 - i1 i2 - i3 - // ^ | | - // o > X o0 - o1 - o2 - private static Point3d[] MakeHInnerPoint(IReadOnlyList outPoints) - { - var points = new Point3d[8]; - - points[0] = 0.95 * outPoints[0] + 0.05 * outPoints[3]; - points[3] = 0.95 * outPoints[2] + 0.05 * outPoints[5]; - points[4] = 0.95 * outPoints[3] + 0.05 * outPoints[0]; - points[7] = 0.95 * outPoints[5] + 0.05 * outPoints[2]; - - points[1] = 0.55 * points[0] + 0.45 * points[3]; - points[2] = 0.55 * points[3] + 0.45 * points[0]; - points[5] = 0.55 * points[4] + 0.45 * points[7]; - points[6] = 0.55 * points[7] + 0.45 * points[4]; - - return points; - } - - public List BoxShape() - { - var breps = new List - { - Brep.CreateFromCornerPoints(_pointStart[3], _pointStart[5], _pointEnd[5], _pointEnd[3], _tol), - Brep.CreateFromCornerPoints(_pointStart[0], _pointStart[2], _pointEnd[2], _pointEnd[0], _tol), - Brep.CreateFromCornerPoints(_pointStart[3], _pointStart[0], _pointEnd[0], _pointEnd[3], _tol), - Brep.CreateFromCornerPoints(_pointStart[5], _pointStart[2], _pointEnd[2], _pointEnd[5], _tol) - }; - List joinedBrep = Brep.JoinBreps(breps, _tol).ToList(); - - return joinedBrep.Select(b => b.CapPlanarHoles(_tol)).ToList(); - } - - public List LShape() - { - var breps = new List - { - Brep.CreateFromCornerPoints(_pointStart[0], _pointStart[2], _pointEnd[2], _pointEnd[0], _tol), - Brep.CreateFromCornerPoints(_pointStart[5], _pointStart[2], _pointEnd[2], _pointEnd[5], _tol) - }; - List joinedBrep = Brep.JoinBreps(breps, _tol).ToList(); - - return joinedBrep; - } - - public List PipeShape(ShapeInfo shapeInfo) - { - var brep = new List(); - brep.AddRange(Brep.CreatePipe(new LineCurve(shapeInfo.NodeStart, shapeInfo.NodeEnd), shapeInfo.Width / 2, true, PipeCapMode.Flat, true, _stbData.ToleLength, _stbData.ToleAngle)); - return brep; - } - } -} diff --git a/HoaryFox/Misc.cs b/HoaryFox/Misc.cs deleted file mode 100644 index c902d355..00000000 --- a/HoaryFox/Misc.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using HoaryFox.Member; -using Rhino; -using Rhino.DocObjects; -using STBReader; -using STBReader.Member; - -namespace HoaryFox -{ - public static class Misc - { - public static List> GetTag(StbData stbData, StbFrame stbFrame) - { - var tags = new CreateTag(stbData.Nodes, stbData.SecColumnRc, stbData.SecColumnS, stbData.SecBeamRc, stbData.SecBeamS, stbData.SecBraceS, stbData.SecSteel); - return tags.FrameList(stbFrame); - } - - public static void MakeParentLayers(RhinoDoc activeDoc, IEnumerable parentLayerNames, IReadOnlyList layerColors) - { - foreach ((string name, int index) in parentLayerNames.Select((name, index) => (name, index))) - { - var parentLayer = new Layer { Name = name, Color = layerColors[index] }; - activeDoc.Layers.Add(parentLayer); - } - } - public static void SetFrameUserString(ref ObjectAttributes objAttr, IReadOnlyList tag) - { - objAttr.SetUserString("Tag", tag[0]); - objAttr.SetUserString("ShapeType", tag[1]); - objAttr.SetUserString("Height", tag[2]); - objAttr.SetUserString("Width", tag[3]); - objAttr.SetUserString("t1", tag[4]); - objAttr.SetUserString("t2", tag[5]); - objAttr.SetUserString("Kind", tag[6]); - } - } -} diff --git a/HoaryFox/Properties/AssemblyInfo.cs b/HoaryFox/Properties/AssemblyInfo.cs deleted file mode 100644 index ca8b1312..00000000 --- a/HoaryFox/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("HoaryFox")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("hrntsm")] -[assembly: AssemblyProduct("HoaryFox")] -[assembly: AssemblyCopyright("Copyright ©hrntsm 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9637855d-d144-4448-9f56-a391a3575dac")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/HoaryFox/Properties/Resource.Designer.cs b/HoaryFox/Properties/Resource.Designer.cs index 77933647..cd44ba29 100644 --- a/HoaryFox/Properties/Resource.Designer.cs +++ b/HoaryFox/Properties/Resource.Designer.cs @@ -60,6 +60,16 @@ internal Resource() { } } + /// + /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 + /// + internal static System.Drawing.Bitmap Axis { + get { + object obj = ResourceManager.GetObject("Axis", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 /// @@ -199,5 +209,45 @@ internal static System.Drawing.Bitmap PostSection { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 + /// + internal static System.Drawing.Bitmap SlabName { + get { + object obj = ResourceManager.GetObject("SlabName", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 + /// + internal static System.Drawing.Bitmap SlabSection { + get { + object obj = ResourceManager.GetObject("SlabSection", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 + /// + internal static System.Drawing.Bitmap WallName { + get { + object obj = ResourceManager.GetObject("WallName", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 型 System.Drawing.Bitmap のローカライズされたリソースを検索します。 + /// + internal static System.Drawing.Bitmap WallSection { + get { + object obj = ResourceManager.GetObject("WallSection", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/HoaryFox/Properties/Resource.resx b/HoaryFox/Properties/Resource.resx index 7072402c..82592480 100644 --- a/HoaryFox/Properties/Resource.resx +++ b/HoaryFox/Properties/Resource.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Axis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\BeamName.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,4 +163,16 @@ ..\Resources\PostSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SlabName.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SlabSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WallName.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WallSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/HoaryFox/Properties/launchSettings.json b/HoaryFox/Properties/launchSettings.json new file mode 100644 index 00000000..2e8a371a --- /dev/null +++ b/HoaryFox/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "HoaryFox": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Rhino 6\\System\\Rhino.exe" + } + } +} \ No newline at end of file diff --git a/HoaryFox/Resources/Axis.png b/HoaryFox/Resources/Axis.png new file mode 100644 index 00000000..c8df83fd Binary files /dev/null and b/HoaryFox/Resources/Axis.png differ diff --git a/HoaryFox/Resources/Axis.svg b/HoaryFox/Resources/Axis.svg new file mode 100644 index 00000000..7774afb7 --- /dev/null +++ b/HoaryFox/Resources/Axis.svg @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + X + + Y + + + + + + + + Z + + diff --git a/HoaryFox/Resources/Slab - Copy.svg b/HoaryFox/Resources/Slab - Copy.svg new file mode 100644 index 00000000..bbabce39 --- /dev/null +++ b/HoaryFox/Resources/Slab - Copy.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/HoaryFox/Resources/SlabName.png b/HoaryFox/Resources/SlabName.png new file mode 100644 index 00000000..ef669dfd Binary files /dev/null and b/HoaryFox/Resources/SlabName.png differ diff --git a/HoaryFox/Resources/SlabSection.png b/HoaryFox/Resources/SlabSection.png new file mode 100644 index 00000000..951a1967 Binary files /dev/null and b/HoaryFox/Resources/SlabSection.png differ diff --git a/HoaryFox/Resources/Wall.svg b/HoaryFox/Resources/Wall.svg new file mode 100644 index 00000000..29d8bef8 --- /dev/null +++ b/HoaryFox/Resources/Wall.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/HoaryFox/Resources/WallName.png b/HoaryFox/Resources/WallName.png new file mode 100644 index 00000000..83c7284b Binary files /dev/null and b/HoaryFox/Resources/WallName.png differ diff --git a/HoaryFox/Resources/WallSection.png b/HoaryFox/Resources/WallSection.png new file mode 100644 index 00000000..c50960bc Binary files /dev/null and b/HoaryFox/Resources/WallSection.png differ diff --git a/KarambaConnect/Component/IO/Convert2Karamba.cs b/KarambaConnect/Component/IO/Convert2Karamba.cs index 2f20960b..81d8b1a6 100644 --- a/KarambaConnect/Component/IO/Convert2Karamba.cs +++ b/KarambaConnect/Component/IO/Convert2Karamba.cs @@ -9,16 +9,13 @@ using Karamba.GHopper.Elements; using KarambaConnect.Properties; using KarambaConnect.S2K; -using STBReader; +using STBDotNet.v202; namespace KarambaConnect.Component.IO { public class Convert2Karamba : GH_Component { - private StbData _stbData; - private List _k3ElemBe = new List(); - private readonly List _k3ElemSh = new List(); - + private ST_BRIDGE _stBridge; public override GH_Exposure Exposure => GH_Exposure.secondary; public Convert2Karamba() @@ -26,13 +23,6 @@ public Convert2Karamba() { } - public override void ClearData() - { - base.ClearData(); - _k3ElemBe.Clear(); - _k3ElemSh.Clear(); - } - protected override void RegisterInputParams(GH_InputParamManager pManager) { pManager.AddGenericParameter("Data", "D", "Input ST-Bridge Data", GH_ParamAccess.item); @@ -46,24 +36,25 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager) pManager.AddParameter(new Param_CrossSection(), "CrossSection", "CroSec", "Karamba CrossSection", GH_ParamAccess.list); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var familyName = new CroSecFamilyName(); - if (!DA.GetData(0, ref _stbData)) { return; } - if (!DA.GetData(1, ref familyName)) + var k3dElemSh = new List(); + + if (!dataAccess.GetData(0, ref _stBridge)) { return; } + if (!dataAccess.GetData(1, ref familyName)) { familyName = CroSecFamilyName.Default(); } - List[] k3Ids = CrossSection.GetIndex(_stbData); - List k3CroSec = CrossSection.GetCroSec(_stbData, familyName); - List elems = Element.BuilderBeams(_stbData, k3Ids); - List ghElements = elems.Select(e => new GH_Element(e)).ToList(); - _k3ElemBe = ghElements; + List[] k3dIds = CrossSection.GetIndex(_stBridge); + List k3dCroSec = CrossSection.GetCroSec(_stBridge.StbModel.StbSections, familyName); + List k3dBeamElems = ElementBuilder.BuilderBeams(_stBridge.StbModel, k3dIds); + List ghK3dElements = k3dBeamElems.Select(e => new GH_Element(e)).ToList(); - DA.SetDataList(0, _k3ElemBe); - DA.SetDataList(1, k3CroSec); + dataAccess.SetDataList(0, ghK3dElements); + dataAccess.SetDataList(1, k3dCroSec); } protected override Bitmap Icon => Resource.ToKaramba; diff --git a/KarambaConnect/Component/IO/Export.cs b/KarambaConnect/Component/IO/Export.cs index 6f388854..2c96ed4c 100644 --- a/KarambaConnect/Component/IO/Export.cs +++ b/KarambaConnect/Component/IO/Export.cs @@ -2,13 +2,9 @@ using System.Collections.Generic; using System.Drawing; using Grasshopper.Kernel; -using KarambaConnect.K2S; using KarambaConnect.Properties; -using STBDotNet.Elements; -using STBDotNet.Elements.StbModel; -using STBDotNet.Elements.StbModel.StbMember; -using STBDotNet.Elements.StbModel.StbSection; using STBDotNet.Serialization; +using STBDotNet.v202; namespace KarambaConnect.Component.IO { @@ -26,10 +22,10 @@ public Export() protected override void RegisterInputParams(GH_InputParamManager pManager) { pManager.AddGenericParameter("Node", "Node", "StbNode data", GH_ParamAccess.list); - pManager.AddGenericParameter("Axis", "Axis", "StbAxes data", GH_ParamAccess.list); + pManager.AddGenericParameter("Axis", "Axis", "StbAxes data", GH_ParamAccess.item); pManager.AddGenericParameter("Story", "Story", "StbStory data", GH_ParamAccess.list); pManager.AddGenericParameter("Member", "Mem", "StbMember data", GH_ParamAccess.item); - pManager.AddGenericParameter("Section", "Sec", "StbSection data", GH_ParamAccess.list); + pManager.AddGenericParameter("Section", "Sec", "StbSection data", GH_ParamAccess.item); pManager.AddTextParameter("Path", "Path", "Output path", GH_ParamAccess.item, _defaultOutPath); pManager.AddBooleanParameter("Out?", "Out?", "If it is true, output stb file.", GH_ParamAccess.item, false); @@ -40,46 +36,66 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager) pManager.AddGenericParameter("Stb", "Stb", "StbModel Data", GH_ParamAccess.item); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var path = string.Empty; var isOutput = false; - var node = new List(); - var axis = new List(); - var story = new List(); - var members = new Members(); - var sections = new List
(); + var nodes = new List(); + var axes = new StbAxes(); + var stories = new List(); + var members = new StbMembers(); + var sections = new StbSections(); - if (!DA.GetDataList(0, node)) { return; } - if (!DA.GetDataList(1, axis)) { return; } - if (!DA.GetDataList(2, story)) { return; } - if (!DA.GetData(3, ref members)) { return; } - if (!DA.GetDataList(4, sections)) { return; } - if (!DA.GetData(5, ref path)) { return; } - if (!DA.GetData(6, ref isOutput)) { return; } + if (!dataAccess.GetDataList(0, nodes)) { return; } + if (!dataAccess.GetData(1, ref axes)) { return; } + if (!dataAccess.GetDataList(2, stories)) { return; } + if (!dataAccess.GetData(3, ref members)) { return; } + if (!dataAccess.GetData(4, ref sections)) { return; } + if (!dataAccess.GetData(5, ref path)) { return; } + if (!dataAccess.GetData(6, ref isOutput)) { return; } - - var elements = new StbElements + var stbData = new ST_BRIDGE { - Version = "1.4.00", - Common = StbCommon.Set(), - Model = new Model + version = "2.0.2", + StbCommon = new StbCommon { - Axes = axis, - Members = members, - Nodes = node, - Sections = sections, - Stories = story - } + project_name = ActiveCanvasFileName(), + app_name = "HoaryFox", + }, + StbModel = new StbModel + { + StbAxes = axes, + StbStories = stories.ToArray(), + StbNodes = nodes.ToArray(), + StbMembers = members, + StbSections = sections, + StbJoints = new StbJoints(), + }, + StbAnaModels = Array.Empty(), + StbCalData = new StbCalData(), }; if (isOutput) { - var sr = new Serializer(); - sr.Serialize(elements, path); + bool result = Serializer.Serialize(stbData, path, STBDotNet.Enums.Version.Stb202); + if (!result) + { + throw new Exception("Failed to serialize."); + } + } + + dataAccess.SetData(0, stbData); + } + + private static string ActiveCanvasFileName() + { + var fileName = Grasshopper.Instances.ActiveCanvas.Document.ToString(); + if (fileName.EndsWith("*")) + { + fileName = fileName.Substring(0, fileName.Length - 1) + ".gh"; } - DA.SetData(0, elements); + return fileName; } protected override Bitmap Icon => Resource.ExportStb; diff --git a/KarambaConnect/Component/IO/SetFamilyName.cs b/KarambaConnect/Component/IO/SetFamilyName.cs index e32c839b..a5a60775 100644 --- a/KarambaConnect/Component/IO/SetFamilyName.cs +++ b/KarambaConnect/Component/IO/SetFamilyName.cs @@ -32,12 +32,12 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager) pManager.AddGenericParameter("FamilyName", "Family", "Each CrossSection Family Name", GH_ParamAccess.item); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var name = new string[8]; for (var i = 0; i < name.Length; i++) { - if (!DA.GetData(i, ref name[i])) { return; } + if (!dataAccess.GetData(i, ref name[i])) { return; } } var familyName = new CroSecFamilyName @@ -52,7 +52,7 @@ protected override void SolveInstance(IGH_DataAccess DA) Other = name[7] }; - DA.SetData(0, familyName); + dataAccess.SetData(0, familyName); } protected override Bitmap Icon => Resource.SetFamilyName; diff --git a/KarambaConnect/Component/StbBuilder/AxisBuilder.cs b/KarambaConnect/Component/StbBuilder/AxisBuilder.cs index 025246b5..17619046 100644 --- a/KarambaConnect/Component/StbBuilder/AxisBuilder.cs +++ b/KarambaConnect/Component/StbBuilder/AxisBuilder.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.Linq; using Grasshopper.Kernel; -using STBDotNet.Elements.StbModel; +using STBDotNet.v202; namespace KarambaConnect.Component.StbBuilder { @@ -26,88 +27,81 @@ protected override void RegisterInputParams(GH_InputParamManager pManager) protected override void RegisterOutputParams(GH_OutputParamManager pManager) { - pManager.AddGenericParameter("Axis", "Axis", "StbAxis Data", GH_ParamAccess.list); + pManager.AddGenericParameter("Axis", "Axis", "StbAxis Data", GH_ParamAccess.item); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var count = 0; - var nodes = new List(); + var nodes = new List(); var distance = new List(); var range = new List(); var names = new List(); var dir = new List(); - if (!DA.GetDataList(0, nodes)) { return; } - if (!DA.GetDataList(1, distance)) { return; } - if (!DA.GetDataList(2, range)) { return; } - if (!DA.GetDataList(3, names)) { return; } - if (!DA.GetDataList(4, dir)) { return; } - - var axes = new List(); + if (!dataAccess.GetDataList(0, nodes)) { return; } + if (!dataAccess.GetDataList(1, distance)) { return; } + if (!dataAccess.GetDataList(2, range)) { return; } + if (!dataAccess.GetDataList(3, names)) { return; } + if (!dataAccess.GetDataList(4, dir)) { return; } if (distance.Count != names.Count || distance.Count != range.Count || distance.Count != dir.Count || range.Count != names.Count || range.Count != dir.Count || names.Count != dir.Count) { - throw new ArgumentOutOfRangeException("The number of items does not match."); + throw new ArgumentException("The number of items does not match."); } + var xAxisList = new List(); + var yAxisList = new List(); + foreach (double dist in distance) { - var nodeIds = new List(); + var nodeIds = new List(); if (dir[count] == 0) { - var xAxis = new XAxis - { - Id = count + 1, - Name = names[count], - Distance = dist - }; - foreach (Node node in nodes) - { - if (node.X > dist - range[count] && node.X < dist + range[count]) - { - nodeIds.Add(new NodeId(node.Id)); - } - } - - if (nodeIds.Count == 0) - { - throw new ArgumentException("There are no nodes in the target distance range."); - } - - xAxis.NodeIdList = nodeIds; - axes.Add(xAxis); + nodeIds.AddRange(from StbNode node in nodes + where node.X > dist - range[count] && node.X < dist + range[count] + select new StbNodeId { id = node.id }); + CheckNodeIdsNull(nodeIds); + xAxisList.Add(CreateParallelAxis(count, names, dist, nodeIds)); } else if (dir[count] == 1) { - var yAxis = new YAxis - { - Id = count + 1, - Name = names[count], - Distance = dist - }; - foreach (Node node in nodes) - { - if (node.Y > dist - range[count] && node.Y < dist + range[count]) - { - nodeIds.Add(new NodeId(node.Id)); - } - } - - if (nodeIds.Count == 0) - { - throw new ArgumentException("There are no nodes in the target distance range."); - } - - yAxis.NodeIdList = nodeIds; - axes.Add(yAxis); + nodeIds.AddRange(from StbNode node in nodes + where node.Y > dist - range[count] && node.Y < dist + range[count] + select new StbNodeId { id = node.id }); + CheckNodeIdsNull(nodeIds); + yAxisList.Add(CreateParallelAxis(count, names, dist, nodeIds)); } count++; } - DA.SetDataList(0, axes); + var axes = new StbAxes(); + var xAxes = new StbParallelAxes { X = 0, Y = 0, angle = 270, group_name = "X", StbParallelAxis = xAxisList.ToArray() }; + var yAxes = new StbParallelAxes { X = 0, Y = 0, angle = 0, group_name = "Y", StbParallelAxis = yAxisList.ToArray() }; + axes.StbParallelAxes = new[] { xAxes, yAxes }; + + dataAccess.SetData(0, axes); + } + + private static void CheckNodeIdsNull(IReadOnlyCollection nodeIds) + { + if (nodeIds.Count == 0) + { + throw new ArgumentException("There are no nodes in the target distance range."); + } + } + + private static StbParallelAxis CreateParallelAxis(int count, IReadOnlyList names, double dist, List nodeIds) + { + return new StbParallelAxis() + { + id = (count + 1).ToString(), + name = names[count], + distance = dist, + StbNodeIdList = nodeIds.ToArray() + }; } protected override Bitmap Icon => Properties.Resource.AxisBuilder; diff --git a/KarambaConnect/Component/StbBuilder/FrameBuilderByAngle.cs b/KarambaConnect/Component/StbBuilder/FrameBuilderByAngle.cs index d63509ce..275474f8 100644 --- a/KarambaConnect/Component/StbBuilder/FrameBuilderByAngle.cs +++ b/KarambaConnect/Component/StbBuilder/FrameBuilderByAngle.cs @@ -1,17 +1,17 @@ using System; using System.Drawing; +using System.Linq; using Grasshopper.Kernel; using Karamba.GHopper.Models; -using KarambaConnect.K2S; using Rhino.Geometry; -using STBDotNet.Elements.StbModel.StbMember; +using STBDotNet.v202; using Model = Karamba.Models.Model; namespace KarambaConnect.Component.StbBuilder { public class FrameBuilderByAngle : GH_Component { - private STBDotNet.Elements.StbModel.Model _sModel; + private StbModel _sModel; public override GH_Exposure Exposure => GH_Exposure.primary; @@ -29,27 +29,26 @@ protected override void RegisterInputParams(GH_InputParamManager pManager) protected override void RegisterOutputParams(GH_OutputParamManager pManager) { pManager.AddGenericParameter("Member", "Mem", "StbMember data", GH_ParamAccess.item); - pManager.AddGenericParameter("Section", "Sec", "StbSection data", GH_ParamAccess.list); + pManager.AddGenericParameter("Section", "Sec", "StbSection data", GH_ParamAccess.item); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { double colMaxAngle = 0; var modelIn = new object(); - if (!DA.GetData(0, ref modelIn)) { return; } - if (!DA.GetData(1, ref colMaxAngle)) { return; } + if (!dataAccess.GetData(0, ref modelIn)) { return; } + if (!dataAccess.GetData(1, ref colMaxAngle)) { return; } if (!(modelIn is GH_Model ghKModel)) { throw new ArgumentException("The input is not Karamba3D model!"); } Model kModel = ghKModel.Value; - var stbModel = new StbModel(kModel); - _sModel = stbModel.SetByAngle(colMaxAngle); - _sModel.Nodes = kModel.nodes.ToStb(); + var k2S = new K2S.K2StbModel(kModel); + _sModel = k2S.SetByAngle(colMaxAngle); - DA.SetData(0, _sModel.Members); - DA.SetDataList(1, _sModel.Sections); + dataAccess.SetData(0, _sModel.StbMembers); + dataAccess.SetData(1, _sModel.StbSections); } protected override Bitmap Icon => Properties.Resource.FrameBuilder; @@ -57,29 +56,29 @@ protected override void SolveInstance(IGH_DataAccess DA) public override void DrawViewportWires(IGH_PreviewArgs args) { - if (_sModel == null || _sModel.Nodes.Count < 1) + if (_sModel == null || _sModel.StbNodes.Length < 1) { return; } - foreach (Column column in _sModel.Members.Columns) + foreach (StbColumn column in _sModel.StbMembers.StbColumns) { - Point3d ptFrom = _sModel.Nodes[column.IdNodeStart - 1].ToRhino(); - Point3d ptTo = _sModel.Nodes[column.IdNodeEnd - 1].ToRhino(); + Point3d ptFrom = _sModel.StbNodes.First(node => node.id == column.id_node_bottom).ToRhino(); + Point3d ptTo = _sModel.StbNodes.First(node => node.id == column.id_node_top).ToRhino(); args.Display.Draw2dText("Column", Color.Brown, (ptFrom + ptTo) / 2, true, 12); } - foreach (Girder girder in _sModel.Members.Girders) + foreach (StbGirder girder in _sModel.StbMembers.StbGirders) { - Point3d ptFrom = _sModel.Nodes[girder.IdNodeStart - 1].ToRhino(); - Point3d ptTo = _sModel.Nodes[girder.IdNodeEnd - 1].ToRhino(); + Point3d ptFrom = _sModel.StbNodes.First(node => node.id == girder.id_node_start).ToRhino(); + Point3d ptTo = _sModel.StbNodes.First(node => node.id == girder.id_node_end).ToRhino(); args.Display.Draw2dText("Girder", Color.DarkGreen, (ptFrom + ptTo) / 2, true, 12); } - foreach (Brace brace in _sModel.Members.Braces) + foreach (StbBrace brace in _sModel.StbMembers.StbBraces) { - Point3d ptFrom = _sModel.Nodes[brace.IdNodeStart - 1].ToRhino(); - Point3d ptTo = _sModel.Nodes[brace.IdNodeEnd - 1].ToRhino(); + Point3d ptFrom = _sModel.StbNodes.First(node => node.id == brace.id_node_start).ToRhino(); + Point3d ptTo = _sModel.StbNodes.First(node => node.id == brace.id_node_end).ToRhino(); args.Display.Draw2dText("Brace", Color.Purple, (ptFrom + ptTo) / 2, true, 12); } } diff --git a/KarambaConnect/Component/StbBuilder/NodeBuilder.cs b/KarambaConnect/Component/StbBuilder/NodeBuilder.cs index 2ddbcc97..0de98099 100644 --- a/KarambaConnect/Component/StbBuilder/NodeBuilder.cs +++ b/KarambaConnect/Component/StbBuilder/NodeBuilder.cs @@ -25,10 +25,10 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager) pManager.AddGenericParameter("Node", "Node", "StbNode Data", GH_ParamAccess.list); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var modelIn = new object(); - if (!DA.GetData(0, ref modelIn)) { return; } + if (!dataAccess.GetData(0, ref modelIn)) { return; } if (!(modelIn is GH_Model ghKModel)) { @@ -36,7 +36,7 @@ protected override void SolveInstance(IGH_DataAccess DA) } Model kModel = ghKModel.Value; - DA.SetDataList(0, kModel.nodes.ToStb()); + dataAccess.SetDataList(0, kModel.nodes.ToStb()); } protected override Bitmap Icon => Properties.Resource.NodeBuilder; diff --git a/KarambaConnect/Component/StbBuilder/StoryBuilder.cs b/KarambaConnect/Component/StbBuilder/StoryBuilder.cs index 0926e1d4..f059d881 100644 --- a/KarambaConnect/Component/StbBuilder/StoryBuilder.cs +++ b/KarambaConnect/Component/StbBuilder/StoryBuilder.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.Linq; using Grasshopper.Kernel; -using STBDotNet.Elements.StbModel; +using STBDotNet.v202; namespace KarambaConnect.Component.StbBuilder { @@ -28,55 +29,57 @@ protected override void RegisterOutputParams(GH_OutputParamManager pManager) pManager.AddGenericParameter("Story", "Story", "StbStory Data", GH_ParamAccess.list); } - protected override void SolveInstance(IGH_DataAccess DA) + protected override void SolveInstance(IGH_DataAccess dataAccess) { var count = 0; - var nodes = new List(); + var nodes = new List(); var height = new List(); var range = new List(); var names = new List(); - if (!DA.GetDataList(0, nodes)) { return; } - if (!DA.GetDataList(1, height)) { return; } - if (!DA.GetDataList(2, range)) { return; } - if (!DA.GetDataList(3, names)) { return; } + if (!dataAccess.GetDataList(0, nodes)) { return; } + if (!dataAccess.GetDataList(1, height)) { return; } + if (!dataAccess.GetDataList(2, range)) { return; } + if (!dataAccess.GetDataList(3, names)) { return; } - var stories = new List(); + var stories = new List(); if (height.Count != range.Count || height.Count != names.Count || range.Count != names.Count) { - throw new ArgumentOutOfRangeException("The number of items does not match."); + throw new ArgumentException("The number of items does not match."); } foreach (double h in height) { - var story = new Story - { - Id = count + 1, - Name = names[count], - Height = h, - Kind = "GENERAL" - }; - var nodeIds = new List(); - foreach (Node node in nodes) - { - if (node.Z > h - range[count] && node.Z < h + range[count]) - { - nodeIds.Add(new NodeId(node.Id)); - } - } - - if (nodeIds.Count == 0) - { - throw new ArgumentException("There are no nodes in the target height range."); - } - - story.NodeIdList = nodeIds; - stories.Add(story); + StbNodeId[] nodeIds = (from StbNode node in nodes + where node.Z > h - range[count] && node.Z < h + range[count] + select new StbNodeId { id = node.id }).ToArray(); + CheckNodeIdsNull(nodeIds); + stories.Add(CreateStory(count, names, h, nodeIds)); count++; } - DA.SetDataList(0, stories); + dataAccess.SetDataList(0, stories); + } + + private static StbStory CreateStory(int count, List names, double h, StbNodeId[] nodeIds) + { + return new StbStory + { + id = (count + 1).ToString(), + name = names[count], + height = h, + kind = StbStoryKind.GENERAL, + StbNodeIdList = nodeIds + }; + } + + private static void CheckNodeIdsNull(StbNodeId[] nodeIds) + { + if (nodeIds.Length == 0) + { + throw new ArgumentException("There are no nodes in the target height range."); + } } protected override Bitmap Icon => Properties.Resource.StoryBuilder; diff --git a/KarambaConnect/Convert.cs b/KarambaConnect/Convert.cs index 06349224..31e9cde6 100644 --- a/KarambaConnect/Convert.cs +++ b/KarambaConnect/Convert.cs @@ -15,41 +15,47 @@ public static Karamba.Geometry.Point3 ToKaramba(this STBDotNet.Geometry.Point3 s return new Karamba.Geometry.Point3(spt.X, spt.Y, spt.Z) * 1000; } - public static Point3d ToRhino(this STBDotNet.Elements.StbModel.Node node) + public static Karamba.Geometry.Point3 ToKaramba(this STBDotNet.v202.StbNode sNode) + { + return new Karamba.Geometry.Point3(sNode.X, sNode.Y, sNode.Z) * 1000; + } + + public static Point3d ToRhino(this STBDotNet.v202.StbNode node) { return new Point3d(node.X, node.Y, node.Z) / 1000; } - public static List ToStb(this List kNodes) + public static STBDotNet.v202.StbNode[] ToStb(this List kNodes) { - var sNodes = new List(); + var sNodes = new STBDotNet.v202.StbNode[kNodes.Count]; - foreach (Karamba.Nodes.Node kNode in kNodes) + for (int i = 0; i < kNodes.Count; i++) { - var sNode = new STBDotNet.Elements.StbModel.Node + Karamba.Nodes.Node kNode = kNodes[i]; + var sNode = new STBDotNet.v202.StbNode { - Id = kNode.ind + 1, + id = (kNode.ind + 1).ToString(), X = kNode.pos.X * 1000, Y = kNode.pos.Y * 1000, Z = kNode.pos.Z * 1000 }; - sNodes.Add(sNode); + sNodes[i] = sNode; } return sNodes; } - public static List ToKaramba(this List sNodes) + public static List ToKaramba(this List sNodes) { var kNodes = new List(); - foreach (STBDotNet.Elements.StbModel.Node sNode in sNodes) + foreach (STBDotNet.v202.StbNode sNode in sNodes) { var kNode = new Karamba.Nodes.Node { - ind = sNode.Id, + ind = int.Parse(sNode.id), is_visible = true, - pos = sNode.Position.ToKaramba() + pos = sNode.ToKaramba() }; kNodes.Add(kNode); diff --git a/KarambaConnect/K2S/K2SSecSteelItems.cs b/KarambaConnect/K2S/K2SSecSteelItems.cs new file mode 100644 index 00000000..76228c41 --- /dev/null +++ b/KarambaConnect/K2S/K2SSecSteelItems.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using STBDotNet.v202; + +namespace KarambaConnect.K2S +{ + internal class K2SSecSteelItems + { + public List SecFlatBars { get; set; } + public List SecRollBoxes { get; set; } + public List SecRollHs { get; set; } + public List SecRollTs { get; set; } + public List SecPipes { get; set; } + + public StbSecSteel ToStb() + { + return new StbSecSteel + { + StbSecFlatBar = SecFlatBars != null ? SecFlatBars.ToArray() : System.Array.Empty(), + StbSecRollBOX = SecRollBoxes != null ? SecRollBoxes.ToArray() : System.Array.Empty(), + StbSecRollH = SecRollHs != null ? SecRollHs.ToArray() : System.Array.Empty(), + StbSecRollT = SecRollTs != null ? SecRollTs.ToArray() : System.Array.Empty(), + StbSecPipe = SecPipes != null ? SecPipes.ToArray() : System.Array.Empty(), + }; + } + } +} diff --git a/KarambaConnect/K2S/K2StbMemberItems.cs b/KarambaConnect/K2S/K2StbMemberItems.cs new file mode 100644 index 00000000..ed38b7cc --- /dev/null +++ b/KarambaConnect/K2S/K2StbMemberItems.cs @@ -0,0 +1,50 @@ +using Karamba.Elements; +using STBDotNet.v202; + +namespace KarambaConnect.K2S +{ + public static class K2StbMemberItems + { + internal static StbColumn CreateColumn(ModelBeam elem, int croSecId, StbColumnKind_structure kind) + { + return new StbColumn + { + id = (elem.ind + 1).ToString(), + name = elem.id, + id_node_bottom = (elem.node_inds[0] + 1).ToString(), + id_node_top = (elem.node_inds[1] + 1).ToString(), + rotate = 0d, + id_section = (croSecId + 1).ToString(), + kind_structure = kind + }; + } + + internal static StbGirder CreateGirder(ModelBeam elem, int croSecId, StbGirderKind_structure kind) + { + return new StbGirder + { + id = (elem.ind + 1).ToString(), + name = elem.id, + id_node_start = (elem.node_inds[0] + 1).ToString(), + id_node_end = (elem.node_inds[1] + 1).ToString(), + rotate = 0d, + id_section = (croSecId + 1).ToString(), + kind_structure = kind + }; + } + + internal static StbBrace CreateBrace(ModelTruss elem, int croSecId) + { + return new StbBrace + { + id = (elem.ind + 1).ToString(), + name = elem.id, + id_node_start = (elem.node_inds[0] + 1).ToString(), + id_node_end = (elem.node_inds[1] + 1).ToString(), + rotate = 0d, + id_section = (croSecId + 1).ToString(), + kind_structure = StbBraceKind_structure.S + }; + } + } +} diff --git a/KarambaConnect/K2S/K2StbModel.cs b/KarambaConnect/K2S/K2StbModel.cs new file mode 100644 index 00000000..0cada688 --- /dev/null +++ b/KarambaConnect/K2S/K2StbModel.cs @@ -0,0 +1,221 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Karamba.Elements; +using Karamba.GHopper.Geometry; +using Rhino.Geometry; +using STBDotNet.v202; + +namespace KarambaConnect.K2S +{ + public class K2StbModel + { + // 0:column, 1:girder, 2:brace + private readonly List> _registeredCroSecId = new List> + { + new List(), new List(), new List() + }; + private readonly List> _registeredCroSecName = new List> + { + new List(), new List(), new List() + }; + private readonly int[] _tagNum = { 1, 1, 1 }; + private readonly List _croSecNames = new List(); + private readonly Karamba.Models.Model _kModel; + + public K2StbModel(Karamba.Models.Model kModel) + { + _kModel = kModel; + _croSecNames = _kModel.crosecs.Select(sec => sec.name).ToList(); + } + + public StbModel SetByAngle(double colMaxAngle) + { + // TODO: リストが大量にあるの直す + var columns = new List(); + var girders = new List(); + var braces = new List(); + var secBeams_S = new List(); + var secBeams_Rc = new List(); + var secColumn_S = new List(); + var secColumn_Rc = new List(); + var secBrace_S = new List(); + var secSteel = new K2SSecSteelItems(); + + foreach (ModelElement elem in _kModel.elems) + { + if (!(elem is ModelElementStraightLine)) + { + continue; + } + var elemLine = new Line(_kModel.nodes[elem.node_inds[0]].pos.Convert(), _kModel.nodes[elem.node_inds[1]].pos.Convert()); + double pAngle = Vector3d.VectorAngle(elemLine.Direction, Vector3d.ZAxis); + double nAngle = Vector3d.VectorAngle(elemLine.Direction, -Vector3d.ZAxis); + + switch (elem) + { + case ModelBeam modelBeam: + ModelBeamToStbColumnAndGirder(secBeams_Rc, secBeams_S, secColumn_Rc, secColumn_S, secSteel, colMaxAngle, columns, girders, pAngle, nAngle, modelBeam); + break; + case ModelTruss modelTruss: + ModelTrussToStbBrace(secBrace_S, secSteel, braces, modelTruss); + break; + default: + throw new ArgumentException("Karamba3D model parse error."); + } + } + + StbMembers members = BindMemberProps(columns, girders, braces); + StbSections sections = BindSectionProps(secBeams_S, secBeams_Rc, secColumn_S, secColumn_Rc, secBrace_S, secSteel); + + return new StbModel() { StbNodes = _kModel.nodes.ToStb(), StbMembers = members, StbSections = sections }; + } + + private static StbMembers BindMemberProps(IEnumerable columns, IEnumerable girders, IEnumerable braces) + { + return new StbMembers() + { + StbColumns = columns.ToArray(), + StbGirders = girders.ToArray(), + StbBraces = braces.ToArray() + }; + } + + private static StbSections BindSectionProps( + IEnumerable secBeams_S, IEnumerable secBeams_Rc, + IEnumerable secColumn_S, IEnumerable secColumn_Rc, + IEnumerable secBrace_S, + K2SSecSteelItems secSteelItems) + { + return new StbSections + { + StbSecColumn_S = secColumn_S.ToArray(), + StbSecColumn_RC = secColumn_Rc.ToArray(), + StbSecBeam_S = secBeams_S.ToArray(), + StbSecBeam_RC = secBeams_Rc.ToArray(), + StbSecBrace_S = secBrace_S.ToArray(), + StbSecSteel = secSteelItems.ToStb(), + }; + } + + private void ModelTrussToStbBrace(List secBrace_S, K2SSecSteelItems secSteel, ICollection braces, ModelTruss modelTruss) + { + int trussCroSecId = _croSecNames.IndexOf(modelTruss.crosec.name); + braces.Add(K2StbMemberItems.CreateBrace(modelTruss, trussCroSecId)); + if (_registeredCroSecId[2].IndexOf(trussCroSecId) < 0) + { + AddBraceSection(secBrace_S, secSteel, trussCroSecId, _tagNum[2]++); + } + } + + private void ModelBeamToStbColumnAndGirder( + List secBeams_RC, List secBeams_S, List secColumn_RC, List secColumn_S, K2SSecSteelItems secSteel, + double colMaxAngle, ICollection columns, ICollection girders, double pAngle, double nAngle, ModelBeam modelBeam) + { + int croSecId = _croSecNames.IndexOf(modelBeam.crosec.name); + bool positive = pAngle <= colMaxAngle && pAngle >= -1d * colMaxAngle; + bool negative = nAngle <= colMaxAngle && nAngle >= -1d * colMaxAngle; + + if (positive || negative) + { + var kind = GetColumnStructureKind(modelBeam.crosec.material.family); + columns.Add(K2StbMemberItems.CreateColumn(modelBeam, croSecId, kind)); + if (_registeredCroSecId[0].IndexOf(croSecId) < 0) + { + AddColumnSection(secColumn_S, secColumn_RC, secSteel, kind, croSecId, _tagNum[0]++); + } + } + else + { + var kind = GetGirderStructureKind(modelBeam.crosec.material.family); + girders.Add(K2StbMemberItems.CreateGirder(modelBeam, croSecId, kind)); + if (_registeredCroSecId[1].IndexOf(croSecId) < 0) + { + AddBeamSection(secBeams_S, secBeams_RC, secSteel, kind, croSecId, _tagNum[1]++); + } + } + } + + private void AddBraceSection(ICollection secBrace_S, K2SSecSteelItems secSteel, int croSecId, int vNum) + { + secBrace_S.Add(K2StbSections.BraceSteel(croSecId, vNum, _kModel)); + _registeredCroSecId[2].Add(croSecId); + + if (_registeredCroSecName[2].IndexOf(_kModel.crosecs[croSecId].name) < 0) + { + K2StbSecSteel.GetSection(ref secSteel, _kModel, croSecId); + _registeredCroSecName[2].Add(_kModel.crosecs[croSecId].name); + } + } + + private void AddBeamSection(ICollection secBeams_S, ICollection secBeams_RC, K2SSecSteelItems secSteel, StbGirderKind_structure kind, int croSecId, int gNum) + { + switch (kind) + { + case StbGirderKind_structure.S: + secBeams_S.Add(K2StbSections.BeamSteel(croSecId, gNum, _kModel)); + + if (_registeredCroSecName[1].IndexOf(_kModel.crosecs[croSecId].name) < 0) + { + K2StbSecSteel.GetSection(ref secSteel, _kModel, croSecId); + _registeredCroSecName[1].Add(_kModel.crosecs[croSecId].name); + } + break; + case StbGirderKind_structure.RC: + secBeams_RC.Add(K2StbSections.BeamRc(croSecId, gNum, _kModel)); + break; + default: + throw new ArgumentException("Make sure that the family name of the material is \"Concrete\" or \"Steel\"."); + } + _registeredCroSecId[1].Add(croSecId); + } + + private void AddColumnSection(ICollection secColumns_S, ICollection secColumns_RC, K2SSecSteelItems secSteel, StbColumnKind_structure kind, int croSecId, int cNum) + { + switch (kind) + { + case StbColumnKind_structure.S: + secColumns_S.Add(K2StbSections.ColumnSteel(croSecId, cNum, _kModel)); + + if (_registeredCroSecName[0].IndexOf(_kModel.crosecs[croSecId].name) < 0) + { + K2StbSecSteel.GetSection(ref secSteel, _kModel, croSecId); + _registeredCroSecName[0].Add(_kModel.crosecs[croSecId].name); + } + break; + case StbColumnKind_structure.RC: + secColumns_RC.Add(K2StbSections.ColumnRc(croSecId, cNum, _kModel)); + break; + default: + throw new ArgumentException("Make sure that the family name of the material is \"Concrete\" or \"Steel\"."); + } + _registeredCroSecId[0].Add(croSecId); + } + + private static StbColumnKind_structure GetColumnStructureKind(string materialFamily) + { + switch (materialFamily) + { + case "Steel": + return StbColumnKind_structure.S; + case "Concrete": + return StbColumnKind_structure.RC; + default: + throw new ArgumentException("Make sure that the family name of the material is \"Concrete\" or \"Steel\"."); + } + } + + private static StbGirderKind_structure GetGirderStructureKind(string materialFamily) + { + switch (materialFamily) + { + case "Steel": + return StbGirderKind_structure.S; + case "Concrete": + return StbGirderKind_structure.RC; + default: + throw new ArgumentException("Make sure that the family name of the material is \"Concrete\" or \"Steel\"."); + } + } + } +} diff --git a/KarambaConnect/K2S/K2StbSecSteel.cs b/KarambaConnect/K2S/K2StbSecSteel.cs new file mode 100644 index 00000000..8ff26704 --- /dev/null +++ b/KarambaConnect/K2S/K2StbSecSteel.cs @@ -0,0 +1,139 @@ +using System.Collections.Generic; +using System.Linq; +using Karamba.Models; +using STBDotNet.v202; +using KCroSec = Karamba.CrossSections; + +namespace KarambaConnect.K2S +{ + public static class K2StbSecSteel + { + internal static void GetSection(ref K2SSecSteelItems secSteel, Model kModel, int croSecId) + { + switch (kModel.crosecs[croSecId]) + { + case KCroSec.CroSec_Trapezoid secTrapezoid: + AddTrapezoidSection(ref secSteel, secTrapezoid); + break; + case KCroSec.CroSec_Box secBox: + AddBoxSection(ref secSteel, secBox); + break; + case KCroSec.CroSec_T secT: + AddTShapeSection(ref secSteel, secT); + break; + case KCroSec.CroSec_I secH: + AddHShapeSection(ref secSteel, secH); + break; + case KCroSec.CroSec_Circle secCircle: + AddCircleSection(ref secSteel, secCircle); + break; + default: + AddUnsupportedSection(ref secSteel, kModel, croSecId); + break; + } + } + + private static void AddUnsupportedSection(ref K2SSecSteelItems secSteel, Model kModel, int croSecId) + { + var unsupported = new StbSecPipe + { + name = kModel.crosecs[croSecId].name, + D = 10, + t = 1 + }; + if (secSteel.SecPipes == null) + { + secSteel.SecPipes = new List(); + } + + secSteel.SecPipes.Add(unsupported); + } + + private static void AddCircleSection(ref K2SSecSteelItems secSteel, KCroSec.CroSec_Circle secCircle) + { + var pipe = new StbSecPipe + { + name = secCircle.name, + D = secCircle.getHeight() * 1000, + t = secCircle.thick * 1000 + }; + if (secSteel.SecPipes == null) + { + secSteel.SecPipes = new List(); + } + secSteel.SecPipes.Add(pipe); + } + + private static void AddHShapeSection(ref K2SSecSteelItems secSteel, KCroSec.CroSec_I secH) + { + var hShape = new StbSecRollH + { + name = secH.name, + A = secH._height * 1000, + B = secH.maxWidth() * 1000, + r = secH.fillet_r * 1000, + t1 = secH.w_thick * 1000, + t2 = secH.uf_thick * 1000, + type = StbSecRollHType.H + }; + if (secSteel.SecRollHs == null) + { + secSteel.SecRollHs = new List(); + } + secSteel.SecRollHs.Add(hShape); + } + + private static void AddTShapeSection(ref K2SSecSteelItems secSteel, KCroSec.CroSec_T secT) + { + var tShape = new StbSecRollT + { + name = secT.name, + A = secT._height * 1000, + B = secT.maxWidth() * 1000, + r = secT.fillet_r * 1000, + t1 = secT.w_thick * 1000, + t2 = secT.uf_thick * 1000, + type = StbSecRollTType.T, + }; + if (secSteel.SecRollTs == null) + { + secSteel.SecRollTs = new List(); + } + secSteel.SecRollTs.Add(tShape); + } + + private static void AddBoxSection(ref K2SSecSteelItems secSteel, KCroSec.CroSec_Box secBox) + { + double[] thickness = { secBox.w_thick, secBox.uf_thick, secBox.lf_thick }; + var box = new StbSecRollBOX + { + name = secBox.name, + A = secBox._height * 1000, + B = secBox.maxWidth() * 1000, + r = secBox.fillet_r * 1000, + t = thickness.Max() * 1000, + type = StbSecRollBOXType.ELSE, + }; + if (secSteel.SecRollBoxes == null) + { + secSteel.SecRollBoxes = new List(); + } + secSteel.SecRollBoxes.Add(box); + } + + private static void AddTrapezoidSection(ref K2SSecSteelItems secSteel, KCroSec.CroSec_Trapezoid secTrapezoid) + { + var trapezoid = new StbSecFlatBar + { + name = secTrapezoid.name, + B = secTrapezoid._height * 1000, + t = secTrapezoid.uf_width * 1000 + }; + if (secSteel.SecFlatBars == null) + { + secSteel.SecFlatBars = new List(); + } + secSteel.SecFlatBars.Add(trapezoid); + } + } +} diff --git a/KarambaConnect/K2S/K2StbSections.cs b/KarambaConnect/K2S/K2StbSections.cs new file mode 100644 index 00000000..9e2cc790 --- /dev/null +++ b/KarambaConnect/K2S/K2StbSections.cs @@ -0,0 +1,159 @@ +using Karamba.CrossSections; +using Karamba.Models; +using STBDotNet.v202; + +namespace KarambaConnect.K2S +{ + public static class K2StbSections + { + internal static StbSecBeam_RC BeamRc(int croSecId, int gNum, Model kModel) + { + if (kModel.crosecs[croSecId] is CroSec_Trapezoid trapezoid) + { + return CreateTrapezoidBeam(croSecId, gNum, trapezoid); + } + + return CreateUnsupportedTypeBeam(croSecId, gNum); + } + + private static StbSecBeam_RC CreateUnsupportedTypeBeam(int croSecId, int gNum) + { + return new StbSecBeam_RC + { + id = (croSecId + 1).ToString(), + name = "G" + gNum, + kind_beam = StbSecBeam_RCKind_beam.GIRDER, + StbSecFigureBeam_RC = new StbSecFigureBeam_RC + { + Items = new object[] { new StbSecBeam_RC_Straight { depth = 10, width = 10 } } + }, + }; + } + + private static StbSecBeam_RC CreateTrapezoidBeam(int croSecId, int gNum, CroSec_Trapezoid trapezoid) + { + return new StbSecBeam_RC + { + id = (croSecId + 1).ToString(), + name = "G" + gNum, + kind_beam = StbSecBeam_RCKind_beam.GIRDER, + StbSecFigureBeam_RC = new StbSecFigureBeam_RC + { + Items = new object[] { new StbSecBeam_RC_Straight + { + depth = trapezoid._height * 1000, + width = trapezoid.maxWidth() * 1000 + } } + }, + }; + } + + internal static StbSecColumn_RC ColumnRc(int croSecId, int cNum, Model kModel) + { + switch (kModel.crosecs[croSecId]) + { + case CroSec_Trapezoid trapezoid: + return CreateTrapezoidColumn(croSecId, cNum, trapezoid); + case CroSec_Circle circle: + return CreateCircleColumn(croSecId, cNum, circle); + default: + return CreateUnsupportedTypeColumn(croSecId, cNum); + } + } + + private static StbSecColumn_RC CreateUnsupportedTypeColumn(int croSecId, int cNum) + { + return new StbSecColumn_RC + { + id = (croSecId + 1).ToString(), + name = "C" + cNum, + kind_column = StbSecColumn_RCKind_column.COLUMN, + StbSecFigureColumn_RC = new StbSecFigureColumn_RC + { + Item = new StbSecColumn_RC_Rect { width_X = 10, width_Y = 10 } + }, + }; + } + + private static StbSecColumn_RC CreateCircleColumn(int croSecId, int cNum, CroSec_Circle circle) + { + return new StbSecColumn_RC + { + id = (croSecId + 1).ToString(), + name = "C" + cNum, + kind_column = StbSecColumn_RCKind_column.COLUMN, + StbSecFigureColumn_RC = new StbSecFigureColumn_RC + { + Item = new StbSecColumn_RC_Circle { D = circle.getHeight() * 1000 } + }, + }; + } + + private static StbSecColumn_RC CreateTrapezoidColumn(int croSecId, int cNum, CroSec_Trapezoid trapezoid) + { + return new StbSecColumn_RC + { + id = (croSecId + 1).ToString(), + name = "C" + cNum, + kind_column = StbSecColumn_RCKind_column.COLUMN, + StbSecFigureColumn_RC = new StbSecFigureColumn_RC + { + Item = new StbSecColumn_RC_Rect { width_X = trapezoid.maxWidth() * 1000, width_Y = trapezoid._height * 1000 } + }, + }; + } + + internal static StbSecBrace_S BraceSteel(int croSecId, int vNum, Model kModel) + { + return new StbSecBrace_S + { + id = (croSecId + 1).ToString(), + name = "V" + vNum, + StbSecSteelFigureBrace_S = new StbSecSteelFigureBrace_S + { + Items = new object[] { new StbSecSteelBrace_S_Same + { + shape = kModel.crosecs[croSecId].name, + strength_main = "SN400" + } } + } + }; + } + + internal static StbSecBeam_S BeamSteel(int croSecId, int gNum, Model kModel) + { + return new StbSecBeam_S + { + id = (croSecId + 1).ToString(), + name = "G" + gNum, + kind_beam = StbSecBeam_SKind_beam.GIRDER, + StbSecSteelFigureBeam_S = new StbSecSteelFigureBeam_S + { + Items = new object[] { new StbSecSteelBeam_S_Straight + { + shape = kModel.crosecs[croSecId].name, + strength_main = "SN400", + } } + }, + }; + } + + internal static StbSecColumn_S ColumnSteel(int croSecId, int cNum, Model kModel) + { + return new StbSecColumn_S + { + id = (croSecId + 1).ToString(), + name = "C" + cNum, + kind_column = StbSecColumn_SKind_column.COLUMN, + StbSecSteelFigureColumn_S = new StbSecSteelFigureColumn_S + { + Items = new object[] { new StbSecSteelColumn_S_Same + { + shape = kModel.crosecs[croSecId].name, + strength_main = "SN400", + } } + }, + }; + } + } +} diff --git a/KarambaConnect/K2S/StbCommon.cs b/KarambaConnect/K2S/StbCommon.cs deleted file mode 100644 index 6678023f..00000000 --- a/KarambaConnect/K2S/StbCommon.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using STBDotNet.Elements.StbCommon; - -namespace KarambaConnect.K2S -{ - public static class StbCommon - { - public static Common Set() - { - var common = new Common - { - AppName = "HoaryFox Stb Converter", - ProjectName = "Grasshopper Karamba model", - Guid = Guid.NewGuid().ToString("D") - }; - - return common; - } - } -} diff --git a/KarambaConnect/K2S/StbMember.cs b/KarambaConnect/K2S/StbMember.cs deleted file mode 100644 index 7d0b3591..00000000 --- a/KarambaConnect/K2S/StbMember.cs +++ /dev/null @@ -1,50 +0,0 @@ -using Karamba.Elements; -using STBDotNet.Elements.StbModel.StbMember; - -namespace KarambaConnect.K2S -{ - public static class StbMember - { - internal static Column CreateColumn(ModelBeam elem, int croSecId, string kind) - { - return new Column - { - Id = elem.ind + 1, - Name = elem.id, - IdNodeStart = elem.node_inds[0] + 1, - IdNodeEnd = elem.node_inds[1] + 1, - Rotate = 0d, - IdSection = croSecId + 1, - Kind = kind - }; - } - - internal static Girder CreateGirder(ModelBeam elem, int croSecId, string kind) - { - return new Girder - { - Id = elem.ind + 1, - Name = elem.id, - IdNodeStart = elem.node_inds[0] + 1, - IdNodeEnd = elem.node_inds[1] + 1, - Rotate = 0d, - IdSection = croSecId + 1, - Kind = kind - }; - } - - internal static Brace CreateBrace(ModelTruss elem, int croSecId) - { - return new Brace - { - Id = elem.ind + 1, - Name = elem.id, - IdNodeStart = elem.node_inds[0] + 1, - IdNodeEnd = elem.node_inds[1] + 1, - Rotate = 0d, - IdSection = croSecId + 1, - Kind = "S" - }; - } - } -} diff --git a/KarambaConnect/K2S/StbModel.cs b/KarambaConnect/K2S/StbModel.cs deleted file mode 100644 index 90542f5c..00000000 --- a/KarambaConnect/K2S/StbModel.cs +++ /dev/null @@ -1,176 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Karamba.Elements; -using Karamba.GHopper.Geometry; -using Rhino.Geometry; -using STBDotNet.Elements.StbModel.StbMember; -using STBDotNet.Elements.StbModel.StbSection; -using Model = STBDotNet.Elements.StbModel.Model; - -namespace KarambaConnect.K2S -{ - public class StbModel - { - // 0:column, 1:girder, 2:brace - private readonly List> _registeredCroSecId = new List> - { - new List(), new List(), new List() - }; - private readonly List> _registeredCroSecName = new List> - { - new List(), new List(), new List() - }; - private readonly Members _members = new Members - { - Columns = new List(), - Girders = new List(), - Braces = new List() - }; - private readonly List
_sections = new List
(); - private Steel _secSteel = new Steel(); - - private readonly int[] _tagNum = { 1, 1, 1 }; - private readonly List _croSecNames = new List(); - private readonly Karamba.Models.Model _kModel; - - public StbModel(Karamba.Models.Model kModel) - { - _kModel = kModel; - _croSecNames = _kModel.crosecs.Select(sec => sec.name).ToList(); - } - - public Model SetByAngle(double colMaxAngle) - { - foreach (ModelElement elem in _kModel.elems) - { - if (!(elem is ModelElementStraightLine)) - { - continue; - } - var elemLine = new Line(_kModel.nodes[elem.node_inds[0]].pos.Convert(), _kModel.nodes[elem.node_inds[1]].pos.Convert()); - double pAngle = Vector3d.VectorAngle(elemLine.Direction, Vector3d.ZAxis); - double nAngle = Vector3d.VectorAngle(elemLine.Direction, -Vector3d.ZAxis); - - switch (elem) - { - case ModelBeam modelBeam: - AddModelBeam(modelBeam, pAngle, nAngle, colMaxAngle); - break; - case ModelTruss modelTruss: - AddModelTruss(modelTruss); - break; - default: - throw new ArgumentException("Karamba3D model parse error."); - } - } - - _sections.Add(_secSteel); - return new Model { Members = _members, Sections = _sections }; - } - - private void AddModelBeam(ModelBeam modelBeam, double pAngle, double nAngle, double colMaxAngle) - { - int croSecId = _croSecNames.IndexOf(modelBeam.crosec.name); - string kind = GetElementKind(modelBeam.crosec.material.family); - bool positive = pAngle <= colMaxAngle && pAngle >= -1d * colMaxAngle; - bool negative = nAngle <= colMaxAngle && nAngle >= -1d * colMaxAngle; - - if (positive || negative) - { - _members.Columns.Add(StbMember.CreateColumn(modelBeam, croSecId, kind)); - if (_registeredCroSecId[0].IndexOf(croSecId) < 0) - { - AddColumnSection(kind, croSecId, _tagNum[0]++); - } - } - else - { - _members.Girders.Add(StbMember.CreateGirder(modelBeam, croSecId, kind)); - if (_registeredCroSecId[1].IndexOf(croSecId) < 0) - { - AddBeamSection(kind, croSecId, _tagNum[1]++); - } - } - } - - private void AddModelTruss(ModelTruss modelTruss) - { - int croSecId = _croSecNames.IndexOf(modelTruss.crosec.name); - _members.Braces.Add(StbMember.CreateBrace(modelTruss, croSecId)); - if (_registeredCroSecId[2].IndexOf(croSecId) < 0) - { - AddBraceSection(croSecId, _tagNum[2]++); - } - } - - private void AddBraceSection(int croSecId, int vNum) - { - _sections.Add(StbSection.GetBraceSt(croSecId, vNum, _kModel)); - _registeredCroSecId[2].Add(croSecId); - - if (_registeredCroSecName[2].IndexOf(_kModel.crosecs[croSecId].name) < 0) - { - StbSecSteel.GetSection(ref _secSteel, _kModel, croSecId); - _registeredCroSecName[2].Add(_kModel.crosecs[croSecId].name); - } - } - - private void AddBeamSection(string kind, int croSecId, int gNum) - { - switch (kind) - { - case "S": - _sections.Add(StbSection.GetBeamSt(croSecId, gNum, _kModel)); - - if (_registeredCroSecName[1].IndexOf(_kModel.crosecs[croSecId].name) < 0) - { - StbSecSteel.GetSection(ref _secSteel, _kModel, croSecId); - _registeredCroSecName[1].Add(_kModel.crosecs[croSecId].name); - } - break; - case "RC": - _sections.Add(StbSection.GetBeamRc(croSecId, gNum, _kModel)); - break; - default: - throw new ArgumentException("Make sure that the family name of the material is \"Concrete\" or \"Steel\"."); - } - _registeredCroSecId[1].Add(croSecId); - } - - private void AddColumnSection(string kind, int croSecId, int cNum) - { - switch (kind) - { - case "S": - _sections.Add(StbSection.GetColumnSt(croSecId, cNum, _kModel)); - - if (_registeredCroSecName[0].IndexOf(_kModel.crosecs[croSecId].name) < 0) - { - StbSecSteel.GetSection(ref _secSteel, _kModel, croSecId); - _registeredCroSecName[0].Add(_kModel.crosecs[croSecId].name); - } - break; - case "RC": - _sections.Add(StbSection.GetColumnRc(croSecId, cNum, _kModel)); - break; - default: - throw new ArgumentException("Make sure that the family name of the material is \"Concrete\" or \"Steel\"."); - } - _registeredCroSecId[0].Add(croSecId); - } - - private static string GetElementKind(string materialFamily) - { - switch (materialFamily) - { - case "Steel": - return "S"; - case "Concrete": - return "RC"; - default: - return string.Empty; - } - } - } -} diff --git a/KarambaConnect/K2S/StbSecSteel.cs b/KarambaConnect/K2S/StbSecSteel.cs deleted file mode 100644 index 1972a278..00000000 --- a/KarambaConnect/K2S/StbSecSteel.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Karamba.Models; -using STBDotNet.Elements.StbModel.StbSection; -using KCroSec = Karamba.CrossSections; - -namespace KarambaConnect.K2S -{ - public static class StbSecSteel - { - internal static void GetSection(ref Steel secSteel, Model kModel, int croSecId) - { - switch (kModel.crosecs[croSecId]) - { - case KCroSec.CroSec_Trapezoid secTrapezoid: - AddTrapezoidSection(ref secSteel, secTrapezoid); - break; - case KCroSec.CroSec_Box secBox: - AddBoxSection(ref secSteel, secBox); - break; - case KCroSec.CroSec_T secT: - AddTShapeSection(ref secSteel, secT); - break; - case KCroSec.CroSec_I secH: - AddHShapeSection(ref secSteel, secH); - break; - case KCroSec.CroSec_Circle secCircle: - AddCircleSection(ref secSteel, secCircle); - break; - default: - AddUnsupportedSection(ref secSteel, kModel, croSecId); - break; - } - } - - private static void AddUnsupportedSection(ref Steel secSteel, Model kModel, int croSecId) - { - var unsupported = new Pipe - { - Name = kModel.crosecs[croSecId].name, - D = 10, - T = 1 - }; - if (secSteel.Pipe == null) - { - secSteel.Pipe = new List(); - } - secSteel.Pipe.Add(unsupported); - } - - private static void AddCircleSection(ref Steel secSteel, KCroSec.CroSec_Circle secCircle) - { - var pipe = new Pipe - { - Name = secCircle.name, - D = secCircle.getHeight() * 1000, - T = secCircle.thick * 1000 - }; - if (secSteel.Pipe == null) - { - secSteel.Pipe = new List(); - } - secSteel.Pipe.Add(pipe); - } - - private static void AddHShapeSection(ref Steel secSteel, KCroSec.CroSec_I secH) - { - var hShape = new RollH - { - Name = secH.name, - A = secH._height * 1000, - B = secH.maxWidth() * 1000, - R = secH.fillet_r * 1000, - T1 = secH.w_thick * 1000, - T2 = secH.uf_thick * 1000, - Type = "H" - }; - if (secSteel.RollH == null) - { - secSteel.RollH = new List(); - } - secSteel.RollH.Add(hShape); - } - - private static void AddTShapeSection(ref Steel secSteel, KCroSec.CroSec_T secT) - { - var tShape = new RollT - { - Name = secT.name, - A = secT._height * 1000, - B = secT.maxWidth() * 1000, - R = secT.fillet_r * 1000, - T1 = secT.w_thick * 1000, - T2 = secT.uf_thick * 1000, - Type = "T" - }; - if (secSteel.RollT == null) - { - secSteel.RollT = new List(); - } - secSteel.RollT.Add(tShape); - } - - private static void AddBoxSection(ref Steel secSteel, KCroSec.CroSec_Box secBox) - { - double[] thickness = { secBox.w_thick, secBox.uf_thick, secBox.lf_thick }; - var box = new RollBox - { - Name = secBox.name, - A = secBox._height * 1000, - B = secBox.maxWidth() * 1000, - R = secBox.fillet_r * 1000, - T = thickness.Max() * 1000, - Type = "ELSE" - }; - if (secSteel.RollBox == null) - { - secSteel.RollBox = new List(); - } - secSteel.RollBox.Add(box); - } - - private static void AddTrapezoidSection(ref Steel secSteel, KCroSec.CroSec_Trapezoid secTrapezoid) - { - var trapezoid = new FlatBar - { - Name = secTrapezoid.name, - B = secTrapezoid._height * 1000, - T = secTrapezoid.uf_width * 1000 - }; - if (secSteel.FlatBar == null) - { - secSteel.FlatBar = new List(); - } - secSteel.FlatBar.Add(trapezoid); - } - } -} diff --git a/KarambaConnect/K2S/StbSection.cs b/KarambaConnect/K2S/StbSection.cs deleted file mode 100644 index 3e5b305c..00000000 --- a/KarambaConnect/K2S/StbSection.cs +++ /dev/null @@ -1,225 +0,0 @@ -using Karamba.CrossSections; -using Karamba.Models; -using STBDotNet.Elements.StbModel.StbSection; - -namespace KarambaConnect.K2S -{ - public static class StbSection - { - internal static Section GetBeamRc(int croSecId, int gNum, Model kModel) - { - if (kModel.crosecs[croSecId] is CroSec_Trapezoid trapezoid) - { - return CreateTrapezoidBeam(croSecId, gNum, trapezoid); - } - - return CreateUnsupportedTypeBeam(croSecId, gNum); - } - - private static Section CreateUnsupportedTypeBeam(int croSecId, int gNum) - { - return new BeamRc - { - Id = croSecId + 1, - Name = "G" + gNum, - DBarMain = "D22", - DStirrup = "D10", - Figure = new RcBeamSecFigure - { - SecStraight = new RcBeamSecFigure.Straight - { - Depth = 10, - Width = 10 - } - }, - BarArrangement = UndefinedBeamArrangement() - }; - } - - private static Section CreateTrapezoidBeam(int croSecId, int gNum, CroSec_Trapezoid trapezoid) - { - return new BeamRc - { - Id = croSecId + 1, - Name = "G" + gNum, - DBarMain = "D22", - DStirrup = "D10", - Figure = new RcBeamSecFigure - { - SecStraight = new RcBeamSecFigure.Straight - { - Depth = trapezoid._height * 1000, - Width = trapezoid.maxWidth() * 1000 - } - }, - BarArrangement = UndefinedBeamArrangement() - }; - } - - private static RcBeamSecBarArrangement UndefinedBeamArrangement() - { - return new RcBeamSecBarArrangement - { - SameSection = new RcBeamSecBarArrangement.Same - { - CountMainTop1st = 3, - CountMainBottom1st = 3, - CountStirrup = 2, - PitchStirrup = 100 - } - }; - } - - internal static Section GetColumnRc(int croSecId, int cNum, Model kModel) - { - switch (kModel.crosecs[croSecId]) - { - case CroSec_Trapezoid trapezoid: - return CreateTrapezoidColumn(croSecId, cNum, trapezoid); - case CroSec_Circle circle: - return CreateCircleColumn(croSecId, cNum, circle); - default: - return CreateUnsupportedTypeColumn(croSecId, cNum); - } - } - - private static Section CreateUnsupportedTypeColumn(int croSecId, int cNum) - { - return new ColumnRc - { - Id = croSecId + 1, - Name = "C" + cNum, - DBarMain = "D22", - DBarBand = "D10", - Figure = new RcColumnSecFigure - { - SecRect = new RcColumnSecFigure.Rectangle - { - DX = 10, - DY = 10 - } - }, - BarArrangement = UndefinedColumnArrangement() - }; - } - - private static RcColumnSecBarArrangement UndefinedColumnArrangement() - { - return new RcColumnSecBarArrangement - { - RectSameSection = new RcColumnSecBarArrangement.RectSame - { - CountMainX1st = 2, - CountMainY1st = 2, - CountMainTotal = 4, - PitchBand = 100, - CountBandDirX = 2, - CountBandDirY = 2, - } - }; - } - - private static Section CreateCircleColumn(int croSecId, int cNum, CroSec_Circle circle) - { - return new ColumnRc - { - Id = croSecId, - Name = "C" + cNum, - DBarMain = "D22", - DBarBand = "D10", - Figure = new RcColumnSecFigure - { - SecCircle = new RcColumnSecFigure.Circle - { - D = circle.getHeight() * 1000 - } - }, - BarArrangement = new RcColumnSecBarArrangement - { - CircleSameSection = new RcColumnSecBarArrangement.CircleSame - { - CountMain = 6, - PitchBand = 100 - } - } - }; - } - - private static Section CreateTrapezoidColumn(int croSecId, int cNum, CroSec_Trapezoid trapezoid) - { - return new ColumnRc - { - Id = croSecId + 1, - Name = "C" + cNum, - DBarMain = "D22", - DBarBand = "D10", - Figure = new RcColumnSecFigure - { - SecRect = new RcColumnSecFigure.Rectangle - { - DX = trapezoid.maxWidth() * 1000, - DY = trapezoid._height * 1000 - } - }, - BarArrangement = UndefinedColumnArrangement() - }; - } - - internal static Section GetBraceSt(int croSecId, int vNum, Model kModel) - { - return new BraceS - { - Id = croSecId + 1, - Name = "V" + vNum, - SteelBrace = new[] - { - new SecSteel - { - Position = "ALL", - Shape = kModel.crosecs[croSecId].name, - StrengthMain = "SN400", - StrengthWeb = "SN400" - } - } - }; - } - - internal static Section GetBeamSt(int croSecId, int gNum, Model kModel) - { - return new BeamS - { - Id = croSecId + 1, - Name = "G" + gNum, - SteelBeams = new[] - { - new SecSteel - { - Position = "ALL", - Shape = kModel.crosecs[croSecId].name, - StrengthMain = "SN400", - StrengthWeb = "SN400" - } - } - }; - } - - internal static Section GetColumnSt(int croSecId, int cNum, Model kModel) - { - return new ColumnS - { - Id = croSecId + 1, - Name = "C" + cNum, - SteelColumn = new[] - { - new SecSteel - { - Position = "ALL", - Shape = kModel.crosecs[croSecId].name, - StrengthMain = "SN400", - StrengthWeb = "SN400" - } - } - }; - } - } -} diff --git a/KarambaConnect/Library/STBReader.dll b/KarambaConnect/Library/STBReader.dll deleted file mode 100644 index c2851d80..00000000 Binary files a/KarambaConnect/Library/STBReader.dll and /dev/null differ diff --git a/KarambaConnect/Properties/AssemblyInfo.cs b/KarambaConnect/Properties/AssemblyInfo.cs deleted file mode 100644 index 032c241f..00000000 --- a/KarambaConnect/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("HoaryFox(karambaConnect)")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("hrntsm")] -[assembly: AssemblyProduct("HoaryFox(karambaConnect)")] -[assembly: AssemblyCopyright("Copyright ©hrntsm 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cd5d3228-2b3e-4112-9b42-c82615673dfe")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/KarambaConnect/Properties/Resource.resx b/KarambaConnect/Properties/Resource.resx index 38660d19..25130fc7 100644 --- a/KarambaConnect/Properties/Resource.resx +++ b/KarambaConnect/Properties/Resource.resx @@ -119,13 +119,13 @@ - ..\resources\axisbuilder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\AxisBuilder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ExportStb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\framebuilder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\FrameBuilder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\NodeBuilder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -137,6 +137,6 @@ ..\Resources\StoryBuilder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\tokaramba.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ToKaramba.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/KarambaConnect/Properties/launchSettings.json b/KarambaConnect/Properties/launchSettings.json new file mode 100644 index 00000000..a9156baf --- /dev/null +++ b/KarambaConnect/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "karambaConnect": { + "commandName": "Executable", + "executablePath": "C:\\Program Files\\Rhino 6\\System\\Rhino.exe" + } + } +} \ No newline at end of file diff --git a/KarambaConnect/S2K/CrossSection.cs b/KarambaConnect/S2K/CrossSection.cs index 78b1d950..e65575dd 100644 --- a/KarambaConnect/S2K/CrossSection.cs +++ b/KarambaConnect/S2K/CrossSection.cs @@ -1,192 +1,431 @@ using System; using System.Collections.Generic; using System.Drawing; +using System.Linq; using Karamba.CrossSections; using Karamba.Materials; -using STBReader; -using STBReader.Member; -using STBReader.Section; +using STBDotNet.v202; namespace KarambaConnect.S2K { public static class CrossSection { - public static List[] GetIndex(StbData stbData) + public static List[] GetIndex(ST_BRIDGE stBridge) { - var k3Ids = new List[2]; - k3Ids[0] = new List(); - k3Ids[1] = new List(); + var k3dIds = new[] { new List(), new List(), new List() }; + StbMembers members = stBridge.StbModel.StbMembers; - var frameList = new List { stbData.Columns, stbData.Girders, stbData.Braces }; - foreach (StbFrame frame in frameList) + if (members.StbColumns != null) { - int index = frame is StbBraces ? 1 : 0; - for (var eNum = 0; eNum < frame.Id.Count; eNum++) + k3dIds[0].AddRange(members.StbColumns.Select(column => "Id" + column.id_section)); + } + if (members.StbGirders != null) + { + k3dIds[1].AddRange(members.StbGirders.Select(girder => "Id" + girder.id_section)); + } + if (members.StbBraces != null) + { + k3dIds[2].AddRange(members.StbBraces.Select(brace => "Id" + brace.id_section)); + } + + return k3dIds; + } + + public static List GetCroSec(StbSections sections, CroSecFamilyName familyName) + { + // TODO: 材軸の回転は未設定 + var k3dCroSec = new List(); + var sn400 = new FemMaterial_Isotrop("Steel", "SN400", 20500_0000, 8076_0000, 8076_0000, 78.5, 23_5000, 1.20E-05, Color.Brown); + + k3dCroSec.AddRange(StbSecColumnRcToK3dCroSec(sections.StbSecColumn_RC)); + k3dCroSec.AddRange(StbSecBeamRcToK3dCroSec(sections.StbSecBeam_RC)); + k3dCroSec.AddRange(StbSecSteelToK3dCroSec(sections, sn400, familyName)); + + return k3dCroSec; + } + + private static List StbSecColumnRcToK3dCroSec(IEnumerable columns) + { + var k3dCroSecList = new List(); + + foreach (StbSecColumn_RC column in columns) + { + string name; + CroSec_Beam k3dCroSec; + object figure = column.StbSecFigureColumn_RC.Item; + var material = Material.StbToRcFemMaterial(column.strength_concrete); + switch (figure) { - k3Ids[index].Add("Id" + frame.IdSection[eNum]); + case StbSecColumn_RC_Rect rect: + double widthX = rect.width_X / 10d; + double widthY = rect.width_Y / 10d; + name = $"CD-{widthX * 10}x{widthY * 10}"; + k3dCroSec = new CroSec_Trapezoid("RcColRect", name, null, null, material, widthX, widthY, widthY); + break; + case StbSecColumn_RC_Circle circle: + double d = circle.D / 10d; + name = $"P-{d * 10}"; + k3dCroSec = new CroSec_Circle("RcColCircle", name, null, null, material, d, d / 2); + break; + default: + throw new ArgumentException("Convert StbSecColumn_RC to karamba3d error"); } + k3dCroSec.AddElemId("Id" + column.id); + k3dCroSecList.Add(k3dCroSec); } - return k3Ids; + return k3dCroSecList; } - public static List GetCroSec(StbData stbData, CroSecFamilyName familyName) + private static List StbSecBeamRcToK3dCroSec(IEnumerable girders) { - // TODO: 材軸の回転は未設定（どこで設定するかも謎） - var k3CroSec = new List(); + var k3dCroSecList = new List(); - var fc21 = new FemMaterial_Isotrop("Concrete", "Fc21", 2186_0000, 911_0000, 911_0000, 24, 14_0000, 1.00E-05, Color.Gray); - var sn400 = new FemMaterial_Isotrop("Steel", "SN400", 20500_0000, 8076_0000, 8076_0000, 78.5, 235_0000, 1.20E-05, Color.Brown); + foreach (StbSecBeam_RC girder in girders) + { + double width, depth; + var material = Material.StbToRcFemMaterial(girder.strength_concrete); + object[] figures = girder.StbSecFigureBeam_RC.Items; - k3CroSec.AddRange(ColumnRc(stbData, fc21, familyName)); - k3CroSec.AddRange(BeamRc(stbData, fc21, familyName)); - k3CroSec.AddRange(Steel(stbData, sn400, familyName)); + switch (figures[0]) + { + case StbSecBeam_RC_Straight straight: + width = straight.width / 10d; + depth = straight.depth / 10d; + break; + case StbSecBeam_RC_Taper _: + StbSecBeam_RC_Taper[] tapers = { figures[0] as StbSecBeam_RC_Taper, figures[1] as StbSecBeam_RC_Taper }; + width = tapers.First(figure => figure.pos == StbSecBeam_RC_TaperPos.START).width / 10d; + depth = tapers.First(figure => figure.pos == StbSecBeam_RC_TaperPos.START).depth / 10d; + break; + case StbSecBeam_RC_Haunch _: + StbSecBeam_RC_Haunch[] haunches; + haunches = figures.Length == 2 + ? new[] { figures[0] as StbSecBeam_RC_Haunch, figures[1] as StbSecBeam_RC_Haunch } + : new[] { figures[0] as StbSecBeam_RC_Haunch, figures[1] as StbSecBeam_RC_Haunch, figures[2] as StbSecBeam_RC_Haunch }; + width = haunches.First(figure => figure.pos == StbSecBeam_RC_HaunchPos.CENTER).width / 10d; + depth = haunches.First(figure => figure.pos == StbSecBeam_RC_HaunchPos.CENTER).depth / 10d; + break; + default: + throw new ArgumentException("Convert StbSecBeam_RC to karamba3d error"); + } + var name = $"BD-{width * 10}x{depth * 10}"; + var k3dCroSec = new CroSec_Trapezoid("RcBeam", name, null, null, material, depth, width, width); + k3dCroSec.AddElemId("Id" + girder.id); + k3dCroSecList.Add(k3dCroSec); + } - return k3CroSec; + return k3dCroSecList; } - private static IEnumerable ColumnRc(StbData stbData, FemMaterial material, CroSecFamilyName familyName) + private static List StbSecSteelToK3dCroSec(StbSections sections, FemMaterial material, CroSecFamilyName familyName) { - var k3CroSec = new List(); + var k3dCroSecList = new List(); + + SetRollHSection(sections, material, familyName, k3dCroSecList); + SetBuildHSection(sections, material, familyName, k3dCroSecList); + SetRollBoxSection(sections, material, familyName, k3dCroSecList); + SetBuildBoxSection(sections, material, familyName, k3dCroSecList); + SetRollTSection(sections, material, familyName, k3dCroSecList); + SetPipeSection(sections, material, familyName, k3dCroSecList); + SetRollCSection(sections, material, familyName, k3dCroSecList); + SetRollLSection(sections, material, familyName, k3dCroSecList); + SetLipCSection(sections, material, familyName, k3dCroSecList); + SetFlatBarSection(sections, material, familyName, k3dCroSecList); + SetRoundBarSection(sections, material, familyName, k3dCroSecList); + + return k3dCroSecList; + } - for (var i = 0; i < stbData.SecColumnRc.Id.Count; i++) + private static void SetRollHSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecRollH != null) { - double p1 = stbData.SecColumnRc.Height[i] / 10d; - double p2 = stbData.SecColumnRc.Width[i] / 10d; - var name = $"CD-{p2 * 10}x{p1 * 10}"; + foreach (StbSecRollH rollH in sections.StbSecSteel.StbSecRollH) + { + var k3dCroSec = new CroSec_I(familyName.H, rollH.name, null, null, material, + rollH.A / 10d, rollH.B / 10d, rollH.B / 10d, + rollH.t2 / 10d, rollH.t2 / 10d, rollH.t1 / 10d, rollH.r / 10d, rollH.r / 10d); + SetK3dCroSecElemId(sections, k3dCroSec, rollH.name); + k3dCroSecList.Add(k3dCroSec); + } + } + } - ShapeTypes shapeType = stbData.SecColumnRc.Height[i] <= 0 ? ShapeTypes.Pipe : ShapeTypes.BOX; - CroSec_Beam croSec; - if (shapeType == ShapeTypes.BOX) + private static void SetBuildHSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecBuildH != null) + { + foreach (StbSecBuildH buildH in sections.StbSecSteel.StbSecBuildH) { - // TODO:材料の設定は直す - croSec = new CroSec_Trapezoid(familyName.Box, name, null, null, material, - p1, p2, p2); + var k3dCroSec = new CroSec_I(familyName.H, buildH.name, null, null, material, + buildH.A / 10d, buildH.B / 10d, buildH.B / 10d, + buildH.t2 / 10d, buildH.t2 / 10d, buildH.t1 / 10d); + SetK3dCroSecElemId(sections, k3dCroSec, buildH.name); + k3dCroSecList.Add(k3dCroSec); } - else + } + } + + private static void SetRollBoxSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecRollBOX != null) + { + foreach (StbSecRollBOX rollBOX in sections.StbSecSteel.StbSecRollBOX) { - // TODO: Karambaは中実円断面ないため、PIPEに置換してる。任意断面設定できるはずなので、そっちの方がいい気がする。 - croSec = new CroSec_Circle(familyName.Circle, name, null, null, material, - p2, p2 / 2); + var k3dCroSec = new CroSec_Box(familyName.Box, rollBOX.name, null, null, material, + rollBOX.A / 10d, rollBOX.B / 10d, rollBOX.B / 10d, + rollBOX.t / 10d, rollBOX.t / 10d, rollBOX.t / 10d, rollBOX.r / 10d, rollBOX.r / 10d); + SetK3dCroSecElemId(sections, k3dCroSec, rollBOX.name); + k3dCroSecList.Add(k3dCroSec); } - croSec.AddElemId("Id" + stbData.SecColumnRc.Id[i]); - k3CroSec.Add(croSec); } + } - return k3CroSec; + private static void SetBuildBoxSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecBuildBOX != null) + { + foreach (StbSecBuildBOX buildBOX in sections.StbSecSteel.StbSecBuildBOX) + { + var k3dCroSec = new CroSec_Box(familyName.Box, buildBOX.name, null, null, material, + buildBOX.A / 10d, buildBOX.B / 10d, buildBOX.B / 10d, + buildBOX.t2 / 10d, buildBOX.t2 / 10d, buildBOX.t1 / 10d, 0, -1); + SetK3dCroSecElemId(sections, k3dCroSec, buildBOX.name); + k3dCroSecList.Add(k3dCroSec); + } + } } - private static IEnumerable BeamRc(StbData stbData, FemMaterial material, CroSecFamilyName familyName) + private static void SetRollTSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) { - var k3CroSec = new List(); + if (sections.StbSecSteel.StbSecRollT != null) + { + foreach (StbSecRollT rollT in sections.StbSecSteel.StbSecRollT) + { + var k3dCroSec = new CroSec_T(familyName.T, rollT.name, null, null, material, + rollT.A / 10d, rollT.B / 10d, + rollT.t2 / 10d, rollT.t1 / 10d, rollT.r / 10d, rollT.r / 10d); + SetK3dCroSecElemId(sections, k3dCroSec, rollT.name); + k3dCroSecList.Add(k3dCroSec); + } + } + } - for (var i = 0; i < stbData.SecBeamRc.Id.Count; i++) + private static void SetPipeSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecPipe != null) { - double p1 = stbData.SecBeamRc.Depth[i] / 10d; - double p2 = stbData.SecBeamRc.Width[i] / 10d; - var name = $"BD-{p2 * 10}x{p1 * 10}"; + foreach (StbSecPipe pipe in sections.StbSecSteel.StbSecPipe) + { + var k3dCroSec = new CroSec_Circle(familyName.Circle, pipe.name, null, null, material, + pipe.D / 10d, pipe.t / 10d); + SetK3dCroSecElemId(sections, k3dCroSec, pipe.name); + k3dCroSecList.Add(k3dCroSec); + } + } + } - var croSec = new CroSec_Trapezoid(familyName.Box, name, null, null, material, - p1, p2, p2); - croSec.AddElemId("Id" + stbData.SecBeamRc.Id[i]); - k3CroSec.Add(croSec); + private static void SetRollCSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecRollC != null) + { + foreach (StbSecRollC rollC in sections.StbSecSteel.StbSecRollC) + { + // TODO: 正確な形状に合わせて等価断面計算する。フランジとウェブの角度が95°なのとフィレットは非考慮 + int typeFactor = rollC.type == StbSecRollCType.SINGLE ? 1 : 2; + var eqLength = Math.Sqrt((rollC.A * rollC.t1 + 2 * rollC.B * rollC.t2 - 2 * rollC.t1 * rollC.t2) * typeFactor) / 10d; + var k3dCroSec = new CroSec_Trapezoid(familyName.Circle, rollC.name, null, null, material, eqLength, eqLength, eqLength); + SetK3dCroSecElemId(sections, k3dCroSec, rollC.name); + k3dCroSecList.Add(k3dCroSec); + } } + } - return k3CroSec; + private static void SetRollLSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecRollL != null) + { + foreach (StbSecRollL rollL in sections.StbSecSteel.StbSecRollL) + { + // TODO: 正確な形状に合わせて等価断面計算する。フィレットは非考慮 + int typeFactor = rollL.type == StbSecRollLType.SINGLE ? 1 : 2; + var eqLength = Math.Sqrt((rollL.A * rollL.t1 + rollL.B * rollL.t2 - rollL.t1 * rollL.t2) * typeFactor) / 10d; + var k3dCroSec = new CroSec_Trapezoid(familyName.Circle, rollL.name, null, null, material, eqLength, eqLength, eqLength); + SetK3dCroSecElemId(sections, k3dCroSec, rollL.name); + k3dCroSecList.Add(k3dCroSec); + } + } } - private static IEnumerable Steel(StbData stbData, FemMaterial material, CroSecFamilyName familyName) + private static void SetLipCSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) { - var k3CroSec = new List(); + if (sections.StbSecSteel.StbSecLipC != null) + { + foreach (StbSecLipC lipC in sections.StbSecSteel.StbSecLipC) + { + // TODO: 正確な形状に合わせて等価断面計算する。フィレットは非考慮 + int typeFactor = lipC.type == StbSecLipCType.SINGLE ? 1 : 2; + var eqLength = Math.Sqrt((2 * lipC.A * lipC.t + lipC.H * lipC.t + 2 * lipC.C * lipC.t - 4 * lipC.t * lipC.t) * typeFactor) / 10d; + var k3dCroSec = new CroSec_Trapezoid(familyName.Circle, lipC.name, null, null, material, eqLength, eqLength, eqLength); + SetK3dCroSecElemId(sections, k3dCroSec, lipC.name); + k3dCroSecList.Add(k3dCroSec); + } + } + } - for (var i = 0; i < stbData.SecSteel.Name.Count; i++) + private static void SetFlatBarSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecFlatBar != null) { - string name = stbData.SecSteel.Name[i]; - double p1 = stbData.SecSteel.P1[i] / 10d; - double p2 = stbData.SecSteel.P2[i] / 10d; - double p3 = stbData.SecSteel.P3.Count < i + 1 ? 0 : stbData.SecSteel.P3[i] / 10d; - double p4 = stbData.SecSteel.P4.Count < i + 1 ? 0 : stbData.SecSteel.P4[i] / 10d; - ShapeTypes shapeType = stbData.SecSteel.ShapeType[i]; + foreach (StbSecFlatBar flatBar in sections.StbSecSteel.StbSecFlatBar) + { + var k3dCroSec = new CroSec_Trapezoid(familyName.FB, flatBar.name, null, null, material, flatBar.B, flatBar.t, flatBar.t); + SetK3dCroSecElemId(sections, k3dCroSec, flatBar.name); + k3dCroSecList.Add(k3dCroSec); + } + } + } - CroSec croSec; - double eLength; - switch (shapeType) + private static void SetRoundBarSection(StbSections sections, FemMaterial material, CroSecFamilyName familyName, ICollection k3dCroSecList) + { + if (sections.StbSecSteel.StbSecRoundBar != null) + { + foreach (StbSecRoundBar roundBar in sections.StbSecSteel.StbSecRoundBar) { - case ShapeTypes.H: - croSec = new CroSec_I(familyName.H, name, null, null, material, - p1, p2, p2, p4, p4, p3); - break; - case ShapeTypes.L: - // TODO:Karambaに対応断面形状がないため等価軸断面積置換 - eLength = Math.Sqrt(p1 * p3 + p2 * p4 - p3 * p4); - croSec = new CroSec_Trapezoid(familyName.L, name, null, null, material, - eLength, eLength, eLength); + // TODO: Karambaは中実円断面ないため、矩形の等価断面。 + double eqLength = Math.Sqrt(roundBar.R * roundBar.R * Math.PI) / 10d; + var k3dCroSec = new CroSec_Trapezoid(familyName.Circle, roundBar.name, null, null, material, eqLength, eqLength, eqLength); + SetK3dCroSecElemId(sections, k3dCroSec, roundBar.name); + k3dCroSecList.Add(k3dCroSec); + } + } + } + + private static void SetK3dCroSecElemId(StbSections sections, CroSec k3dCroSec, string steelShapeName) + { + CheckSecColumnIdMatching(sections.StbSecColumn_S, k3dCroSec, steelShapeName); + CheckSecBeamIdMatching(sections.StbSecBeam_S, k3dCroSec, steelShapeName); + CheckSecBraceIdMatching(sections.StbSecBrace_S, k3dCroSec, steelShapeName); + } + + private static void CheckSecColumnIdMatching(IEnumerable columns, CroSec k3dCroSec, string steelShapeName) + { + if (columns == null) + { + return; + } + foreach (StbSecColumn_S column in columns) + { + var memberFigureName = string.Empty; + object[] figures = column.StbSecSteelFigureColumn_S.Items; + switch (figures[0]) + { + case StbSecSteelColumn_S_Same same: + memberFigureName = same.shape; break; - case ShapeTypes.T: - croSec = new CroSec_T(familyName.T, name, null, null, material, - p1, p2, p3, p4); + case StbSecSteelColumn_S_NotSame _: + memberFigureName = new[] { figures[0] as StbSecSteelColumn_S_NotSame, figures[1] as StbSecSteelColumn_S_NotSame } + .First(figure => figure.pos == StbSecSteelColumn_S_NotSamePos.BOTTOM).shape; break; - case ShapeTypes.C: - // TODO:Karambaに対応断面形状がないため等価軸断面積置換 - eLength = Math.Sqrt(p1 * p3 + p2 * p4 - 2 * p3 * p4); - croSec = new CroSec_Trapezoid(familyName.Other, name, null, null, material, - eLength, eLength, eLength); + case StbSecSteelColumn_S_ThreeTypes _: + memberFigureName = new[] { figures[0] as StbSecSteelColumn_S_ThreeTypes, figures[1] as StbSecSteelColumn_S_ThreeTypes, figures[2] as StbSecSteelColumn_S_ThreeTypes } + .First(figure => figure.pos == StbSecSteelColumn_S_ThreeTypesPos.CENTER).shape; break; - case ShapeTypes.FB: - croSec = new CroSec_Trapezoid(familyName.FB, name, null, null, material, - p1, p2, p2); + } + if (memberFigureName == steelShapeName) + { + k3dCroSec.AddElemId("Id" + column.id); + } + } + } + + private static void CheckSecBeamIdMatching(IEnumerable beams, CroSec k3dCroSec, string steelShapeName) + { + if (beams == null) + { + return; + } + foreach (StbSecBeam_S beam in beams) + { + var memberFigureName = string.Empty; + object[] figures = beam.StbSecSteelFigureBeam_S.Items; + switch (figures[0]) + { + case StbSecSteelBeam_S_Straight straight: + memberFigureName = straight.shape; break; - case ShapeTypes.BOX: - throw new ArgumentOutOfRangeException(); - case ShapeTypes.Bar: - // TODO: Karambaは中実円断面ないため、PIPEに置換してる。任意断面設定できるはずなので、そっちの方がいい気がする。 - croSec = new CroSec_Circle(familyName.Other, name, null, null, material, - p2, p2 / 2); + case StbSecSteelBeam_S_Taper _: + memberFigureName = new[] { figures[0] as StbSecSteelBeam_S_Taper, figures[1] as StbSecSteelBeam_S_Taper } + .First(figure => figure.pos == StbSecSteelBeam_S_TaperPos.START).shape; break; - case ShapeTypes.Pipe: - croSec = new CroSec_Circle(familyName.Pipe, name, null, null, material, - p2, p1); + case StbSecSteelBeam_S_Joint _: + var joints = figures.Length == 2 + ? new[] { figures[0] as StbSecSteelBeam_S_Joint, figures[1] as StbSecSteelBeam_S_Joint } + : new[] { figures[0] as StbSecSteelBeam_S_Joint, figures[1] as StbSecSteelBeam_S_Joint, figures[2] as StbSecSteelBeam_S_Joint }; + memberFigureName = joints.First(figure => figure.pos == StbSecSteelBeam_S_JointPos.CENTER).shape; break; - case ShapeTypes.RollBOX: - croSec = new CroSec_Box(familyName.Box, name, null, null, material, - p1, p2, p2, p3, p3, p3, p4); + case StbSecSteelBeam_S_Haunch _: + var haunch = figures.Length == 2 + ? new[] { figures[0] as StbSecSteelBeam_S_Haunch, figures[1] as StbSecSteelBeam_S_Haunch } + : new[] { figures[0] as StbSecSteelBeam_S_Haunch, figures[1] as StbSecSteelBeam_S_Haunch, figures[2] as StbSecSteelBeam_S_Haunch }; + memberFigureName = haunch.First(figure => figure.pos == StbSecSteelBeam_S_HaunchPos.CENTER).shape; break; - case ShapeTypes.BuildBOX: - croSec = new CroSec_Box(familyName.Box, name, null, null, material, - p1, p2, p2, p3, p3, p4, 0); + case StbSecSteelBeam_S_FiveTypes _: + StbSecSteelBeam_S_FiveTypes[] fiveTypes; + switch (figures.Length) + { + case 3: + fiveTypes = new[] { figures[0] as StbSecSteelBeam_S_FiveTypes, figures[1] as StbSecSteelBeam_S_FiveTypes, figures[2] as StbSecSteelBeam_S_FiveTypes }; + break; + case 4: + fiveTypes = new[] { figures[0] as StbSecSteelBeam_S_FiveTypes, figures[1] as StbSecSteelBeam_S_FiveTypes, figures[2] as StbSecSteelBeam_S_FiveTypes, figures[3] as StbSecSteelBeam_S_FiveTypes }; + break; + case 5: + fiveTypes = new[] { figures[0] as StbSecSteelBeam_S_FiveTypes, figures[1] as StbSecSteelBeam_S_FiveTypes, figures[2] as StbSecSteelBeam_S_FiveTypes, figures[3] as StbSecSteelBeam_S_FiveTypes, figures[4] as StbSecSteelBeam_S_FiveTypes }; + break; + default: + throw new ArgumentException("StbSecSteelBeam_S_FiveTypes parse error"); + } + memberFigureName = fiveTypes.First(figure => figure.pos == StbSecSteelBeam_S_FiveTypesPos.CENTER).shape; break; - default: - throw new ArgumentOutOfRangeException(); } - - for (var j = 0; j < stbData.SecColumnS.Id.Count; j++) + if (memberFigureName == steelShapeName) { - if (stbData.SecColumnS.Shape[j] != name) - { - continue; - } - croSec?.AddElemId("Id" + stbData.SecColumnS.Id[j]); + k3dCroSec.AddElemId("Id" + beam.id); } - for (var j = 0; j < stbData.SecBeamS.Id.Count; j++) + } + } + + private static void CheckSecBraceIdMatching(IEnumerable braces, CroSec k3dCroSec, string steelShapeName) + { + if (braces == null) + { + return; + } + foreach (StbSecBrace_S brace in braces) + { + var memberFigureName = string.Empty; + object[] figures = brace.StbSecSteelFigureBrace_S.Items; + switch (figures[0]) { - if (stbData.SecBeamS.Shape[j] != name) - { - continue; - } - croSec?.AddElemId("Id" + stbData.SecBeamS.Id[j]); + case StbSecSteelBrace_S_Same same: + memberFigureName = same.shape; + break; + case StbSecSteelBrace_S_NotSame _: + memberFigureName = new[] { figures[0] as StbSecSteelBrace_S_NotSame, figures[1] as StbSecSteelBrace_S_NotSame } + .First(figure => figure.pos == StbSecSteelBrace_S_NotSamePos.BOTTOM).shape; + break; + case StbSecSteelBrace_S_ThreeTypes _: + memberFigureName = new[] { figures[0] as StbSecSteelBrace_S_ThreeTypes, figures[1] as StbSecSteelBrace_S_ThreeTypes, figures[2] as StbSecSteelBrace_S_ThreeTypes } + .First(figure => figure.pos == StbSecSteelBrace_S_ThreeTypesPos.CENTER).shape; + break; } - for (var j = 0; j < stbData.SecBraceS.Id.Count; j++) + if (memberFigureName == steelShapeName) { - if (stbData.SecBraceS.Shape[j] != name) - { - continue; - } - croSec?.AddElemId("Id" + stbData.SecBraceS.Id[j]); + k3dCroSec.AddElemId("Id" + brace.id); } - k3CroSec.Add(croSec); } - - return k3CroSec; } } } diff --git a/KarambaConnect/S2K/Element.cs b/KarambaConnect/S2K/Element.cs deleted file mode 100644 index 7724c809..00000000 --- a/KarambaConnect/S2K/Element.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections.Generic; -using Karamba.CrossSections; -using Karamba.Elements; -using Karamba.Geometry; -using Karamba.Utilities; -using STBReader; -using STBReader.Member; -using STBReader.Model; - -namespace KarambaConnect.S2K -{ - public static class Element - { - public static List BuilderBeams(StbData stbData, List[] k3Ids) - { - var k3d = new KarambaCommon.Toolkit(); - var elems = new List(); - StbNodes nodes = stbData.Nodes; - - var k3Elems = new[] { new List(), new List() }; - - foreach (StbFrame frame in new List { stbData.Columns, stbData.Girders, stbData.Braces }) - { - int elemIndex = frame is StbBraces ? 1 : 0; - bool bending = !(frame is StbBraces); - - for (var i = 0; i < frame.Id.Count; i++) - { - int idNodeStart = nodes.Id.IndexOf(frame.IdNodeStart[i]); - int idNodeEnd = nodes.Id.IndexOf(frame.IdNodeEnd[i]); - var p0 = new Karamba.Geometry.Point3(nodes.Position[idNodeStart].X / 1000d, nodes.Position[idNodeStart].Y / 1000d, nodes.Position[idNodeStart].Z / 1000d); - var p1 = new Karamba.Geometry.Point3(nodes.Position[idNodeEnd].X / 1000d, nodes.Position[idNodeEnd].Y / 1000d, nodes.Position[idNodeEnd].Z / 1000d); - k3Elems[elemIndex].Add(new Line3(p0, p1)); - } - elems.AddRange(k3d.Part.LineToBeam(k3Elems[elemIndex], k3Ids[elemIndex], new List(), new MessageLogger(), out _, bending)); - } - - return elems; - } - } -} diff --git a/KarambaConnect/S2K/ElementBuilder.cs b/KarambaConnect/S2K/ElementBuilder.cs new file mode 100644 index 00000000..87d56911 --- /dev/null +++ b/KarambaConnect/S2K/ElementBuilder.cs @@ -0,0 +1,89 @@ +using System.Collections.Generic; +using System.Linq; +using Karamba.CrossSections; +using Karamba.Elements; +using Karamba.Geometry; +using Karamba.Utilities; +using STBDotNet.v202; + +namespace KarambaConnect.S2K +{ + public static class ElementBuilder + { + public static List BuilderBeams(StbModel model, List[] k3dIds) + { + var k3dBeams = new List(); + StbNode[] nodes = model.StbNodes; + StbMembers members = model.StbMembers; + + k3dBeams.AddRange(StbColumnToK3dBeam(k3dIds[0], nodes, members.StbColumns)); + k3dBeams.AddRange(StbGirderToK3dBeam(k3dIds[1], nodes, members.StbGirders)); + k3dBeams.AddRange(StbBraceToK3dBeam(k3dIds[2], nodes, members.StbBraces)); + + return k3dBeams; + } + + private static List StbColumnToK3dBeam(List k3Ids, StbNode[] nodes, IEnumerable columns) + { + if (columns == null) + { + return new List(); + } + + var k3dLine3s = new List(); + var k3dKit = new KarambaCommon.Toolkit(); + foreach (StbColumn column in columns) + { + StbNode nodeStart = nodes.First(node => node.id == column.id_node_bottom); + StbNode nodeEnd = nodes.First(node => node.id == column.id_node_top); + var ptFrom = new Point3(nodeStart.X / 1000d, nodeStart.Y / 1000d, nodeStart.Z / 1000d); + var ptTo = new Point3(nodeEnd.X / 1000d, nodeEnd.Y / 1000d, nodeEnd.Z / 1000d); + k3dLine3s.Add(new Line3(ptFrom, ptTo)); + } + + return k3dKit.Part.LineToBeam(k3dLine3s, k3Ids, new List(), new MessageLogger(), out _, true); + } + + private static List StbGirderToK3dBeam(List k3Ids, StbNode[] nodes, IEnumerable girders) + { + if (girders == null) + { + return new List(); + } + + var k3dLine3s = new List(); + var k3dKit = new KarambaCommon.Toolkit(); + foreach (StbGirder girder in girders) + { + StbNode nodeStart = nodes.First(node => node.id == girder.id_node_start); + StbNode nodeEnd = nodes.First(node => node.id == girder.id_node_end); + var ptFrom = new Point3(nodeStart.X / 1000d, nodeStart.Y / 1000d, nodeStart.Z / 1000d); + var ptTo = new Point3(nodeEnd.X / 1000d, nodeEnd.Y / 1000d, nodeEnd.Z / 1000d); + k3dLine3s.Add(new Line3(ptFrom, ptTo)); + } + + return k3dKit.Part.LineToBeam(k3dLine3s, k3Ids, new List(), new MessageLogger(), out _, true); + } + + private static List StbBraceToK3dBeam(List k3Ids, StbNode[] nodes, IEnumerable braces) + { + if (braces == null) + { + return new List(); + } + + var k3dLine3s = new List(); + var k3dKit = new KarambaCommon.Toolkit(); + foreach (StbBrace brace in braces) + { + StbNode nodeStart = nodes.First(node => node.id == brace.id_node_start); + StbNode nodeEnd = nodes.First(node => node.id == brace.id_node_end); + var ptFrom = new Point3(nodeStart.X / 1000d, nodeStart.Y / 1000d, nodeStart.Z / 1000d); + var ptTo = new Point3(nodeEnd.X / 1000d, nodeEnd.Y / 1000d, nodeEnd.Z / 1000d); + k3dLine3s.Add(new Line3(ptFrom, ptTo)); + } + + return k3dKit.Part.LineToBeam(k3dLine3s, k3Ids, new List(), new MessageLogger(), out _, true); + } + } +} diff --git a/KarambaConnect/S2K/Material.cs b/KarambaConnect/S2K/Material.cs new file mode 100644 index 00000000..bbf30582 --- /dev/null +++ b/KarambaConnect/S2K/Material.cs @@ -0,0 +1,116 @@ +using System; +using System.Drawing; +using Karamba.Materials; + +namespace KarambaConnect.S2K +{ + public static class Material + { + public static FemMaterial_Isotrop[] DefaultRcMaterialArray() + { + // TODO: せん断弾性係数あってる？ + return new FemMaterial_Isotrop[] + { + new FemMaterial_Isotrop("Concrete", "Fc18", RcYoungsModulus(18, 23.0), RcShareModulus(18, 23.0, 0.2), RcShareModulus(18, 23.0, 0.2), 24.0, 18_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc21", RcYoungsModulus(21, 23.0), RcShareModulus(21, 23.0, 0.2), RcShareModulus(21, 23.0, 0.2), 24.0, 21_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc24", RcYoungsModulus(24, 23.0), RcShareModulus(24, 23.0, 0.2), RcShareModulus(24, 23.0, 0.2), 24.0, 24_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc27", RcYoungsModulus(27, 23.0), RcShareModulus(27, 23.0, 0.2), RcShareModulus(27, 23.0, 0.2), 24.0, 27_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc30", RcYoungsModulus(30, 23.0), RcShareModulus(30, 23.0, 0.2), RcShareModulus(30, 23.0, 0.2), 24.0, 30_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc33", RcYoungsModulus(33, 23.0), RcShareModulus(33, 23.0, 0.2), RcShareModulus(33, 23.0, 0.2), 24.0, 33_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc36", RcYoungsModulus(36, 23.0), RcShareModulus(36, 23.0, 0.2), RcShareModulus(36, 23.0, 0.2), 24.0, 36_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc40", RcYoungsModulus(40, 23.5), RcShareModulus(40, 23.5, 0.2), RcShareModulus(40, 23.5, 0.2), 24.5, 40_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc42", RcYoungsModulus(42, 23.5), RcShareModulus(42, 23.5, 0.2), RcShareModulus(42, 23.5, 0.2), 24.5, 42_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc45", RcYoungsModulus(45, 23.5), RcShareModulus(45, 23.5, 0.2), RcShareModulus(45, 23.5, 0.2), 24.5, 45_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc50", RcYoungsModulus(50, 24.0), RcShareModulus(50, 24.0, 0.2), RcShareModulus(50, 24.0, 0.2), 25.0, 50_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc55", RcYoungsModulus(55, 24.0), RcShareModulus(55, 24.0, 0.2), RcShareModulus(55, 24.0, 0.2), 25.0, 55_0000, 1.00E-05, Color.Gray), + new FemMaterial_Isotrop("Concrete", "Fc60", RcYoungsModulus(60, 24.0), RcShareModulus(60, 24.0, 0.2), RcShareModulus(60, 24.0, 0.2), 25.0, 60_0000, 1.00E-05, Color.Gray), + }; + } + + public static FemMaterial_Isotrop StbToRcFemMaterial(string stbStrengthFc) + { + double fc, gamma; + const double Nu = 0.2d; + // マッチしなかった場合は Fc21 相当で返す + switch (stbStrengthFc.ToLower()) + { + case "fc18": + fc = 18; + gamma = 23; + break; + case "fc21": + fc = 21; + gamma = 23; + break; + case "fc24": + fc = 24; + gamma = 23; + break; + case "fc27": + fc = 27; + gamma = 23; + break; + case "fc30": + fc = 30; + gamma = 23; + break; + case "fc33": + fc = 33; + gamma = 23; + break; + case "fc36": + fc = 36; + gamma = 23; + break; + case "fc40": + fc = 40; + gamma = 23.5; + break; + case "fc42": + fc = 42; + gamma = 23.5; + break; + case "fc45": + fc = 45; + gamma = 23.5; + break; + case "fc50": + fc = 50; + gamma = 24; + break; + case "fc55": + fc = 55; + gamma = 24; + break; + case "fc60": + fc = 60; + gamma = 24; + break; + default: + fc = 21; + gamma = 23; + break; + } + + return new FemMaterial_Isotrop("Concrete", stbStrengthFc, + RcYoungsModulus(fc, gamma), RcShareModulus(fc, gamma, Nu), RcShareModulus(fc, gamma, Nu), + gamma + 1, fc * 1000, 1.00E-05, Color.Gray); + } + + private static double RcYoungsModulus(double fc, double gamma) + { + // Karamba3D の単位に合わせて kN/cm2 + return 3.34 * Math.Pow(10, 4) * Math.Pow(gamma / 24, 2) * Math.Pow(fc / 60, 1 / 3d) * 1000; + } + + private static double RcShareModulus(double fc, double gamma, double poisson) + { + return RcYoungsModulus(fc, gamma) / (2 * (1 + poisson)); + } + + public static FemMaterial_Isotrop[] DefaultSteelMaterialArray() + { + throw new NotImplementedException(); + } + } +} diff --git a/KarambaConnect/karambaConnect.csproj b/KarambaConnect/karambaConnect.csproj index 7e2fcb79..9d4a19a4 100644 --- a/KarambaConnect/karambaConnect.csproj +++ b/KarambaConnect/karambaConnect.csproj @@ -1,134 +1,38 @@ - - + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {CD5D3228-2B3E-4112-9B42-C82615673DFE} - Library - Properties - KarambaConnect - KarambaConnect - v4.7.2 - 512 - false - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - false - - - pdbonly - true - bin\ - TRACE - prompt - 4 + net48 + 1.0 + karambaConnect + Description of karambaConnect + .gha + hrntsm + true + true + true + - - Library\karamba132\karamba.gha - False - - - False + + + + + + + Library\karamba132\karambaCommon.dll - False + false - - Library\STBReader.dll - True + + Library\karamba132\karamba.gha + false - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - Resource.resx - - - - - - - - - - - - - - - - ResXFileCodeGenerator - Resource.Designer.cs - - - - - 6.20.19322.20361 - compile; build; native; contentfiles; analyzers; buildtransitive - - - 6.20.19322.20361 - compile; build; native; contentfiles; analyzers; buildtransitive - - - 0.1.3 - - - - - - - Copy "$(TargetPath)" "$(TargetDir)$(ProjectName).gha" -Erase "$(TargetPath)" - - - en-US - - + + C:\Program Files\Rhino 6\System\Rhino.exe - - + Program - \ No newline at end of file + + diff --git a/LICENSE b/LICENSE index f313f896..f5b6f435 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019-2020 hrntsm +Copyright (c) 2019 hrntsm Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 4f42a80c..caadc46f 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,10 @@ [![License](https://img.shields.io/github/license/hrntsm/HoaryFox)](https://github.com/hrntsm/HoaryFox/blob/master/LICENSE) [![Release](https://img.shields.io/github/v/release/hrntsm/HoaryFox)](https://github.com/hrntsm/HoaryFox/releases) -[![download](https://img.shields.io/badge/download-Food4Rhino-lightgray)](https://www.food4rhino.com/app/hoaryfox) +[![download](https://img.shields.io/github/downloads/hrntsm/HoaryFox/total)](https://github.com/hrntsm/HoaryFox/releases) +![Build](https://img.shields.io/github/workflow/status/hrntsm/HoaryFox/Build%20Grasshopper%20Plugin) +![CodeQL](https://img.shields.io/github/workflow/status/hrntsm/HoaryFox/CodeQL?label=CodeQL) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/c0a462728dce4983802d447ed67d3e7c)](https://www.codacy.com/gh/hrntsm/HoaryFox/dashboard?utm_source=github.com&utm_medium=referral&utm_content=hrntsm/HoaryFox&utm_campaign=Badge_Grade) [![Maintainability](https://api.codeclimate.com/v1/badges/bc78a575fcf5e9448929/maintainability)](https://codeclimate.com/github/hrntsm/HoaryFox/maintainability) diff --git a/Samples/Convert_to_Karamba.gh b/Samples/Convert_to_Karamba.gh index e733fe52..f591f288 100644 Binary files a/Samples/Convert_to_Karamba.gh and b/Samples/Convert_to_Karamba.gh differ diff --git a/Samples/ExportOptimizedOfficeBuilding2STB.gh b/Samples/ExportOptimizedOfficeBuilding2STB.gh new file mode 100644 index 00000000..06512358 Binary files /dev/null and b/Samples/ExportOptimizedOfficeBuilding2STB.gh differ diff --git a/Samples/ExportSTB.gh b/Samples/ExportSTB.gh index e40adcf8..21d3111b 100644 Binary files a/Samples/ExportSTB.gh and b/Samples/ExportSTB.gh differ diff --git a/Samples/JP_CrossSectionValues.csv b/Samples/JP_CrossSectionValues.csv new file mode 100644 index 00000000..f5964af7 --- /dev/null +++ b/Samples/JP_CrossSectionValues.csv @@ -0,0 +1,552 @@ +#;Japanese H sections;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +#;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +#;;;;;Depth;thickness;Upper Width;thickness;Lower Width;thickness;;Eccentricity;Eccentricity;Eccentricity;Position;Area;effective;effective;Second;Elastic;Elastic;Plastic;Radius;Second;Elastic;Plastic;Radius;Torsional;Elastic;;Imerfection;Imerfection;Imerfection;Type;"(*) 0:cold formed; 1: hot finished; 2: welded; 3: rolled;" +#;;;;;of;of;of;of upper;of;of lower;Root;in local;in local;in local;of;of;Vy shear;Vz shear;Moment;Modulus;Modulus;Modulus;of;Moment;Modulus;Modulus;of;Constant;Modulus;;value;value;value;of; +#;;;;;Section;Web;Section;Flange;Section;Flange;Radius;X-direction;Y-direction;Z-direction;Centroid;Section;Area ;Area ;of Area;upper;lower;;Gyration;of Area;;;Gyration;Inertia;Torsion;;f. buckling;f. buckling;f. lateral tors-;Product; +#;;;;;;;;;;;;;;;;;;;(strong axis);(strong axis);(strong axis);(strong axis);(strong axis);(weak axis);(weak axis);(weak axis);(weak axis);;;;(strong axis);(weak axis);ional buckling;(*); +#;country;family;name;shape;h;t_web;b_upper;t_upper;b_lower;t_lower;r;ex;ey;ez;zs;A;Ay;Az;Iy;Wy;;Wply;i_y;Iz;Wz;Wplz;i_z;It;Wt;Cw;alpha_y;alpha_z;alpha_LT;Product; +#;;;;;mm;mm;mm;mm;mm;mm;mm;cm;cm;cm;cm;cm2;cm2;cm2;cm4;cm3;;cm3;cm;cm4;cm3;cm3;cm;cm4;cm3;cm6;-;-;-;-; +;Japan;H;H 100 x 100 x 6 x 8;I;100;6;100;8;;;8;;;;5;21.59;16.55;5.04;378;75.6;;86.4;4.18;134;26.7;41;2.49;4.91;6.14;2820;0.34;0.49;0.34;3; +;Japan;H;H 125 x 125 x 6.5 x 9;I;125;6.5;125;9;;;8;;;;6.25;30;23.05;6.96;839;134;;152;5.29;293;46.9;71.7;3.13;8.1;9;9860;0.34;0.49;0.34;3; +;Japan;H;H 150 x 75 x 5 x 7;I;150;5;75;7;;;8;;;;7.5;17.85;11.05;6.8;666;88.8;;102;6.11;49.5;13.2;20.8;1.66;2.9;4.14;2520;0.21;0.34;0.34;3 +;Japan;H;H 150 x 150 x 7 x 10;I;150;7;150;10;;;8;;;;7.5;39.65;30.55;9.1;1620;216;;243;6.4;563;75.1;114;3.77;12.7;12.7;27600;0.34;0.49;0.34;3 +;Japan;H;H 175 x 175 x 7.5 x 11;I;175;7.5;175;11;;;13;;;;8.75;51.42;39.95;11.48;2900;331;;370;7.5;984;112;172;4.37;21.34;19.4;66100;0.34;0.49;0.34;3 +;Japan;H;H 200 x 150 x 6 x 9;I;194;6;150;9;;;8;;;;9.7;38.11;27.55;10.56;2630;271;;301;8.3;507;67.6;103;3.65;9.42;10.47;43300;0.21;0.34;0.34;3 +;Japan;H;H 200 x 100 x 4.5 x 7;I;198;4.5;99;7;;;8;;;;9.9;22.69;14.41;8.28;1540;156;;175;8.25;113;22.9;35.5;2.24;3.32;4.74;10300;0.21;0.34;0.34;3 +;Japan;H;H 200 x 100 x 5.5 x 8;I;200;5.5;100;8;;;8;;;;10;26.67;16.55;10.12;1810;181;;205;8.23;134;26.7;41.6;2.24;5.17;6.46;12300;0.21;0.34;0.34;3 +;Japan;H;H 200 x 200 x 8 x 12;I;200;8;200;12;;;13;;;;10;63.53;49.45;14.08;4720;472;;525;8.62;1600;160;244;5.02;30.16;25.13;141000;0.34;0.49;0.34;3 +;Japan;H;H 250 x 125 x 5 x 8;I;248;5;124;8;;;8;;;;12.4;31.99;20.39;11.6;3450;278;;312;10.4;255;41.1;63.2;2.82;5.8;7.25;36600;0.21;0.34;0.34;3 +;Japan;H;H 250 x 125 x 6 x 9;I;250;6;125;9;;;8;;;;12.5;36.97;23.05;13.92;3960;317;;358;10.4;294;47;72.7;2.82;8.61;9.57;42500;0.21;0.34;0.34;3 +;Japan;H;H 250 x 250 x 9 x 14;I;250;9;250;14;;;13;;;;12.5;91.43;71.45;19.98;10700;860;;953;10.8;3650;292;443;6.32;56.24;40.17;508000;0.34;0.49;0.34;3 +;Japan;H;H 300 x 200 x 8 x 12;I;294;8;200;12;;;13;;;;14.7;71.05;49.45;21.6;11100;756;;842;12.5;1600;160;245;4.75;31.8;26.5;318000;0.21;0.34;0.34;3 +;Japan;H;H 300 x 150 x 5.5 x 8;I;298;5.5;149;8;;;13;;;;14.9;40.8;25.29;15.51;6320;424;;475;12.4;442;59.3;91.8;3.29;8.79;10.99;92700;0.21;0.34;0.34;3 +;Japan;H;H 300 x 150 x 6.5 x 9;I;300;6.5;150;9;;;13;;;;15;46.78;28.45;18.33;7210;481;;542;12.4;508;67.7;105;3.29;12.73;14.14;107000;0.21;0.34;0.34;3 +;Japan;H;H 300 x 300 x 10 x 15;I;300;10;300;15;;;13;;;;15;118.5;91.5;27;20200;1350;;1480;13.1;6750;450;683;7.55;82.87;55.25;1370000;0.34;0.49;0.34;3 +;Japan;H;H 350 x 350 x 10 x 16;I;344;10;348;16;;;13;;;;17.2;144;112.8;31.2;32800;1910;;2090;15.1;11240;646;978;8.84;111.6;69.75;3020000;0.34;0.49;0.34;3 +;Japan;H;H 350 x 175 x 6 x 9;I;346;6;174;9;;;13;;;;17.3;52.45;32.77;19.68;11000;638;;712;14.5;791;91;140;3.88;13.28;14.76;224000;0.21;0.34;0.34;3 +;Japan;H;H 350 x 175 x 7 x 11;I;350;7;175;11;;;13;;;;17.5;62.91;39.95;22.96;13500;771;;864;14.6;984;112;173;3.96;22.47;20.43;282000;0.21;0.34;0.34;3 +;Japan;H;H 350 x 350 x 12 x 19;I;350;12;350;19;;;13;;;;17.5;171.9;134.46;37.44;39800;2280;;2520;15.2;13600;776;1180;8.89;186.9;98.37;3720000;0.34;0.49;0.34;3 +;Japan;H;H 400 x 300 x 10 x 16;I;390;10;300;16;;;13;;;;19.5;133.2;97.4;35.8;37900;1940;;2140;16.9;7200;480;730;7.35;100;62.5;2520000;0.21;0.34;0.34;3 +;Japan;H;H 400 x 200 x 7 x 11;I;396;7;199;11;;;13;;;;19.8;71.41;45.23;26.18;19800;999;;1110;16.6;1450;145;223;4.5;25.12;22.84;535000;0.21;0.34;0.34;3 +;Japan;H;H 400 x 200 x 8 x 13;I;400;8;200;13;;;13;;;;20;83.37;53.45;29.92;23500;1170;;1310;16.8;1740;174;267;4.56;39.7;30.54;649000;0.21;0.34;0.34;3 +;Japan;H;H 400 x 400 x 13 x 21;I;400;13;400;21;;;22;;;;20;218.7;172.16;46.54;66600;3330;;3670;17.5;22400;1120;1700;10.1;303.9;144.71;8040000;0.34;0.49;0.34;3 +;Japan;H;H 400 x 400 x 21 x 21;I;400;21;408;21;;;22;;;;20;250.7;175.52;75.18;70900;3540;;3990;16.8;23800;1170;1800;9.75;450.4;214.48;8540000;0.34;0.49;0.34;3 +;Japan;H;H 400 x 400 x 18 x 28;I;414;18;405;28;;;22;;;;20.7;295.4;230.96;64.44;92800;4480;;5030;17.7;31000;1530;2330;10.2;720;257.14;11500000;0.34;0.49;0.34;3 +;Japan;H;H 400 x 400 x 20 x 35;I;428;20;407;35;;;22;;;;21.4;360.7;289.1;71.6;119000;5570;;6310;18.2;39400;1930;2940;10.4;1320;377.14;15200000;0.34;0.49;0.34;3 +;Japan;H;H 400 x 400 x 30 x 50;I;458;30;417;50;;;22;;;;22.9;528.6;421.2;107.4;187000;8170;;9540;18.8;60500;2900;4440;10.7;3930;786;25100000;0.34;0.49;0.34;3 +;Japan;H;H 500 x 300 x 11 x 15;I;482;11;300;15;;;13;;;;24.1;141.2;91.48;49.72;58300;2420;;2700;20.3;6760;450;690;6.92;95.52;63.68;3680000;0.21;0.34;0.34;3 +;Japan;H;H 500 x 300 x 11 x 18;I;488;11;300;18;;;13;;;;24.4;159.2;109.48;49.72;68900;2820;;3130;20.8;8110;540;825;7.14;144;80;4470000;0.21;0.34;0.34;3 +;Japan;H;H 500 x 200 x 9 x 14;I;496;9;199;14;;;13;;;;24.8;99.29;57.17;42.12;40800;1650;;1870;20.3;1840;185;288;4.31;52.89;37.78;1070000;0.21;0.34;0.49;3 +;Japan;H;H 500 x 200 x 10 x 16;I;500;10;200;16;;;13;;;;25;112.2;65.4;46.8;46800;1870;;2130;20.4;2140;214;333;4.36;76.4;47.75;1250000;0.21;0.34;0.49;3 +;Japan;H;H 600 x 300 x 12 x 17;I;582;12;300;17;;;13;;;;29.1;169.2;103.44;65.76;98900;3400;;3820;24.2;7660;511;786;6.73;139.3;81.94;6110000;0.21;0.34;0.34;3 +;Japan;H;H 600 x 300 x 12 x 20;I;588;12;300;20;;;13;;;;29.4;187.2;121.44;65.76;114000;3890;;4350;24.7;9010;601;921;6.94;200;100;7260000;0.21;0.34;0.34;3 +;Japan;H;H 600 x 300 x 14 x 23;I;594;14;302;23;;;13;;;;29.7;217.1;140.38;76.72;134000;4500;;5060;24.8;10600;700;1080;6.98;306;133.04;8610000;0.21;0.34;0.34;3; +;Japan;H;H 700 x 300 x 13 x 20;I;692;13;300;20;;;18;;;;34.6;207.5;122.74;84.76;168000;4870;;5500;28.5;9020;601;930;6.59;228.2;114.1;10200000;0.21;0.34;0.49;3; +;Japan;H;H 700 x 300 x 13 x 24;I;700;13;300;24;;;18;;;;35;231.5;146.74;84.76;197000;5640;;6340;29.2;10800;721;1110;6.83;342.2;142.58;12300000;0.21;0.34;0.49;3; +;Japan;H;H 800 x 300 x 14 x 22;I;792;14;300;22;;;18;;;;39.6;239.5;134.78;104.72;248000;6270;;7140;32.2;9920;661;1030;6.44;304.9;138.59;14700000;0.21;0.34;0.49;3; +;Japan;H;H 800 x 300 x 14 x 26;I;800;14;300;26;;;18;;;;40;263.5;158.78;104.72;286000;7160;;8100;33;11700;781;1210;6.67;439.8;169.15;17500000;0.21;0.34;0.49;3; +;Japan;H;H 900 x 300 x 15 x 23;I;890;15;299;23;;;18;;;;44.5;266.9;140.3;126.6;339000;7610;;8750;35.6;10300;687;1080;6.2;364.7;158.57;19300000;0.21;0.34;0.49;3; +;Japan;H;H 900 x 300 x 16 x 28;I;900;16;300;28;;;18;;;;45;305.8;170.76;135.04;404000;8990;;10300;36.4;12600;842;1320;6.43;581.4;207.64;24000000;0.21;0.34;0.49;3; +;Japan;H;H 900 x 300 x 18 x 34;I;912;18;302;34;;;18;;;;45.6;360.1;208.18;151.92;491000;10800;;12300;36.9;15700;1040;1620;6.59;980.8;288.47;30100000;0.21;0.34;0.49;3; +#;;;;;Depth;thickness;Upper Width;thickness;Lower Width;thickness;;Eccentricity;Eccentricity;Eccentricity;Position;Area;effective;effective;Second;Elastic;Elastic;Plastic;Radius;Second;Elastic;Plastic;Radius;Torsional;Elastic;;Imerfection;Imerfection;Imerfection;Type;(*) 0:cold formed; 1: hot finished; 2: welded; 3: rolled; +#;;;;;of;of;of;of upper;of;of lower;Root;in local;in local;in local;of;of;Vy shear;Vz shear;Moment;Modulus;Modulus;Modulus;of;Moment;Modulus;Modulus;of;Constant;Modulus;;value;value;value;of; +#;;;;;Section;Web;Section;Flange;Section;Flange;Radius;X-direction;Y-direction;Z-direction;Centroid;Section;Area ;Area ;of Area;upper;lower;;Gyration;of Area;;;Gyration;Inertia;Torsion;;f. buckling;f. buckling;f. lateral tors-;Product; +#;;;;;;;;;;;;;;;;;;;(strong axis);(strong axis);(strong axis);(strong axis);(strong axis);(weak axis);(weak axis);(weak axis);(weak axis);;;;(strong axis);(weak axis);ional buckling;(*); +#;country;family;name;shape;h;t_web;b_upper;t_upper;b_lower;t_lower;r;ex;ey;ez;zs;A;Ay;Az;Iy;Wy;;Wply;i_y;Iz;Wz;Wplz;i_z;It;Wt;Cw;alpha_y;alpha_z;alpha_LT;Product; +#;;;;;mm;mm;mm;mm;mm;mm;mm;cm;cm;cm;cm;cm2;cm2;cm2;cm4;cm3;;cm3;cm;cm4;cm3;cm3;cm;cm4;cm3;cm6;-;-;-;-; +#;;;;;mm;mm;mm;mm;mm;mm;mm;cm;cm;cm;cm;cm2;cm2;cm2;cm4;cm3;;cm3;cm;cm4;cm3;cm3;cm;cm4;cm3;cm6;-;-;-;-;;;;;;;;;; +;Japan;SH;H 400 x 200 x 9 x 12;I;400 ;9 ;200 ;12 ;;;13 ;;;;20 ;83 ;48 ;35 ;22600 ;1130 ;;1280 ;17 ;1600 ;160 ;249 ;4 ;32 ;27 ;602176 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 400 x 200 x 9 x 16;I;400 ;9 ;200 ;16 ;;;13 ;;;;20 ;99 ;64 ;35 ;27800 ;1390 ;;1560 ;17 ;2140 ;214 ;329 ;5 ;64 ;40 ;786432 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 400 x 200 x 9 x 19;I;400 ;9 ;200 ;19 ;;;13 ;;;;20 ;110 ;76 ;34 ;31600 ;1580 ;;1770 ;17 ;2540 ;254 ;388 ;5 ;100 ;53 ;919353 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 400 x 200 x 9 x 22;I;400 ;9 ;200 ;22 ;;;13 ;;;;20 ;122 ;88 ;34 ;35300 ;1760 ;;1970 ;17 ;2940 ;294 ;448 ;5 ;151 ;68 ;1047816 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 400 x 200 x 12 x 22;I;400 ;12 ;200 ;22 ;;;13 ;;;;20 ;132 ;88 ;44 ;36400 ;1820 ;;2070 ;17 ;2940 ;294 ;454 ;5 ;162 ;74 ;1047816 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 200 x 9 x 12;I;450 ;9 ;200 ;12 ;;;13 ;;;;23 ;88 ;48 ;40 ;29500 ;1310 ;;1490 ;18 ;1600 ;160 ;250 ;4 ;33 ;28 ;767376 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 200 x 9 x 16;I;450 ;9 ;200 ;16 ;;;13 ;;;;23 ;103 ;64 ;39 ;36200 ;1610 ;;1810 ;19 ;2140 ;214 ;330 ;5 ;65 ;40 ;1004565 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 200 x 9 x 19;I;450 ;9 ;200 ;19 ;;;13 ;;;;23 ;115 ;76 ;39 ;41200 ;1830 ;;2050 ;19 ;2540 ;254 ;389 ;5 ;101 ;53 ;1176486 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 200 x 9 x 22;I;450 ;9 ;200 ;22 ;;;13 ;;;;23 ;126 ;88 ;38 ;45900 ;2040 ;;2280 ;19 ;2940 ;294 ;449 ;5 ;152 ;69 ;1343349 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 200 x 12 x 19;I;450 ;12 ;200 ;19 ;;;13 ;;;;23 ;127 ;76 ;51 ;42900 ;1910 ;;2180 ;18 ;2540 ;254 ;396 ;4 ;115 ;61 ;1176486 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 200 x 12 x 22;I;450 ;12 ;200 ;22 ;;;13 ;;;;23 ;138 ;88 ;50 ;47600 ;2120 ;;2410 ;19 ;2940 ;294 ;456 ;5 ;165 ;75 ;1343349 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 200 x 12 x 25;I;450 ;12 ;200 ;25 ;;;13 ;;;;23 ;150 ;100 ;50 ;52200 ;2320 ;;2630 ;19 ;3340 ;334 ;516 ;5 ;231 ;93 ;1505208 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 250 x 9 x 16;I;450 ;9 ;250 ;16 ;;;13 ;;;;23 ;119 ;80 ;39 ;43800 ;1950 ;;2160 ;19 ;4170 ;334 ;510 ;6 ;78 ;49 ;1962042 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 250 x 9 x 19;I;450 ;9 ;250 ;19 ;;;13 ;;;;23 ;134 ;95 ;39 ;50000 ;2220 ;;2460 ;19 ;4950 ;396 ;603 ;6 ;124 ;65 ;2297825 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 250 x 9 x 22;I;450 ;9 ;250 ;22 ;;;13 ;;;;23 ;148 ;110 ;38 ;56000 ;2490 ;;2750 ;20 ;5730 ;459 ;697 ;6 ;187 ;85 ;2623729 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 250 x 12 x 22;I;450 ;12 ;250 ;22 ;;;13 ;;;;23 ;160 ;110 ;50 ;57700 ;2560 ;;2880 ;19 ;5740 ;459 ;703 ;6 ;201 ;91 ;2623729 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 250 x 12 x 25;I;450 ;12 ;250 ;25 ;;;13 ;;;;23 ;175 ;125 ;50 ;63500 ;2820 ;;3160 ;19 ;6520 ;521 ;797 ;6 ;283 ;113 ;2939860 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 450 x 250 x 12 x 28;I;450 ;12 ;250 ;28 ;;;13 ;;;;23 ;189 ;140 ;49 ;69100 ;3070 ;;3450 ;19 ;7300 ;584 ;890 ;6 ;389 ;139 ;3246323 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 200 x 9 x 12;I;500 ;9 ;200 ;12 ;;;13 ;;;;25 ;92 ;48 ;44 ;37500 ;1500 ;;1720 ;20 ;1600 ;160 ;251 ;4 ;35 ;29 ;952576 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 200 x 9 x 16;I;500 ;9 ;200 ;16 ;;;13 ;;;;25 ;108 ;64 ;44 ;46000 ;1840 ;;2080 ;21 ;2140 ;214 ;331 ;4 ;66 ;41 ;1249365 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 200 x 9 x 19;I;500 ;9 ;200 ;19 ;;;13 ;;;;25 ;119 ;76 ;43 ;52100 ;2090 ;;2340 ;21 ;2540 ;254 ;390 ;5 ;103 ;54 ;1465286 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 200 x 9 x 22;I;500 ;9 ;200 ;22 ;;;13 ;;;;25 ;131 ;88 ;43 ;58100 ;2330 ;;2600 ;21 ;2940 ;294 ;450 ;5 ;153 ;70 ;1675549 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 200 x 12 x 19;I;500 ;12 ;200 ;19 ;;;13 ;;;;25 ;133 ;76 ;57 ;54600 ;2180 ;;2500 ;20 ;2540 ;254 ;398 ;4 ;118 ;62 ;1465286 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 200 x 12 x 22;I;500 ;12 ;200 ;22 ;;;13 ;;;;25 ;144 ;88 ;56 ;60500 ;2420 ;;2760 ;21 ;2940 ;294 ;458 ;5 ;168 ;76 ;1675549 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 200 x 12 x 25;I;500 ;12 ;200 ;25 ;;;13 ;;;;25 ;156 ;100 ;56 ;66300 ;2650 ;;3010 ;21 ;3340 ;334 ;517 ;5 ;234 ;94 ;1880208 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 250 x 9 x 16;I;500 ;9 ;250 ;16 ;;;13 ;;;;25 ;124 ;80 ;44 ;55300 ;2210 ;;2460 ;21 ;4170 ;334 ;511 ;6 ;80 ;50 ;2440167 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 250 x 9 x 19;I;500 ;9 ;250 ;19 ;;;13 ;;;;25 ;138 ;95 ;43 ;63100 ;2530 ;;2800 ;21 ;4950 ;396 ;604 ;6 ;126 ;66 ;2861887 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 250 x 9 x 22;I;500 ;9 ;250 ;22 ;;;13 ;;;;25 ;153 ;110 ;43 ;70700 ;2830 ;;3130 ;22 ;5730 ;459 ;698 ;6 ;189 ;86 ;3272557 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 250 x 12 x 22;I;500 ;12 ;250 ;22 ;;;13 ;;;;25 ;166 ;110 ;56 ;73100 ;2920 ;;3290 ;21 ;5740 ;459 ;705 ;6 ;204 ;93 ;3272557 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 250 x 12 x 25;I;500 ;12 ;250 ;25 ;;;13 ;;;;25 ;181 ;125 ;56 ;80400 ;3220 ;;3610 ;21 ;6520 ;521 ;799 ;6 ;286 ;115 ;3672282 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 250 x 12 x 28;I;500 ;12 ;250 ;28 ;;;13 ;;;;25 ;195 ;140 ;55 ;87500 ;3500 ;;3930 ;21 ;7300 ;584 ;892 ;6 ;391 ;140 ;4061167 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 12 x 16;I;500 ;12 ;300 ;16 ;;;13 ;;;;25 ;154 ;96 ;58 ;67300 ;2690 ;;3010 ;21 ;7210 ;481 ;738 ;7 ;109 ;68 ;4216608 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 12 x 19;I;500 ;12 ;300 ;19 ;;;13 ;;;;25 ;171 ;114 ;57 ;76600 ;3060 ;;3420 ;21 ;8560 ;571 ;873 ;7 ;164 ;86 ;4945341 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 12 x 22;I;500 ;12 ;300 ;22 ;;;13 ;;;;25 ;188 ;132 ;56 ;85700 ;3430 ;;3810 ;21 ;9910 ;661 ;1010 ;7 ;239 ;109 ;5654979 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 12 x 25;I;500 ;12 ;300 ;25 ;;;13 ;;;;25 ;206 ;150 ;56 ;94500 ;3780 ;;4200 ;21 ;11300 ;751 ;1140 ;7 ;338 ;135 ;6345703 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 16 x 22;I;500 ;16 ;300 ;22 ;;;13 ;;;;25 ;206 ;132 ;74 ;88800 ;3550 ;;4020 ;21 ;9920 ;661 ;1020 ;7 ;275 ;125 ;5654979 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 16 x 25;I;500 ;16 ;300 ;25 ;;;13 ;;;;25 ;224 ;150 ;74 ;97600 ;3900 ;;4400 ;21 ;11300 ;751 ;1160 ;7 ;374 ;150 ;6345703 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 16 x 28;I;500 ;16 ;300 ;28 ;;;13 ;;;;25 ;241 ;168 ;73 ;106000 ;4240 ;;4790 ;21 ;12600 ;841 ;1290 ;7 ;500 ;178 ;7017696 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 500 x 300 x 16 x 32;I;500 ;16 ;300 ;32 ;;;13 ;;;;25 ;263 ;192 ;71 ;117000 ;4680 ;;5280 ;21 ;14400 ;961 ;1470 ;7 ;715 ;223 ;7884864 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 200 x 9 x 12;I;550 ;9 ;200 ;12 ;;;13 ;;;;28 ;97 ;48 ;49 ;46600 ;1700 ;;1950 ;22 ;1600 ;160 ;252 ;4 ;36 ;30 ;1157776 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 200 x 9 x 16;I;550 ;9 ;200 ;16 ;;;13 ;;;;28 ;112 ;64 ;48 ;57000 ;2070 ;;2350 ;23 ;2140 ;214 ;332 ;4 ;67 ;42 ;1520832 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 200 x 9 x 19;I;550 ;9 ;200 ;19 ;;;13 ;;;;28 ;124 ;76 ;48 ;64600 ;2350 ;;2640 ;23 ;2540 ;254 ;391 ;5 ;104 ;55 ;1785753 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 200 x 9 x 22;I;550 ;9 ;200 ;22 ;;;13 ;;;;28 ;135 ;88 ;47 ;72000 ;2620 ;;2940 ;23 ;2940 ;294 ;451 ;5 ;154 ;70 ;2044416 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 200 x 12 x 19;I;550 ;12 ;200 ;19 ;;;13 ;;;;28 ;139 ;76 ;63 ;67900 ;2470 ;;2840 ;22 ;2540 ;254 ;400 ;4 ;121 ;64 ;1785753 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 200 x 12 x 22;I;550 ;12 ;200 ;22 ;;;13 ;;;;28 ;150 ;88 ;62 ;75200 ;2740 ;;3130 ;22 ;2940 ;294 ;460 ;4 ;171 ;78 ;2044416 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 200 x 12 x 25;I;550 ;12 ;200 ;25 ;;;13 ;;;;28 ;162 ;100 ;62 ;82300 ;2990 ;;3410 ;23 ;3340 ;334 ;519 ;5 ;237 ;95 ;2296875 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 250 x 9 x 16;I;550 ;9 ;250 ;16 ;;;13 ;;;;28 ;128 ;80 ;48 ;68400 ;2490 ;;2780 ;23 ;4170 ;334 ;512 ;6 ;81 ;51 ;2970375 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 250 x 9 x 19;I;550 ;9 ;250 ;19 ;;;13 ;;;;28 ;143 ;95 ;48 ;78000 ;2840 ;;3150 ;23 ;4950 ;396 ;605 ;6 ;127 ;67 ;3487799 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 250 x 9 x 22;I;550 ;9 ;250 ;22 ;;;13 ;;;;28 ;157 ;110 ;47 ;87300 ;3180 ;;3520 ;24 ;5730 ;459 ;699 ;6 ;190 ;86 ;3993000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 250 x 12 x 22;I;550 ;12 ;250 ;22 ;;;13 ;;;;28 ;172 ;110 ;62 ;90600 ;3290 ;;3710 ;23 ;5740 ;459 ;707 ;6 ;207 ;94 ;3993000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 250 x 12 x 25;I;550 ;12 ;250 ;25 ;;;13 ;;;;28 ;187 ;125 ;62 ;99600 ;3620 ;;4070 ;23 ;6520 ;522 ;801 ;6 ;289 ;116 ;4486084 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 250 x 12 x 28;I;550 ;12 ;250 ;28 ;;;13 ;;;;28 ;201 ;140 ;61 ;108000 ;3940 ;;4420 ;23 ;7300 ;584 ;894 ;6 ;394 ;141 ;4967156 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 300 x 12 x 16;I;550 ;12 ;300 ;16 ;;;13 ;;;;28 ;160 ;96 ;64 ;83300 ;3030 ;;3410 ;23 ;7210 ;481 ;740 ;7 ;112 ;70 ;5132808 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 300 x 12 x 19;I;550 ;12 ;300 ;19 ;;;13 ;;;;28 ;177 ;114 ;63 ;94700 ;3450 ;;3850 ;23 ;8560 ;571 ;875 ;7 ;167 ;88 ;6026916 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 300 x 12 x 22;I;550 ;12 ;300 ;22 ;;;13 ;;;;28 ;194 ;132 ;62 ;106000 ;3850 ;;4290 ;23 ;9910 ;661 ;1010 ;7 ;242 ;110 ;6899904 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 300 x 12 x 25;I;550 ;12 ;300 ;25 ;;;13 ;;;;28 ;212 ;150 ;62 ;117000 ;4250 ;;4720 ;24 ;11300 ;751 ;1140 ;7 ;341 ;137 ;7751953 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 300 x 16 x 22;I;550 ;16 ;300 ;22 ;;;13 ;;;;28 ;214 ;132 ;82 ;110000 ;4010 ;;4550 ;23 ;9920 ;661 ;1020 ;7 ;282 ;128 ;6899904 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 300 x 16 x 25;I;550 ;16 ;300 ;25 ;;;13 ;;;;28 ;232 ;150 ;82 ;121000 ;4400 ;;4970 ;23 ;11300 ;751 ;1160 ;7 ;381 ;152 ;7751953 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 550 x 300 x 16 x 28;I;550 ;16 ;300 ;28 ;;;13 ;;;;28 ;249 ;168 ;81 ;131000 ;4780 ;;5400 ;23 ;12600 ;841 ;1290 ;7 ;506 ;181 ;8583246 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 9 x 12;I;600 ;9 ;200 ;12 ;;;13 ;;;;30 ;101 ;48 ;53 ;57000 ;1900 ;;2200 ;24 ;1600 ;160 ;253 ;4 ;37 ;31 ;1382976 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 9 x 16;I;600 ;9 ;200 ;16 ;;;13 ;;;;30 ;117 ;64 ;53 ;69500 ;2320 ;;2640 ;24 ;2140 ;214 ;333 ;4 ;68 ;43 ;1818965 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 9 x 19;I;600 ;9 ;200 ;19 ;;;13 ;;;;30 ;128 ;76 ;52 ;78600 ;2620 ;;2960 ;25 ;2540 ;254 ;392 ;4 ;105 ;55 ;2137886 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 9 x 22;I;600 ;9 ;200 ;22 ;;;13 ;;;;30 ;140 ;88 ;52 ;87500 ;2920 ;;3280 ;25 ;2940 ;294 ;452 ;5 ;155 ;71 ;2449949 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 12 x 16;I;600 ;12 ;200 ;16 ;;;13 ;;;;30 ;134 ;64 ;70 ;74100 ;2470 ;;2880 ;24 ;2140 ;214 ;342 ;4 ;87 ;55 ;1818965 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 12 x 19;I;600 ;12 ;200 ;19 ;;;13 ;;;;30 ;145 ;76 ;69 ;83000 ;2770 ;;3200 ;24 ;2540 ;254 ;402 ;4 ;124 ;65 ;2137886 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 12 x 22;I;600 ;12 ;200 ;22 ;;;13 ;;;;30 ;156 ;88 ;68 ;91800 ;3060 ;;3510 ;24 ;2940 ;294 ;461 ;4 ;174 ;79 ;2449949 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 12 x 25;I;600 ;12 ;200 ;25 ;;;13 ;;;;30 ;168 ;100 ;68 ;100000 ;3350 ;;3820 ;25 ;3340 ;334 ;521 ;4 ;240 ;96 ;2755208 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 200 x 12 x 28;I;600 ;12 ;200 ;28 ;;;13 ;;;;30 ;179 ;112 ;67 ;109000 ;3630 ;;4130 ;25 ;3740 ;374 ;581 ;5 ;324 ;116 ;3053717 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 9 x 16;I;600 ;9 ;250 ;16 ;;;13 ;;;;30 ;133 ;80 ;53 ;83100 ;2770 ;;3100 ;25 ;4170 ;334 ;513 ;6 ;82 ;51 ;3552667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 9 x 19;I;600 ;9 ;250 ;19 ;;;13 ;;;;30 ;147 ;95 ;52 ;94600 ;3150 ;;3510 ;25 ;4950 ;396 ;606 ;6 ;128 ;67 ;4175559 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 12 x 19;I;600 ;12 ;250 ;19 ;;;13 ;;;;30 ;164 ;95 ;69 ;99100 ;3300 ;;3750 ;25 ;4960 ;397 ;615 ;6 ;147 ;77 ;4175559 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 12 x 22;I;600 ;12 ;250 ;22 ;;;13 ;;;;30 ;178 ;110 ;68 ;110000 ;3670 ;;4150 ;25 ;5740 ;459 ;709 ;6 ;209 ;95 ;4785057 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 12 x 25;I;600 ;12 ;250 ;25 ;;;13 ;;;;30 ;193 ;125 ;68 ;121000 ;4040 ;;4540 ;25 ;6520 ;522 ;802 ;6 ;292 ;117 ;5381266 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 12 x 28;I;600 ;12 ;250 ;28 ;;;13 ;;;;30 ;207 ;140 ;67 ;132000 ;4390 ;;4930 ;25 ;7300 ;584 ;896 ;6 ;397 ;142 ;5964292 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 16 x 25;I;600 ;16 ;250 ;25 ;;;13 ;;;;30 ;215 ;125 ;90 ;127000 ;4220 ;;4840 ;24 ;6530 ;522 ;818 ;6 ;336 ;134 ;5381266 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 16 x 28;I;600 ;16 ;250 ;28 ;;;13 ;;;;30 ;229 ;140 ;89 ;137000 ;4570 ;;5230 ;25 ;7310 ;585 ;911 ;6 ;440 ;157 ;5964292 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 250 x 16 x 32;I;600 ;16 ;250 ;32 ;;;13 ;;;;30 ;247 ;160 ;87 ;151000 ;5020 ;;5730 ;25 ;8350 ;668 ;1040 ;6 ;619 ;194 ;6721333 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 12 x 19;I;600 ;12 ;300 ;19 ;;;13 ;;;;30 ;183 ;114 ;69 ;115000 ;3840 ;;4300 ;25 ;8560 ;571 ;877 ;7 ;170 ;89 ;7215366 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 12 x 22;I;600 ;12 ;300 ;22 ;;;13 ;;;;30 ;200 ;132 ;68 ;129000 ;4290 ;;4780 ;25 ;9910 ;661 ;1010 ;7 ;245 ;111 ;8268579 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 12 x 25;I;600 ;12 ;300 ;25 ;;;13 ;;;;30 ;218 ;150 ;68 ;142000 ;4730 ;;5260 ;26 ;11300 ;751 ;1150 ;7 ;344 ;138 ;9298828 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 12 x 28;I;600 ;12 ;300 ;28 ;;;13 ;;;;30 ;235 ;168 ;67 ;155000 ;5160 ;;5730 ;26 ;12600 ;841 ;1280 ;7 ;470 ;168 ;10306296 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 14 x 22;I;600 ;14 ;300 ;22 ;;;13 ;;;;30 ;211 ;132 ;79 ;131000 ;4380 ;;4940 ;25 ;9910 ;661 ;1020 ;7 ;264 ;120 ;8268579 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 14 x 25;I;600 ;14 ;300 ;25 ;;;13 ;;;;30 ;229 ;150 ;79 ;145000 ;4820 ;;5410 ;25 ;11300 ;751 ;1150 ;7 ;363 ;145 ;9298828 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 14 x 28;I;600 ;14 ;300 ;28 ;;;13 ;;;;30 ;246 ;168 ;78 ;157000 ;5250 ;;5880 ;25 ;12600 ;841 ;1290 ;7 ;489 ;175 ;10306296 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 16 x 28;I;600 ;16 ;300 ;28 ;;;13 ;;;;30 ;257 ;168 ;89 ;160000 ;5330 ;;6030 ;25 ;12600 ;841 ;1300 ;7 ;513 ;183 ;10306296 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 600 x 300 x 16 x 32;I;600 ;16 ;300 ;32 ;;;13 ;;;;30 ;279 ;192 ;87 ;177000 ;5890 ;;6640 ;25 ;14400 ;961 ;1480 ;7 ;729 ;228 ;11614464 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 9 x 12;I;650 ;9 ;200 ;12 ;;;13 ;;;;33 ;106 ;48 ;58 ;68600 ;2110 ;;2460 ;26 ;1600 ;160 ;254 ;4 ;38 ;32 ;1628176 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 9 x 16;I;650 ;9 ;200 ;16 ;;;13 ;;;;33 ;121 ;64 ;57 ;83400 ;2570 ;;2930 ;26 ;2140 ;214 ;334 ;4 ;70 ;44 ;2143765 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 9 x 19;I;650 ;9 ;200 ;19 ;;;13 ;;;;33 ;133 ;76 ;57 ;94200 ;2900 ;;3280 ;27 ;2540 ;254 ;393 ;4 ;106 ;56 ;2521686 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 9 x 22;I;650 ;9 ;200 ;22 ;;;13 ;;;;33 ;144 ;88 ;56 ;105000 ;3220 ;;3630 ;27 ;2940 ;294 ;453 ;5 ;157 ;71 ;2892149 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 12 x 19;I;650 ;12 ;200 ;19 ;;;13 ;;;;33 ;151 ;76 ;75 ;99900 ;3070 ;;3570 ;26 ;2540 ;254 ;403 ;4 ;127 ;67 ;2521686 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 12 x 22;I;650 ;12 ;200 ;22 ;;;13 ;;;;33 ;162 ;88 ;74 ;110000 ;3400 ;;3910 ;26 ;2940 ;294 ;463 ;4 ;177 ;80 ;2892149 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 12 x 25;I;650 ;12 ;200 ;25 ;;;13 ;;;;33 ;174 ;100 ;74 ;121000 ;3710 ;;4250 ;26 ;3340 ;334 ;523 ;4 ;243 ;97 ;3255208 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 200 x 12 x 28;I;650 ;12 ;200 ;28 ;;;13 ;;;;33 ;185 ;112 ;73 ;131000 ;4020 ;;4580 ;27 ;3740 ;374 ;583 ;5 ;327 ;117 ;3610917 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 250 x 12 x 19;I;650 ;12 ;250 ;19 ;;;13 ;;;;33 ;170 ;95 ;75 ;119000 ;3660 ;;4160 ;26 ;4960 ;397 ;617 ;5 ;150 ;79 ;4925169 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 250 x 12 x 22;I;650 ;12 ;250 ;22 ;;;13 ;;;;33 ;184 ;110 ;74 ;132000 ;4060 ;;4600 ;27 ;5740 ;459 ;711 ;6 ;212 ;97 ;5648729 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 250 x 12 x 25;I;650 ;12 ;250 ;25 ;;;13 ;;;;33 ;199 ;125 ;74 ;145000 ;4460 ;;5030 ;27 ;6520 ;522 ;804 ;6 ;295 ;118 ;6357829 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 250 x 12 x 28;I;650 ;12 ;250 ;28 ;;;13 ;;;;33 ;213 ;140 ;73 ;158000 ;4850 ;;5460 ;27 ;7300 ;584 ;898 ;6 ;400 ;143 ;7052573 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 250 x 16 x 28;I;650 ;16 ;250 ;28 ;;;13 ;;;;33 ;237 ;140 ;97 ;165000 ;5070 ;;5810 ;26 ;7310 ;585 ;915 ;6 ;447 ;160 ;7052573 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 12 x 16;I;650 ;12 ;300 ;16 ;;;13 ;;;;33 ;172 ;96 ;76 ;121000 ;3740 ;;4230 ;27 ;7210 ;481 ;744 ;6 ;118 ;73 ;7235208 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 12 x 19;I;650 ;12 ;300 ;19 ;;;13 ;;;;33 ;189 ;114 ;75 ;138000 ;4240 ;;4760 ;27 ;8560 ;571 ;878 ;7 ;172 ;91 ;8510691 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 12 x 22;I;650 ;12 ;300 ;22 ;;;13 ;;;;33 ;206 ;132 ;74 ;154000 ;4730 ;;5290 ;27 ;9910 ;661 ;1010 ;7 ;248 ;113 ;9761004 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 12 x 25;I;650 ;12 ;300 ;25 ;;;13 ;;;;33 ;224 ;150 ;74 ;169000 ;5210 ;;5810 ;28 ;11300 ;751 ;1150 ;7 ;347 ;139 ;10986328 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 16 x 22;I;650 ;16 ;300 ;22 ;;;13 ;;;;33 ;230 ;132 ;98 ;161000 ;4960 ;;5660 ;26 ;9920 ;661 ;1030 ;7 ;296 ;134 ;9761004 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 16 x 25;I;650 ;16 ;300 ;25 ;;;13 ;;;;33 ;248 ;150 ;98 ;177000 ;5440 ;;6170 ;27 ;11300 ;751 ;1160 ;7 ;394 ;158 ;10986328 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 16 x 28;I;650 ;16 ;300 ;28 ;;;13 ;;;;33 ;265 ;168 ;97 ;192000 ;5900 ;;6680 ;27 ;12600 ;841 ;1300 ;7 ;520 ;186 ;12186846 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 650 x 300 x 16 x 32;I;650 ;16 ;300 ;32 ;;;13 ;;;;33 ;287 ;192 ;95 ;212000 ;6510 ;;7350 ;27 ;14400 ;961 ;1480 ;7 ;735 ;230 ;13749264 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 200 x 9 x 12;I;700 ;9 ;200 ;12 ;;;18 ;;;;35 ;112 ;48 ;64 ;83100 ;2370 ;;2770 ;27 ;1610 ;161 ;256 ;4 ;39 ;33 ;1893376 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 200 x 9 x 16;I;700 ;9 ;200 ;16 ;;;18 ;;;;35 ;127 ;64 ;63 ;100000 ;2860 ;;3280 ;28 ;2140 ;214 ;336 ;4 ;71 ;44 ;2495232 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 200 x 9 x 19;I;700 ;9 ;200 ;19 ;;;18 ;;;;35 ;138 ;76 ;62 ;113000 ;3220 ;;3660 ;29 ;2540 ;254 ;396 ;4 ;108 ;57 ;2937153 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 200 x 9 x 22;I;700 ;9 ;200 ;22 ;;;18 ;;;;35 ;150 ;88 ;62 ;125000 ;3580 ;;4040 ;29 ;2940 ;294 ;456 ;4 ;158 ;72 ;3371016 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 200 x 12 x 22;I;700 ;12 ;200 ;22 ;;;18 ;;;;35 ;170 ;88 ;82 ;132000 ;3780 ;;4360 ;28 ;2950 ;295 ;466 ;4 ;180 ;82 ;3371016 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 200 x 12 x 25;I;700 ;12 ;200 ;25 ;;;18 ;;;;35 ;181 ;100 ;81 ;144000 ;4120 ;;4730 ;28 ;3350 ;335 ;526 ;4 ;246 ;98 ;3796875 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 200 x 12 x 28;I;700 ;12 ;200 ;28 ;;;18 ;;;;35 ;192 ;112 ;80 ;156000 ;4460 ;;5100 ;29 ;3750 ;375 ;586 ;4 ;330 ;118 ;4214784 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 9 x 16;I;700 ;9 ;250 ;16 ;;;18 ;;;;35 ;143 ;80 ;63 ;119000 ;3400 ;;3830 ;29 ;4170 ;334 ;516 ;5 ;84 ;53 ;4873500 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 9 x 19;I;700 ;9 ;250 ;19 ;;;18 ;;;;35 ;157 ;95 ;62 ;135000 ;3850 ;;4310 ;29 ;4950 ;396 ;610 ;6 ;130 ;69 ;5736627 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 12 x 19;I;700 ;12 ;250 ;19 ;;;18 ;;;;35 ;177 ;95 ;82 ;142000 ;4060 ;;4640 ;28 ;4960 ;397 ;620 ;5 ;152 ;80 ;5736627 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 12 x 22;I;700 ;12 ;250 ;22 ;;;18 ;;;;35 ;192 ;110 ;82 ;158000 ;4500 ;;5110 ;29 ;5740 ;459 ;714 ;5 ;215 ;98 ;6584016 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 12 x 25;I;700 ;12 ;250 ;25 ;;;18 ;;;;35 ;206 ;125 ;81 ;173000 ;4940 ;;5580 ;29 ;6520 ;522 ;807 ;6 ;298 ;119 ;7415771 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 14 x 22;I;700 ;14 ;250 ;22 ;;;18 ;;;;35 ;205 ;110 ;95 ;162000 ;4640 ;;5330 ;28 ;5750 ;460 ;723 ;5 ;237 ;108 ;6584016 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 14 x 25;I;700 ;14 ;250 ;25 ;;;18 ;;;;35 ;219 ;125 ;94 ;177000 ;5070 ;;5790 ;29 ;6530 ;522 ;816 ;5 ;320 ;128 ;7415771 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 250 x 14 x 28;I;700 ;14 ;250 ;28 ;;;18 ;;;;35 ;233 ;140 ;93 ;192000 ;5490 ;;6240 ;29 ;7310 ;585 ;910 ;6 ;425 ;152 ;8232000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 12 x 19;I;700 ;12 ;300 ;19 ;;;18 ;;;;35 ;196 ;114 ;82 ;164000 ;4690 ;;5290 ;29 ;8560 ;571 ;882 ;7 ;175 ;92 ;9912891 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 12 x 22;I;700 ;12 ;300 ;22 ;;;18 ;;;;35 ;214 ;132 ;82 ;183000 ;5230 ;;5860 ;29 ;9910 ;661 ;1020 ;7 ;251 ;114 ;11377179 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 12 x 25;I;700 ;12 ;300 ;25 ;;;18 ;;;;35 ;231 ;150 ;81 ;201000 ;5750 ;;6420 ;30 ;11300 ;751 ;1150 ;7 ;350 ;140 ;12814453 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 14 x 22;I;700 ;14 ;300 ;22 ;;;18 ;;;;35 ;227 ;132 ;95 ;188000 ;5360 ;;6070 ;29 ;9920 ;661 ;1030 ;7 ;273 ;124 ;11377179 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 14 x 25;I;700 ;14 ;300 ;25 ;;;18 ;;;;35 ;244 ;150 ;94 ;206000 ;5880 ;;6630 ;29 ;11300 ;751 ;1160 ;7 ;372 ;149 ;12814453 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 14 x 28;I;700 ;14 ;300 ;28 ;;;18 ;;;;35 ;261 ;168 ;93 ;224000 ;6390 ;;7180 ;29 ;12600 ;841 ;1290 ;7 ;498 ;178 ;14224896 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 14 x 32;I;700 ;14 ;300 ;32 ;;;18 ;;;;35 ;284 ;192 ;92 ;247000 ;7060 ;;7920 ;30 ;14400 ;961 ;1470 ;7 ;714 ;223 ;16064064 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 16 x 22;I;700 ;16 ;300 ;22 ;;;18 ;;;;35 ;240 ;132 ;108 ;192000 ;5490 ;;6290 ;28 ;9930 ;662 ;1040 ;6 ;303 ;138 ;11377179 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 16 x 25;I;700 ;16 ;300 ;25 ;;;18 ;;;;35 ;257 ;150 ;107 ;210000 ;6010 ;;6840 ;29 ;11300 ;752 ;1170 ;7 ;401 ;160 ;12814453 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 16 x 28;I;700 ;16 ;300 ;28 ;;;18 ;;;;35 ;274 ;168 ;106 ;228000 ;6520 ;;7390 ;29 ;12600 ;842 ;1300 ;7 ;527 ;188 ;14224896 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 300 x 16 x 32;I;700 ;16 ;300 ;32 ;;;18 ;;;;35 ;297 ;192 ;105 ;251000 ;7180 ;;8120 ;29 ;14400 ;962 ;1480 ;7 ;742 ;232 ;16064064 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 12 x 22;I;700 ;12 ;350 ;22 ;;;18 ;;;;35 ;236 ;154 ;82 ;208000 ;5950 ;;6600 ;30 ;15700 ;899 ;1370 ;8 ;286 ;130 ;18066539 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 12 x 25;I;700 ;12 ;350 ;25 ;;;18 ;;;;35 ;256 ;175 ;81 ;230000 ;6560 ;;7260 ;30 ;17900 ;1020 ;1560 ;8 ;402 ;161 ;20348877 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 14 x 22;I;700 ;14 ;350 ;22 ;;;18 ;;;;35 ;249 ;154 ;95 ;213000 ;6080 ;;6820 ;29 ;15700 ;899 ;1380 ;8 ;308 ;140 ;18066539 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 14 x 25;I;700 ;14 ;350 ;25 ;;;18 ;;;;35 ;269 ;175 ;94 ;234000 ;6700 ;;7470 ;30 ;17900 ;1020 ;1570 ;8 ;424 ;170 ;20348877 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 14 x 28;I;700 ;14 ;350 ;28 ;;;18 ;;;;35 ;289 ;196 ;93 ;255000 ;7300 ;;8130 ;30 ;20000 ;1140 ;1750 ;8 ;571 ;204 ;22588608 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 14 x 32;I;700 ;14 ;350 ;32 ;;;18 ;;;;35 ;316 ;224 ;92 ;283000 ;8080 ;;8980 ;30 ;22900 ;1310 ;1990 ;9 ;823 ;257 ;25509139 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 16 x 25;I;700 ;16 ;350 ;25 ;;;18 ;;;;35 ;282 ;175 ;107 ;239000 ;6830 ;;7690 ;29 ;17900 ;1020 ;1580 ;8 ;453 ;181 ;20348877 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 16 x 28;I;700 ;16 ;350 ;28 ;;;18 ;;;;35 ;302 ;196 ;106 ;260000 ;7420 ;;8330 ;29 ;20000 ;1140 ;1760 ;8 ;600 ;214 ;22588608 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 16 x 32;I;700 ;16 ;350 ;32 ;;;18 ;;;;35 ;329 ;224 ;105 ;287000 ;8200 ;;9190 ;30 ;22900 ;1310 ;2000 ;8 ;851 ;266 ;25509139 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 700 x 350 x 16 x 36;I;700 ;16 ;350 ;36 ;;;18 ;;;;35 ;355 ;252 ;103 ;314000 ;8960 ;;10000 ;30 ;25800 ;1470 ;2250 ;9 ;1174 ;326 ;28355124 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 250 x 12 x 19;I;750 ;12 ;250 ;19 ;;;18 ;;;;38 ;183 ;95 ;88 ;166000 ;4440 ;;5090 ;30 ;4960 ;397 ;622 ;5 ;155 ;82 ;6609934 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 250 x 12 x 22;I;750 ;12 ;250 ;22 ;;;18 ;;;;38 ;198 ;110 ;88 ;184000 ;4920 ;;5600 ;31 ;5740 ;459 ;716 ;5 ;218 ;99 ;7590917 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 250 x 12 x 25;I;750 ;12 ;250 ;25 ;;;18 ;;;;38 ;212 ;125 ;87 ;202000 ;5390 ;;6100 ;31 ;6520 ;522 ;809 ;6 ;301 ;120 ;8555094 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 250 x 14 x 22;I;750 ;14 ;250 ;22 ;;;18 ;;;;38 ;212 ;110 ;102 ;190000 ;5070 ;;5850 ;30 ;5750 ;460 ;725 ;5 ;242 ;110 ;7590917 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 250 x 14 x 25;I;750 ;14 ;250 ;25 ;;;18 ;;;;38 ;226 ;125 ;101 ;208000 ;5540 ;;6340 ;30 ;6530 ;522 ;819 ;5 ;324 ;130 ;8555094 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 250 x 14 x 28;I;750 ;14 ;250 ;28 ;;;18 ;;;;38 ;240 ;140 ;100 ;225000 ;5990 ;;6840 ;31 ;7310 ;585 ;912 ;6 ;429 ;153 ;9502573 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 300 x 14 x 22;I;750 ;14 ;300 ;22 ;;;18 ;;;;38 ;234 ;132 ;102 ;219000 ;5850 ;;6650 ;31 ;9920 ;661 ;1030 ;7 ;278 ;126 ;13117104 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 300 x 14 x 25;I;750 ;14 ;300 ;25 ;;;18 ;;;;38 ;251 ;150 ;101 ;241000 ;6410 ;;7250 ;31 ;11300 ;751 ;1160 ;7 ;377 ;151 ;14783203 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 300 x 14 x 28;I;750 ;14 ;300 ;28 ;;;18 ;;;;38 ;268 ;168 ;100 ;261000 ;6970 ;;7850 ;31 ;12600 ;841 ;1300 ;7 ;503 ;179 ;16420446 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 300 x 16 x 25;I;750 ;16 ;300 ;25 ;;;18 ;;;;38 ;265 ;150 ;115 ;246000 ;6570 ;;7490 ;31 ;11300 ;752 ;1170 ;7 ;408 ;163 ;14783203 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 300 x 16 x 28;I;750 ;16 ;300 ;28 ;;;18 ;;;;38 ;282 ;168 ;114 ;267000 ;7120 ;;8090 ;31 ;12600 ;842 ;1310 ;7 ;534 ;191 ;16420446 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 300 x 16 x 32;I;750 ;16 ;300 ;32 ;;;18 ;;;;38 ;305 ;192 ;113 ;294000 ;7840 ;;8870 ;31 ;14400 ;962 ;1490 ;7 ;749 ;234 ;18558864 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 350 x 14 x 25;I;750 ;14 ;350 ;25 ;;;18 ;;;;38 ;276 ;175 ;101 ;273000 ;7290 ;;8150 ;32 ;17900 ;1020 ;1570 ;8 ;429 ;171 ;23475179 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 350 x 14 x 28;I;750 ;14 ;350 ;28 ;;;18 ;;;;38 ;296 ;196 ;100 ;298000 ;7940 ;;8860 ;32 ;20000 ;1140 ;1750 ;8 ;576 ;206 ;26075060 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 350 x 14 x 32;I;750 ;14 ;350 ;32 ;;;18 ;;;;38 ;323 ;224 ;99 ;330000 ;8790 ;;9780 ;32 ;22900 ;1310 ;2000 ;8 ;827 ;259 ;29470789 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 350 x 16 x 28;I;750 ;16 ;350 ;28 ;;;18 ;;;;38 ;310 ;196 ;114 ;303000 ;8090 ;;9100 ;31 ;20000 ;1140 ;1760 ;8 ;607 ;217 ;26075060 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 350 x 16 x 32;I;750 ;16 ;350 ;32 ;;;18 ;;;;38 ;337 ;224 ;113 ;335000 ;8940 ;;10000 ;32 ;22900 ;1310 ;2010 ;8 ;858 ;268 ;29470789 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 750 x 350 x 16 x 36;I;750 ;16 ;350 ;36 ;;;18 ;;;;38 ;363 ;252 ;111 ;366000 ;9760 ;;10900 ;32 ;25800 ;1470 ;2250 ;8 ;1181 ;328 ;32786255 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 250 x 14 x 22;I;800 ;14 ;250 ;22 ;;;18 ;;;;40 ;219 ;110 ;109 ;221000 ;5520 ;;6380 ;32 ;5750 ;460 ;728 ;5 ;247 ;112 ;8669432 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 250 x 14 x 25;I;800 ;14 ;250 ;25 ;;;18 ;;;;40 ;233 ;125 ;108 ;241000 ;6020 ;;6920 ;32 ;6530 ;523 ;821 ;5 ;329 ;132 ;9775798 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 250 x 14 x 28;I;800 ;14 ;250 ;28 ;;;18 ;;;;40 ;247 ;140 ;107 ;260000 ;6510 ;;7440 ;33 ;7310 ;585 ;915 ;5 ;434 ;155 ;10864292 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 250 x 16 x 22;I;800 ;16 ;250 ;22 ;;;18 ;;;;40 ;234 ;110 ;124 ;228000 ;5700 ;;6670 ;31 ;5760 ;461 ;739 ;5 ;281 ;128 ;8669432 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 250 x 16 x 25;I;800 ;16 ;250 ;25 ;;;18 ;;;;40 ;248 ;125 ;123 ;248000 ;6200 ;;7200 ;32 ;6540 ;523 ;833 ;5 ;363 ;145 ;9775798 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 250 x 16 x 28;I;800 ;16 ;250 ;28 ;;;18 ;;;;40 ;262 ;140 ;122 ;267000 ;6680 ;;7720 ;32 ;7320 ;586 ;926 ;5 ;467 ;167 ;10864292 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 250 x 16 x 32;I;800 ;16 ;250 ;32 ;;;18 ;;;;40 ;281 ;160 ;121 ;293000 ;7320 ;;8410 ;32 ;8360 ;669 ;1050 ;5 ;647 ;202 ;12288000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 300 x 14 x 22;I;800 ;14 ;300 ;22 ;;;18 ;;;;40 ;241 ;132 ;109 ;254000 ;6350 ;;7240 ;33 ;9920 ;661 ;1030 ;6 ;282 ;128 ;14980779 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 300 x 14 x 25;I;800 ;14 ;300 ;25 ;;;18 ;;;;40 ;258 ;150 ;108 ;278000 ;6960 ;;7880 ;33 ;11300 ;751 ;1160 ;7 ;381 ;152 ;16892578 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 300 x 14 x 28;I;800 ;14 ;300 ;28 ;;;18 ;;;;40 ;275 ;168 ;107 ;302000 ;7560 ;;8520 ;33 ;12600 ;841 ;1300 ;7 ;507 ;181 ;18773496 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 300 x 16 x 22;I;800 ;16 ;300 ;22 ;;;18 ;;;;40 ;256 ;132 ;124 ;261000 ;6530 ;;7520 ;32 ;9930 ;662 ;1040 ;6 ;316 ;144 ;14980779 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 300 x 16 x 25;I;800 ;16 ;300 ;25 ;;;18 ;;;;40 ;273 ;150 ;123 ;285000 ;7130 ;;8170 ;32 ;11300 ;752 ;1180 ;6 ;415 ;166 ;16892578 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 300 x 16 x 28;I;800 ;16 ;300 ;28 ;;;18 ;;;;40 ;290 ;168 ;122 ;309000 ;7730 ;;8800 ;33 ;12600 ;842 ;1310 ;7 ;541 ;193 ;18773496 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 300 x 16 x 32;I;800 ;16 ;300 ;32 ;;;18 ;;;;40 ;313 ;192 ;121 ;340000 ;8500 ;;9640 ;33 ;14400 ;962 ;1490 ;7 ;756 ;236 ;21233664 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 14 x 25;I;800 ;14 ;350 ;25 ;;;18 ;;;;40 ;283 ;175 ;108 ;316000 ;7900 ;;8850 ;33 ;17900 ;1020 ;1570 ;8 ;433 ;173 ;26824788 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 14 x 28;I;800 ;14 ;350 ;28 ;;;18 ;;;;40 ;303 ;196 ;107 ;344000 ;8600 ;;9610 ;34 ;20000 ;1140 ;1750 ;8 ;580 ;207 ;29811616 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 16 x 25;I;800 ;16 ;350 ;25 ;;;18 ;;;;40 ;298 ;175 ;123 ;323000 ;8070 ;;9130 ;33 ;17900 ;1020 ;1580 ;8 ;467 ;187 ;26824788 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 16 x 28;I;800 ;16 ;350 ;28 ;;;18 ;;;;40 ;318 ;196 ;122 ;351000 ;8770 ;;9880 ;33 ;20000 ;1150 ;1770 ;8 ;614 ;219 ;29811616 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 16 x 32;I;800 ;16 ;350 ;32 ;;;18 ;;;;40 ;345 ;224 ;121 ;387000 ;9680 ;;10900 ;34 ;22900 ;1310 ;2010 ;8 ;865 ;270 ;33718272 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 16 x 36;I;800 ;16 ;350 ;36 ;;;18 ;;;;40 ;371 ;252 ;119 ;423000 ;10600 ;;11800 ;34 ;25800 ;1470 ;2250 ;8 ;1188 ;330 ;37538949 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 19 x 25;I;800 ;19 ;350 ;25 ;;;18 ;;;;40 ;320 ;175 ;145 ;333000 ;8340 ;;9560 ;32 ;17900 ;1020 ;1600 ;7 ;536 ;214 ;26824788 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 19 x 28;I;800 ;19 ;350 ;28 ;;;18 ;;;;40 ;340 ;196 ;144 ;361000 ;9030 ;;10300 ;33 ;20100 ;1150 ;1790 ;8 ;682 ;244 ;29811616 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 19 x 32;I;800 ;19 ;350 ;32 ;;;18 ;;;;40 ;367 ;224 ;143 ;397000 ;9930 ;;11300 ;33 ;22900 ;1310 ;2030 ;8 ;933 ;292 ;33718272 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 19 x 36;I;800 ;19 ;350 ;36 ;;;18 ;;;;40 ;393 ;252 ;141 ;433000 ;10800 ;;12200 ;33 ;25800 ;1470 ;2270 ;8 ;1255 ;349 ;37538949 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 350 x 19 x 40;I;800 ;19 ;350 ;40 ;;;18 ;;;;40 ;420 ;280 ;140 ;467000 ;11700 ;;13200 ;33 ;28600 ;1640 ;2520 ;8 ;1658 ;414 ;41274333 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 14 x 25;I;800 ;14 ;400 ;25 ;;;18 ;;;;40 ;308 ;200 ;108 ;353000 ;8840 ;;9820 ;34 ;26700 ;1330 ;2040 ;9 ;485 ;194 ;40041667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 14 x 28;I;800 ;14 ;400 ;28 ;;;18 ;;;;40 ;331 ;224 ;107 ;386000 ;9640 ;;10700 ;34 ;29900 ;1490 ;2280 ;10 ;653 ;233 ;44500139 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 16 x 25;I;800 ;16 ;400 ;25 ;;;18 ;;;;40 ;323 ;200 ;123 ;360000 ;9010 ;;10100 ;33 ;26700 ;1330 ;2050 ;9 ;519 ;208 ;40041667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 16 x 28;I;800 ;16 ;400 ;28 ;;;18 ;;;;40 ;346 ;224 ;122 ;393000 ;9810 ;;11000 ;34 ;29900 ;1490 ;2290 ;9 ;687 ;245 ;44500139 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 16 x 32;I;800 ;16 ;400 ;32 ;;;18 ;;;;40 ;377 ;256 ;121 ;435000 ;10900 ;;12100 ;34 ;34200 ;1710 ;2610 ;10 ;974 ;304 ;50331648 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 16 x 36;I;800 ;16 ;400 ;36 ;;;18 ;;;;40 ;407 ;288 ;119 ;476000 ;11900 ;;13200 ;34 ;38400 ;1920 ;2930 ;10 ;1344 ;373 ;56034816 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 19 x 28;I;800 ;19 ;400 ;28 ;;;18 ;;;;40 ;368 ;224 ;144 ;403000 ;10100 ;;11400 ;33 ;29900 ;1500 ;2310 ;9 ;755 ;270 ;44500139 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 19 x 32;I;800 ;19 ;400 ;32 ;;;18 ;;;;40 ;399 ;256 ;143 ;445000 ;11100 ;;12500 ;33 ;34200 ;1710 ;2630 ;9 ;1042 ;326 ;50331648 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 19 x 36;I;800 ;19 ;400 ;36 ;;;18 ;;;;40 ;429 ;288 ;141 ;485000 ;12100 ;;13600 ;34 ;38400 ;1920 ;2950 ;9 ;1411 ;392 ;56034816 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 800 x 400 x 19 x 40;I;800 ;19 ;400 ;40 ;;;18 ;;;;40 ;460 ;320 ;140 ;525000 ;13100 ;;14700 ;34 ;42700 ;2140 ;3270 ;10 ;1871 ;468 ;61610667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 250 x 14 x 22;I;850 ;14 ;250 ;22 ;;;18 ;;;;43 ;226 ;110 ;116 ;254000 ;5980 ;;6940 ;34 ;5750 ;460 ;730 ;5 ;251 ;114 ;9819563 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 250 x 14 x 25;I;850 ;14 ;250 ;25 ;;;18 ;;;;43 ;240 ;125 ;115 ;277000 ;6510 ;;7510 ;34 ;6530 ;523 ;824 ;5 ;334 ;133 ;11077881 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 250 x 16 x 22;I;850 ;16 ;250 ;22 ;;;18 ;;;;43 ;242 ;110 ;132 ;263000 ;6180 ;;7260 ;33 ;5760 ;461 ;742 ;5 ;288 ;131 ;9819563 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 250 x 16 x 25;I;850 ;16 ;250 ;25 ;;;18 ;;;;43 ;256 ;125 ;131 ;285000 ;6720 ;;7830 ;33 ;6540 ;523 ;836 ;5 ;370 ;148 ;11077881 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 250 x 16 x 28;I;850 ;16 ;250 ;28 ;;;18 ;;;;43 ;270 ;140 ;130 ;308000 ;7240 ;;8390 ;34 ;7320 ;586 ;929 ;5 ;474 ;169 ;12317156 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 300 x 16 x 22;I;850 ;16 ;300 ;22 ;;;18 ;;;;43 ;264 ;132 ;132 ;301000 ;7070 ;;8170 ;34 ;9930 ;662 ;1040 ;6 ;323 ;147 ;16968204 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 300 x 16 x 25;I;850 ;16 ;300 ;25 ;;;18 ;;;;43 ;281 ;150 ;131 ;328000 ;7720 ;;8860 ;34 ;11300 ;752 ;1180 ;6 ;422 ;169 ;19142578 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 300 x 16 x 28;I;850 ;16 ;300 ;28 ;;;18 ;;;;43 ;298 ;168 ;130 ;355000 ;8350 ;;9540 ;35 ;12600 ;842 ;1310 ;7 ;547 ;196 ;21284046 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 300 x 16 x 32;I;850 ;16 ;300 ;32 ;;;18 ;;;;43 ;321 ;192 ;129 ;390000 ;9180 ;;10400 ;35 ;14400 ;962 ;1490 ;7 ;763 ;238 ;24088464 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 350 x 16 x 25;I;850 ;16 ;350 ;25 ;;;18 ;;;;43 ;306 ;175 ;131 ;370000 ;8720 ;;9890 ;35 ;17900 ;1020 ;1590 ;8 ;474 ;190 ;30397705 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 350 x 16 x 28;I;850 ;16 ;350 ;28 ;;;18 ;;;;43 ;326 ;196 ;130 ;402000 ;9460 ;;10700 ;35 ;20000 ;1150 ;1770 ;8 ;621 ;222 ;33798277 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 350 x 16 x 32;I;850 ;16 ;350 ;32 ;;;18 ;;;;43 ;353 ;224 ;129 ;444000 ;10400 ;;11700 ;36 ;22900 ;1310 ;2010 ;8 ;872 ;272 ;38251589 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 350 x 19 x 28;I;850 ;19 ;350 ;28 ;;;18 ;;;;43 ;350 ;196 ;154 ;415000 ;9760 ;;11200 ;34 ;20100 ;1150 ;1790 ;8 ;694 ;248 ;33798277 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 350 x 19 x 32;I;850 ;19 ;350 ;32 ;;;18 ;;;;43 ;376 ;224 ;152 ;456000 ;10700 ;;12200 ;35 ;22900 ;1310 ;2030 ;8 ;944 ;295 ;38251589 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 350 x 19 x 36;I;850 ;19 ;350 ;36 ;;;18 ;;;;43 ;403 ;252 ;151 ;496000 ;11700 ;;13200 ;35 ;25800 ;1470 ;2280 ;8 ;1267 ;352 ;42613205 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 350 x 19 x 40;I;850 ;19 ;350 ;40 ;;;18 ;;;;43 ;429 ;280 ;149 ;536000 ;12600 ;;14300 ;35 ;28600 ;1640 ;2520 ;8 ;1669 ;417 ;46883813 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 400 x 16 x 25;I;850 ;16 ;400 ;25 ;;;18 ;;;;43 ;331 ;200 ;131 ;413000 ;9720 ;;10900 ;35 ;26700 ;1330 ;2050 ;9 ;526 ;210 ;45375000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 400 x 16 x 28;I;850 ;16 ;400 ;28 ;;;18 ;;;;43 ;354 ;224 ;130 ;450000 ;10600 ;;11800 ;36 ;29900 ;1490 ;2290 ;9 ;694 ;248 ;50451072 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 400 x 16 x 32;I;850 ;16 ;400 ;32 ;;;18 ;;;;43 ;385 ;256 ;129 ;497000 ;11700 ;;13000 ;36 ;34200 ;1710 ;2610 ;9 ;981 ;307 ;57098581 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 400 x 19 x 28;I;850 ;19 ;400 ;28 ;;;18 ;;;;43 ;378 ;224 ;154 ;462000 ;10900 ;;12300 ;35 ;29900 ;1500 ;2320 ;9 ;767 ;274 ;50451072 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 400 x 19 x 32;I;850 ;19 ;400 ;32 ;;;18 ;;;;43 ;408 ;256 ;152 ;510000 ;12000 ;;13500 ;35 ;34200 ;1710 ;2630 ;9 ;1054 ;329 ;57098581 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 400 x 19 x 36;I;850 ;19 ;400 ;36 ;;;18 ;;;;43 ;439 ;288 ;151 ;556000 ;13100 ;;14700 ;36 ;38400 ;1920 ;2950 ;9 ;1422 ;395 ;63609216 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 850 x 400 x 19 x 40;I;850 ;19 ;400 ;40 ;;;18 ;;;;43 ;469 ;320 ;149 ;602000 ;14200 ;;15900 ;36 ;42700 ;2140 ;3270 ;10 ;1883 ;471 ;69984000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 250 x 16 x 19;I;900 ;16 ;250 ;19 ;;;18 ;;;;45 ;236 ;95 ;141 ;275000 ;6110 ;;7280 ;34 ;4980 ;399 ;652 ;5 ;232 ;122 ;9600950 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 250 x 16 x 22;I;900 ;16 ;250 ;22 ;;;18 ;;;;45 ;250 ;110 ;140 ;301000 ;6680 ;;7880 ;35 ;5760 ;461 ;746 ;5 ;294 ;134 ;11041307 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 250 x 16 x 25;I;900 ;16 ;250 ;25 ;;;18 ;;;;45 ;264 ;125 ;139 ;326000 ;7250 ;;8480 ;35 ;6540 ;524 ;839 ;5 ;376 ;151 ;12461344 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 250 x 16 x 28;I;900 ;16 ;250 ;28 ;;;18 ;;;;45 ;278 ;140 ;138 ;351000 ;7810 ;;9070 ;36 ;7320 ;586 ;932 ;5 ;481 ;172 ;13861167 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 16 x 19;I;900 ;16 ;300 ;19 ;;;18 ;;;;45 ;255 ;114 ;141 ;312000 ;6930 ;;8110 ;35 ;8580 ;572 ;914 ;6 ;255 ;134 ;16590441 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 16 x 22;I;900 ;16 ;300 ;22 ;;;18 ;;;;45 ;272 ;132 ;140 ;343000 ;7620 ;;8840 ;36 ;9930 ;662 ;1050 ;6 ;330 ;150 ;19079379 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 16 x 25;I;900 ;16 ;300 ;25 ;;;18 ;;;;45 ;289 ;150 ;139 ;374000 ;8310 ;;9570 ;36 ;11300 ;752 ;1180 ;6 ;429 ;171 ;21533203 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 16 x 28;I;900 ;16 ;300 ;28 ;;;18 ;;;;45 ;306 ;168 ;138 ;404000 ;8990 ;;10300 ;36 ;12600 ;842 ;1320 ;6 ;554 ;198 ;23952096 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 16 x 32;I;900 ;16 ;300 ;32 ;;;18 ;;;;45 ;329 ;192 ;137 ;444000 ;9880 ;;11200 ;37 ;14400 ;962 ;1500 ;7 ;770 ;240 ;27123264 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 19 x 22;I;900 ;19 ;300 ;22 ;;;18 ;;;;45 ;297 ;132 ;165 ;359000 ;7970 ;;9390 ;35 ;9950 ;664 ;1070 ;6 ;409 ;186 ;19079379 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 19 x 25;I;900 ;19 ;300 ;25 ;;;18 ;;;;45 ;314 ;150 ;164 ;389000 ;8650 ;;10100 ;35 ;11300 ;754 ;1210 ;6 ;507 ;203 ;21533203 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 19 x 28;I;900 ;19 ;300 ;28 ;;;18 ;;;;45 ;331 ;168 ;163 ;420000 ;9320 ;;10800 ;36 ;12700 ;844 ;1340 ;6 ;632 ;226 ;23952096 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 300 x 19 x 32;I;900 ;19 ;300 ;32 ;;;18 ;;;;45 ;354 ;192 ;162 ;459000 ;10200 ;;11800 ;36 ;14500 ;964 ;1520 ;6 ;846 ;265 ;27123264 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 16 x 25;I;900 ;16 ;350 ;25 ;;;18 ;;;;45 ;314 ;175 ;139 ;422000 ;9370 ;;10700 ;37 ;17900 ;1020 ;1590 ;8 ;481 ;192 ;34193929 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 16 x 28;I;900 ;16 ;350 ;28 ;;;18 ;;;;45 ;334 ;196 ;138 ;458000 ;10200 ;;11500 ;37 ;20000 ;1150 ;1770 ;8 ;627 ;224 ;38035041 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 16 x 32;I;900 ;16 ;350 ;32 ;;;18 ;;;;45 ;361 ;224 ;137 ;505000 ;11200 ;;12600 ;37 ;22900 ;1310 ;2020 ;8 ;879 ;275 ;43070739 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 19 x 25;I;900 ;19 ;350 ;25 ;;;18 ;;;;45 ;339 ;175 ;164 ;437000 ;9720 ;;11200 ;36 ;17900 ;1020 ;1610 ;7 ;559 ;224 ;34193929 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 19 x 28;I;900 ;19 ;350 ;28 ;;;18 ;;;;45 ;359 ;196 ;163 ;473000 ;10500 ;;12000 ;36 ;20100 ;1150 ;1790 ;7 ;705 ;252 ;38035041 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 19 x 32;I;900 ;19 ;350 ;32 ;;;18 ;;;;45 ;386 ;224 ;162 ;519000 ;11500 ;;13200 ;37 ;22900 ;1310 ;2040 ;8 ;956 ;299 ;43070739 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 19 x 36;I;900 ;19 ;350 ;36 ;;;18 ;;;;45 ;412 ;252 ;160 ;565000 ;12600 ;;14300 ;37 ;25800 ;1470 ;2280 ;8 ;1278 ;355 ;48009024 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 350 x 19 x 40;I;900 ;19 ;350 ;40 ;;;18 ;;;;45 ;439 ;280 ;159 ;610000 ;13600 ;;15300 ;37 ;28600 ;1640 ;2530 ;8 ;1681 ;420 ;52850583 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 400 x 16 x 25;I;900 ;16 ;400 ;25 ;;;18 ;;;;45 ;339 ;200 ;139 ;470000 ;10400 ;;11800 ;37 ;26700 ;1340 ;2060 ;9 ;533 ;213 ;51041667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 400 x 16 x 28;I;900 ;16 ;400 ;28 ;;;18 ;;;;45 ;362 ;224 ;138 ;511000 ;11400 ;;12700 ;38 ;29900 ;1490 ;2300 ;9 ;701 ;250 ;56775339 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 400 x 16 x 32;I;900 ;16 ;400 ;32 ;;;18 ;;;;45 ;393 ;256 ;137 ;565000 ;12600 ;;14000 ;38 ;34200 ;1710 ;2620 ;9 ;988 ;309 ;64292181 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 400 x 19 x 28;I;900 ;19 ;400 ;28 ;;;18 ;;;;45 ;387 ;224 ;163 ;526000 ;11700 ;;13300 ;37 ;29900 ;1500 ;2320 ;9 ;778 ;278 ;56775339 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 400 x 19 x 32;I;900 ;19 ;400 ;32 ;;;18 ;;;;45 ;418 ;256 ;162 ;580000 ;12900 ;;14500 ;37 ;34200 ;1710 ;2640 ;9 ;1065 ;333 ;64292181 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 400 x 19 x 36;I;900 ;19 ;400 ;36 ;;;18 ;;;;45 ;448 ;288 ;160 ;632000 ;14100 ;;15800 ;38 ;38500 ;1920 ;2960 ;9 ;1433 ;398 ;71663616 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 900 x 400 x 19 x 40;I;900 ;19 ;400 ;40 ;;;18 ;;;;45 ;479 ;320 ;159 ;684000 ;15200 ;;17100 ;38 ;42700 ;2140 ;3280 ;9 ;1894 ;474 ;78890667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 16 x 22;I;950 ;16 ;250 ;22 ;;;18 ;;;;48 ;258 ;110 ;148 ;342000 ;7190 ;;8510 ;36 ;5760 ;461 ;749 ;5 ;301 ;137 ;12334667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 16 x 25;I;950 ;16 ;250 ;25 ;;;18 ;;;;48 ;272 ;125 ;147 ;370000 ;7790 ;;9150 ;37 ;6550 ;524 ;842 ;5 ;383 ;153 ;13926188 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 16 x 28;I;950 ;16 ;250 ;28 ;;;18 ;;;;48 ;286 ;140 ;146 ;398000 ;8390 ;;9770 ;37 ;7330 ;586 ;936 ;5 ;488 ;174 ;15496323 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 16 x 32;I;950 ;16 ;250 ;32 ;;;18 ;;;;48 ;305 ;160 ;145 ;435000 ;9160 ;;10600 ;38 ;8370 ;669 ;1060 ;5 ;667 ;208 ;17556750 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 19 x 25;I;950 ;19 ;250 ;25 ;;;18 ;;;;48 ;299 ;125 ;174 ;388000 ;8180 ;;9750 ;36 ;6570 ;525 ;866 ;5 ;466 ;186 ;13926188 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 19 x 28;I;950 ;19 ;250 ;28 ;;;18 ;;;;48 ;313 ;140 ;173 ;416000 ;8760 ;;10400 ;37 ;7350 ;588 ;959 ;5 ;570 ;204 ;15496323 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 19 x 32;I;950 ;19 ;250 ;32 ;;;18 ;;;;48 ;331 ;160 ;171 ;453000 ;9530 ;;11200 ;37 ;8390 ;671 ;1080 ;5 ;749 ;234 ;17556750 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 19 x 36;I;950 ;19 ;250 ;36 ;;;18 ;;;;48 ;350 ;180 ;170 ;489000 ;10300 ;;12000 ;37 ;9430 ;754 ;1210 ;5 ;978 ;272 ;19579594 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 250 x 19 x 40;I;950 ;19 ;250 ;40 ;;;18 ;;;;48 ;368 ;200 ;168 ;524000 ;11000 ;;12800 ;38 ;10500 ;838 ;1330 ;5 ;1266 ;316 ;21565104 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 16 x 22;I;950 ;16 ;300 ;22 ;;;18 ;;;;48 ;280 ;132 ;148 ;389000 ;8190 ;;9530 ;37 ;9940 ;662 ;1050 ;6 ;337 ;153 ;21314304 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 16 x 25;I;950 ;16 ;300 ;25 ;;;18 ;;;;48 ;297 ;150 ;147 ;424000 ;8920 ;;10300 ;38 ;11300 ;752 ;1190 ;6 ;435 ;174 ;24064453 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 16 x 28;I;950 ;16 ;300 ;28 ;;;18 ;;;;48 ;314 ;168 ;146 ;458000 ;9640 ;;11100 ;38 ;12600 ;842 ;1320 ;6 ;561 ;200 ;26777646 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 16 x 32;I;950 ;16 ;300 ;32 ;;;18 ;;;;48 ;337 ;192 ;145 ;503000 ;10600 ;;12100 ;39 ;14400 ;962 ;1500 ;7 ;776 ;243 ;30338064 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 19 x 25;I;950 ;19 ;300 ;25 ;;;18 ;;;;48 ;324 ;150 ;174 ;442000 ;9300 ;;10900 ;37 ;11300 ;754 ;1210 ;6 ;518 ;207 ;24064453 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 19 x 28;I;950 ;19 ;300 ;28 ;;;18 ;;;;48 ;341 ;168 ;173 ;476000 ;10000 ;;11700 ;37 ;12700 ;844 ;1340 ;6 ;643 ;230 ;26777646 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 19 x 32;I;950 ;19 ;300 ;32 ;;;18 ;;;;48 ;363 ;192 ;171 ;520000 ;11000 ;;12700 ;38 ;14500 ;964 ;1520 ;6 ;858 ;268 ;30338064 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 19 x 36;I;950 ;19 ;300 ;36 ;;;18 ;;;;48 ;386 ;216 ;170 ;564000 ;11900 ;;13700 ;38 ;16300 ;1080 ;1700 ;6 ;1134 ;315 ;33833538 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 300 x 19 x 40;I;950 ;19 ;300 ;40 ;;;18 ;;;;48 ;408 ;240 ;168 ;607000 ;12800 ;;14600 ;39 ;18100 ;1200 ;1880 ;7 ;1479 ;370 ;37264500 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 16 x 22;I;950 ;16 ;350 ;22 ;;;18 ;;;;48 ;302 ;154 ;148 ;436000 ;9190 ;;10600 ;38 ;15800 ;900 ;1410 ;7 ;372 ;169 ;33846325 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 16 x 25;I;950 ;16 ;350 ;25 ;;;18 ;;;;48 ;322 ;175 ;147 ;477000 ;10000 ;;11500 ;39 ;17900 ;1020 ;1590 ;7 ;487 ;195 ;38213460 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 16 x 28;I;950 ;16 ;350 ;28 ;;;18 ;;;;48 ;342 ;196 ;146 ;517000 ;10900 ;;12400 ;39 ;20000 ;1150 ;1780 ;8 ;634 ;227 ;42521910 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 16 x 32;I;950 ;16 ;350 ;32 ;;;18 ;;;;48 ;369 ;224 ;145 ;570000 ;12000 ;;13500 ;39 ;22900 ;1310 ;2020 ;8 ;886 ;277 ;48175722 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 19 x 25;I;950 ;19 ;350 ;25 ;;;18 ;;;;48 ;349 ;175 ;174 ;495000 ;10400 ;;12100 ;38 ;17900 ;1020 ;1620 ;7 ;570 ;228 ;38213460 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 19 x 28;I;950 ;19 ;350 ;28 ;;;18 ;;;;48 ;369 ;196 ;173 ;535000 ;11300 ;;13000 ;38 ;20100 ;1150 ;1800 ;7 ;717 ;256 ;42521910 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 19 x 32;I;950 ;19 ;350 ;32 ;;;18 ;;;;48 ;395 ;224 ;171 ;588000 ;12400 ;;14100 ;39 ;22900 ;1310 ;2040 ;8 ;967 ;302 ;48175722 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 19 x 36;I;950 ;19 ;350 ;36 ;;;18 ;;;;48 ;422 ;252 ;170 ;639000 ;13500 ;;15300 ;39 ;25800 ;1470 ;2290 ;8 ;1289 ;358 ;53726405 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 350 x 19 x 40;I;950 ;19 ;350 ;40 ;;;18 ;;;;48 ;448 ;280 ;168 ;689000 ;14500 ;;16500 ;39 ;28600 ;1640 ;2530 ;8 ;1692 ;423 ;59174646 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 16 x 22;I;950 ;16 ;400 ;22 ;;;18 ;;;;48 ;324 ;176 ;148 ;484000 ;10200 ;;11600 ;39 ;23500 ;1180 ;1820 ;9 ;408 ;185 ;50522795 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 16 x 25;I;950 ;16 ;400 ;25 ;;;18 ;;;;48 ;347 ;200 ;147 ;531000 ;11200 ;;12600 ;39 ;26700 ;1340 ;2060 ;9 ;540 ;216 ;57041667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 16 x 28;I;950 ;16 ;400 ;28 ;;;18 ;;;;48 ;370 ;224 ;146 ;577000 ;12100 ;;13600 ;40 ;29900 ;1500 ;2300 ;9 ;707 ;253 ;63472939 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 16 x 32;I;950 ;16 ;400 ;32 ;;;18 ;;;;48 ;401 ;256 ;145 ;638000 ;13400 ;;15000 ;40 ;34200 ;1710 ;2620 ;9 ;995 ;311 ;71912448 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 19 x 25;I;950 ;19 ;400 ;25 ;;;18 ;;;;48 ;374 ;200 ;174 ;549000 ;11600 ;;13200 ;38 ;26700 ;1340 ;2080 ;8 ;622 ;249 ;57041667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 19 x 28;I;950 ;19 ;400 ;28 ;;;18 ;;;;48 ;397 ;224 ;173 ;595000 ;12500 ;;14200 ;39 ;29900 ;1500 ;2320 ;9 ;790 ;282 ;63472939 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 19 x 32;I;950 ;19 ;400 ;32 ;;;18 ;;;;48 ;427 ;256 ;171 ;655000 ;13800 ;;15600 ;39 ;34200 ;1710 ;2640 ;9 ;1076 ;336 ;71912448 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 19 x 36;I;950 ;19 ;400 ;36 ;;;18 ;;;;48 ;458 ;288 ;170 ;714000 ;15000 ;;16900 ;40 ;38500 ;1920 ;2960 ;9 ;1445 ;401 ;80198016 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 950 x 400 x 19 x 40;I;950 ;19 ;400 ;40 ;;;18 ;;;;48 ;488 ;320 ;168 ;772000 ;16300 ;;18300 ;40 ;42700 ;2140 ;3280 ;9 ;1906 ;476 ;88330667 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 16 x 22;I;1000 ;16 ;250 ;22 ;;;18 ;;;;50 ;266 ;110 ;156 ;386000 ;7720 ;;9170 ;38 ;5770 ;461 ;752 ;5 ;308 ;140 ;13699641 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 16 x 25;I;1000 ;16 ;250 ;25 ;;;18 ;;;;50 ;280 ;125 ;155 ;418000 ;8350 ;;9830 ;39 ;6550 ;524 ;845 ;5 ;390 ;156 ;15472412 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 16 x 28;I;1000 ;16 ;250 ;28 ;;;18 ;;;;50 ;294 ;140 ;154 ;449000 ;8980 ;;10500 ;39 ;7330 ;586 ;939 ;5 ;495 ;177 ;17222625 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 16 x 32;I;1000 ;16 ;250 ;32 ;;;18 ;;;;50 ;313 ;160 ;153 ;490000 ;9810 ;;11400 ;40 ;8370 ;670 ;1060 ;5 ;674 ;211 ;19521333 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 19 x 25;I;1000 ;19 ;250 ;25 ;;;18 ;;;;50 ;308 ;125 ;183 ;439000 ;8780 ;;10500 ;38 ;6570 ;526 ;871 ;5 ;478 ;191 ;15472412 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 19 x 28;I;1000 ;19 ;250 ;28 ;;;18 ;;;;50 ;322 ;140 ;182 ;470000 ;9400 ;;11200 ;38 ;7350 ;588 ;964 ;5 ;582 ;208 ;17222625 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 19 x 32;I;1000 ;19 ;250 ;32 ;;;18 ;;;;50 ;341 ;160 ;181 ;511000 ;10200 ;;12000 ;39 ;8390 ;671 ;1090 ;5 ;760 ;238 ;19521333 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 19 x 36;I;1000 ;19 ;250 ;36 ;;;18 ;;;;50 ;359 ;180 ;179 ;551000 ;11000 ;;12900 ;39 ;9430 ;755 ;1210 ;5 ;990 ;275 ;21780375 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 250 x 19 x 40;I;1000 ;19 ;250 ;40 ;;;18 ;;;;50 ;378 ;200 ;178 ;590000 ;11800 ;;13700 ;40 ;10500 ;838 ;1340 ;5 ;1277 ;319 ;24000000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 16 x 22;I;1000 ;16 ;300 ;22 ;;;18 ;;;;50 ;288 ;132 ;156 ;438000 ;8770 ;;10200 ;39 ;9940 ;662 ;1050 ;6 ;343 ;156 ;23672979 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 16 x 25;I;1000 ;16 ;300 ;25 ;;;18 ;;;;50 ;305 ;150 ;155 ;477000 ;9540 ;;11100 ;40 ;11300 ;752 ;1190 ;6 ;442 ;177 ;26736328 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 16 x 28;I;1000 ;16 ;300 ;28 ;;;18 ;;;;50 ;322 ;168 ;154 ;515000 ;10300 ;;11900 ;40 ;12600 ;842 ;1320 ;6 ;568 ;203 ;29760696 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 16 x 32;I;1000 ;16 ;300 ;32 ;;;18 ;;;;50 ;345 ;192 ;153 ;565000 ;11300 ;;12900 ;41 ;14400 ;962 ;1500 ;6 ;783 ;245 ;33732864 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 19 x 25;I;1000 ;19 ;300 ;25 ;;;18 ;;;;50 ;333 ;150 ;183 ;498000 ;9970 ;;11700 ;39 ;11300 ;754 ;1210 ;6 ;530 ;212 ;26736328 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 19 x 28;I;1000 ;19 ;300 ;28 ;;;18 ;;;;50 ;350 ;168 ;182 ;536000 ;10700 ;;12500 ;39 ;12700 ;844 ;1350 ;6 ;655 ;234 ;29760696 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 19 x 32;I;1000 ;19 ;300 ;32 ;;;18 ;;;;50 ;373 ;192 ;181 ;586000 ;11700 ;;13600 ;40 ;14500 ;964 ;1530 ;6 ;869 ;272 ;33732864 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 19 x 36;I;1000 ;19 ;300 ;36 ;;;18 ;;;;50 ;395 ;216 ;179 ;634000 ;12700 ;;14600 ;40 ;16300 ;1080 ;1710 ;6 ;1145 ;318 ;37636488 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 300 x 19 x 40;I;1000 ;19 ;300 ;40 ;;;18 ;;;;50 ;418 ;240 ;178 ;682000 ;13600 ;;15700 ;40 ;18100 ;1200 ;1890 ;7 ;1490 ;373 ;41472000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 16 x 22;I;1000 ;16 ;350 ;22 ;;;18 ;;;;50 ;310 ;154 ;156 ;491000 ;9820 ;;11300 ;40 ;15800 ;900 ;1410 ;7 ;379 ;172 ;37591814 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 16 x 25;I;1000 ;16 ;350 ;25 ;;;18 ;;;;50 ;330 ;175 ;155 ;536000 ;10700 ;;12300 ;40 ;17900 ;1020 ;1600 ;7 ;494 ;198 ;42456299 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 16 x 28;I;1000 ;16 ;350 ;28 ;;;18 ;;;;50 ;350 ;196 ;154 ;581000 ;11600 ;;13200 ;41 ;20000 ;1150 ;1780 ;8 ;641 ;229 ;47258883 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 16 x 32;I;1000 ;16 ;350 ;32 ;;;18 ;;;;50 ;377 ;224 ;153 ;640000 ;12800 ;;14500 ;41 ;22900 ;1310 ;2020 ;8 ;892 ;279 ;53566539 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 19 x 25;I;1000 ;19 ;350 ;25 ;;;18 ;;;;50 ;358 ;175 ;183 ;558000 ;11200 ;;12900 ;40 ;17900 ;1020 ;1620 ;7 ;582 ;233 ;42456299 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 19 x 28;I;1000 ;19 ;350 ;28 ;;;18 ;;;;50 ;378 ;196 ;182 ;602000 ;12000 ;;13900 ;40 ;20100 ;1150 ;1800 ;7 ;728 ;260 ;47258883 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 19 x 32;I;1000 ;19 ;350 ;32 ;;;18 ;;;;50 ;405 ;224 ;181 ;661000 ;13200 ;;15100 ;40 ;22900 ;1310 ;2050 ;8 ;979 ;306 ;53566539 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 19 x 36;I;1000 ;19 ;350 ;36 ;;;18 ;;;;50 ;431 ;252 ;179 ;718000 ;14400 ;;16400 ;41 ;25800 ;1470 ;2290 ;8 ;1301 ;361 ;59765349 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 350 x 19 x 40;I;1000 ;19 ;350 ;40 ;;;18 ;;;;50 ;458 ;280 ;178 ;775000 ;15500 ;;17600 ;41 ;28600 ;1640 ;2540 ;8 ;1704 ;426 ;65856000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 16 x 22;I;1000 ;16 ;400 ;22 ;;;18 ;;;;50 ;332 ;176 ;156 ;544000 ;10900 ;;12400 ;41 ;23500 ;1180 ;1820 ;8 ;414 ;188 ;56113728 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 16 x 25;I;1000 ;16 ;400 ;25 ;;;18 ;;;;50 ;355 ;200 ;155 ;596000 ;11900 ;;13500 ;41 ;26700 ;1340 ;2060 ;9 ;546 ;219 ;63375000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 16 x 28;I;1000 ;16 ;400 ;28 ;;;18 ;;;;50 ;378 ;224 ;154 ;647000 ;12900 ;;14600 ;41 ;29900 ;1500 ;2300 ;9 ;714 ;255 ;70543872 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 16 x 32;I;1000 ;16 ;400 ;32 ;;;18 ;;;;50 ;409 ;256 ;153 ;715000 ;14300 ;;16000 ;42 ;34200 ;1710 ;2620 ;9 ;1002 ;313 ;79959381 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 19 x 25;I;1000 ;19 ;400 ;25 ;;;18 ;;;;50 ;383 ;200 ;183 ;617000 ;12300 ;;14200 ;40 ;26700 ;1340 ;2090 ;8 ;634 ;254 ;63375000 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 19 x 28;I;1000 ;19 ;400 ;28 ;;;18 ;;;;50 ;406 ;224 ;182 ;669000 ;13400 ;;15200 ;41 ;29900 ;1500 ;2330 ;9 ;801 ;286 ;70543872 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 19 x 32;I;1000 ;19 ;400 ;32 ;;;18 ;;;;50 ;437 ;256 ;181 ;736000 ;14700 ;;16700 ;41 ;34200 ;1710 ;2650 ;9 ;1088 ;340 ;79959381 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 19 x 36;I;1000 ;19 ;400 ;36 ;;;18 ;;;;50 ;467 ;288 ;179 ;802000 ;16000 ;;18100 ;41 ;38500 ;1920 ;2970 ;9 ;1456 ;405 ;89212416 ;;;;3 ;;;;;;;;;; +;Japan;SH;H 1000 x 400 x 19 x 40;I;1000 ;19 ;400 ;40 ;;;18 ;;;;50 ;498 ;320 ;178 ;867000 ;17300 ;;19500 ;42 ;42700 ;2140 ;3290 ;9 ;1917 ;479 ;98304000 ;;;;3 ;;;;;;;;;; +#;;;;;Depth;thickness;Upper Width;thickness;Lower Width;thickness;;Eccentricity;Eccentricity;Eccentricity;Position;Area;effective;effective;Second;Elastic;Elastic;Plastic;Radius;Second;Elastic;Plastic;Radius;Torsional;Elastic;;Imerfection;Imerfection;Imerfection;Type +#;;;;;of;of;of;of upper;of;of lower;Root;in local;in local;in local;of;of;Vy shear;Vz shear;Moment;Modulus;Modulus;Modulus;of;Moment;Modulus;Modulus;of;Constant;Modulus;;value;value;value;of +#;;;;;Section;Web;Section;Flange;Section;Flange;Radius;X-direction;Y-direction;Z-direction;Centroid;Section;Area ;Area ;of Area;upper;lower;;Gyration;of Area;;;Gyration;Inertia;Torsion;;f. buckling;f. buckling;f. lateral tors-;Product +#;;;;;;;;;;;;;;;;;;;(strong axis);(strong axis);(strong axis);(strong axis);(strong axis);(weak axis);(weak axis);(weak axis);(weak axis);;;;(strong axis);(weak axis);ional buckling;(*) +#;country;family;name;shape;h;t_web;b_upper;t_upper;b_lower;t_lower;r;ex;ey;ez;zs;A;Ay;Az;Iy;Wy;;Wply;i_y;Iz;Wz;Wplz;i_z;It;Wt;Cw;alpha_y;alpha_z;alpha_LT;Product +#;;;;;mm;mm;mm;mm;mm;mm;mm;cm;cm;cm;cm;cm2;cm2;cm2;cm4;cm3;;cm3;cm;cm4;cm3;cm3;cm;cm4;cm3;cm6;-;-;-;- +;Japan;BCP;BCP 400x12;[];400 ;12 ;400 ;12 ;;;42 ;;;;;179 ;89 ;89 ;43800 ;2190 ;;2560 ;16 ;43800 ;2190 ;2560 ;16 ;70093 ;3505 ;0 ;;;;0 ; +;Japan;BCP;BCP 400x16;[];400 ;16 ;400 ;16 ;;;56 ;;;;;233 ;116 ;116 ;55200 ;2760 ;;3280 ;15 ;55200 ;2760 ;3280 ;15 ;90597 ;4530 ;0 ;;;;0 ; +;Japan;BCP;BCP 400x19;[];400 ;19 ;400 ;19 ;;;67 ;;;;;271 ;136 ;136 ;62800 ;3140 ;;3770 ;15 ;62800 ;3140 ;3770 ;15 ;105082 ;5254 ;0 ;;;;0 ; +;Japan;BCP;BCP 400x22;[];400 ;22 ;400 ;22 ;;;77 ;;;;;308 ;154 ;154 ;69500 ;3480 ;;4220 ;15 ;69500 ;3480 ;4220 ;15 ;118822 ;5941 ;0 ;;;;0 ; +;Japan;BCP;BCP 400x25;[];400 ;25 ;400 ;25 ;;;88 ;;;;;343 ;171 ;171 ;75400 ;3770 ;;4640 ;15 ;75400 ;3770 ;4640 ;15 ;131836 ;6592 ;0 ;;;;0 ; +;Japan;BCP;BCP 400x28;[];400 ;28 ;400 ;28 ;;;98 ;;;;;376 ;188 ;188 ;80600 ;4030 ;;5010 ;15 ;80600 ;4030 ;5010 ;15 ;144141 ;7207 ;0 ;;;;0 ; +;Japan;BCP;BCP 400x32;[];400 ;32 ;400 ;32 ;;;112 ;;;;;418 ;209 ;209 ;86200 ;4310 ;;5460 ;14 ;86200 ;4310 ;5460 ;14 ;159475 ;7974 ;0 ;;;;0 ; +;Japan;BCP;BCP 450x12;[];450 ;12 ;450 ;12 ;;;42 ;;;;;203 ;101 ;101 ;63500 ;2820 ;;3290 ;18 ;63500 ;2820 ;3290 ;18 ;100833 ;4481 ;0 ;;;;0 ; +;Japan;BCP;BCP 450x16;[];450 ;16 ;450 ;16 ;;;56 ;;;;;265 ;132 ;132 ;80600 ;3580 ;;4230 ;18 ;80600 ;3580 ;4230 ;18 ;130794 ;5813 ;0 ;;;;0 ; +;Japan;BCP;BCP 450x19;[];450 ;19 ;450 ;19 ;;;67 ;;;;;309 ;155 ;155 ;92200 ;4100 ;;4880 ;17 ;92200 ;4100 ;4880 ;17 ;152120 ;6761 ;0 ;;;;0 ; +;Japan;BCP;BCP 450x22;[];450 ;22 ;450 ;22 ;;;77 ;;;;;352 ;176 ;176 ;103000 ;4560 ;;5490 ;17 ;103000 ;4560 ;5490 ;17 ;172486 ;7666 ;0 ;;;;0 ; +;Japan;BCP;BCP 450x25;[];450 ;25 ;450 ;25 ;;;88 ;;;;;393 ;196 ;196 ;112000 ;4980 ;;6050 ;17 ;112000 ;4980 ;6050 ;17 ;191914 ;8530 ;0 ;;;;0 ; +;Japan;BCP;BCP 450x28;[];450 ;28 ;450 ;28 ;;;98 ;;;;;432 ;216 ;216 ;121000 ;5360 ;;6580 ;17 ;121000 ;5360 ;6580 ;17 ;210424 ;9352 ;0 ;;;;0 ; +;Japan;BCP;BCP 450x32;[];450 ;32 ;450 ;32 ;;;112 ;;;;;482 ;241 ;241 ;130000 ;5780 ;;7210 ;16 ;130000 ;5780 ;7210 ;16 ;233711 ;10387 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x12;[];500 ;12 ;500 ;12 ;;;42 ;;;;;227 ;113 ;113 ;88400 ;3540 ;;4100 ;20 ;88400 ;3540 ;4100 ;20 ;139457 ;5578 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x16;[];500 ;16 ;500 ;16 ;;;56 ;;;;;297 ;148 ;148 ;113000 ;4510 ;;5290 ;20 ;113000 ;4510 ;5290 ;20 ;181408 ;7256 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x19;[];500 ;19 ;500 ;19 ;;;67 ;;;;;347 ;174 ;174 ;130000 ;5180 ;;6130 ;19 ;130000 ;5180 ;6130 ;19 ;211441 ;8458 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x22;[];500 ;22 ;500 ;22 ;;;77 ;;;;;396 ;198 ;198 ;145000 ;5800 ;;6920 ;19 ;145000 ;5800 ;6920 ;19 ;240274 ;9611 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x25;[];500 ;25 ;500 ;25 ;;;88 ;;;;;443 ;221 ;221 ;159000 ;6360 ;;7660 ;19 ;159000 ;6360 ;7660 ;19 ;267930 ;10717 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x28;[];500 ;28 ;500 ;28 ;;;98 ;;;;;488 ;244 ;244 ;172000 ;6870 ;;8360 ;19 ;172000 ;6870 ;8360 ;19 ;294431 ;11777 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x32;[];500 ;32 ;500 ;32 ;;;112 ;;;;;546 ;273 ;273 ;187000 ;7470 ;;9210 ;19 ;187000 ;7470 ;9210 ;19 ;328010 ;13120 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x36;[];500 ;36 ;500 ;36 ;;;126 ;;;;;601 ;301 ;301 ;200000 ;7990 ;;9970 ;18 ;200000 ;7990 ;9970 ;18 ;359630 ;14385 ;0 ;;;;0 ; +;Japan;BCP;BCP 500x40;[];500 ;40 ;500 ;40 ;;;140 ;;;;;654 ;327 ;327 ;210000 ;8420 ;;10700 ;18 ;210000 ;8420 ;10700 ;18 ;389344 ;15574 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x12;[];550 ;12 ;550 ;12 ;;;42 ;;;;;251 ;125 ;125 ;119000 ;4330 ;;5010 ;22 ;119000 ;4330 ;5010 ;22 ;186865 ;6795 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x16;[];550 ;16 ;550 ;16 ;;;56 ;;;;;329 ;164 ;164 ;153000 ;5550 ;;6480 ;22 ;153000 ;5550 ;6480 ;22 ;243637 ;8860 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x19;[];550 ;19 ;550 ;19 ;;;67 ;;;;;385 ;193 ;193 ;176000 ;6390 ;;7530 ;21 ;176000 ;6390 ;7530 ;21 ;284470 ;10344 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x22;[];550 ;22 ;550 ;22 ;;;77 ;;;;;440 ;220 ;220 ;197000 ;7180 ;;8520 ;21 ;197000 ;7180 ;8520 ;21 ;323835 ;11776 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x25;[];550 ;25 ;550 ;25 ;;;88 ;;;;;493 ;246 ;246 ;217000 ;7900 ;;9460 ;21 ;217000 ;7900 ;9460 ;21 ;361758 ;13155 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x28;[];550 ;28 ;550 ;28 ;;;98 ;;;;;544 ;272 ;272 ;236000 ;8570 ;;10300 ;21 ;236000 ;8570 ;10300 ;21 ;398263 ;14482 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x32;[];550 ;32 ;550 ;32 ;;;112 ;;;;;610 ;305 ;305 ;258000 ;9380 ;;11400 ;21 ;258000 ;9380 ;11400 ;21 ;444774 ;16174 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x36;[];550 ;36 ;550 ;36 ;;;126 ;;;;;673 ;337 ;337 ;277000 ;10100 ;;12400 ;20 ;277000 ;10100 ;12400 ;20 ;488868 ;17777 ;0 ;;;;0 ; +;Japan;BCP;BCP 550x40;[];550 ;40 ;550 ;40 ;;;140 ;;;;;734 ;367 ;367 ;294000 ;10700 ;;13400 ;20 ;294000 ;10700 ;13400 ;20 ;530604 ;19295 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x12;[];600 ;12 ;600 ;12 ;;;42 ;;;;;275 ;137 ;137 ;156000 ;5200 ;;6000 ;24 ;156000 ;5200 ;6000 ;24 ;243957 ;8132 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x16;[];600 ;16 ;600 ;16 ;;;56 ;;;;;361 ;180 ;180 ;201000 ;6690 ;;7790 ;24 ;201000 ;6690 ;7790 ;24 ;318683 ;10623 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x19;[];600 ;19 ;600 ;19 ;;;67 ;;;;;423 ;212 ;212 ;232000 ;7730 ;;9070 ;23 ;232000 ;7730 ;9070 ;23 ;372634 ;12421 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x22;[];600 ;22 ;600 ;22 ;;;77 ;;;;;484 ;242 ;242 ;261000 ;8710 ;;10300 ;23 ;261000 ;8710 ;10300 ;23 ;424821 ;14161 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x25;[];600 ;25 ;600 ;25 ;;;88 ;;;;;543 ;271 ;271 ;288000 ;9620 ;;11400 ;23 ;288000 ;9620 ;11400 ;23 ;475273 ;15842 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x28;[];600 ;28 ;600 ;28 ;;;98 ;;;;;600 ;300 ;300 ;314000 ;10500 ;;12500 ;23 ;314000 ;10500 ;12500 ;23 ;524018 ;17467 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x32;[];600 ;32 ;600 ;32 ;;;112 ;;;;;674 ;337 ;337 ;345000 ;11500 ;;13900 ;23 ;345000 ;11500 ;13900 ;23 ;586401 ;19547 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x36;[];600 ;36 ;600 ;36 ;;;126 ;;;;;745 ;373 ;373 ;372000 ;12400 ;;15200 ;22 ;372000 ;12400 ;15200 ;22 ;645862 ;21529 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x40;[];600 ;40 ;600 ;40 ;;;140 ;;;;;814 ;407 ;407 ;397000 ;13200 ;;16400 ;22 ;397000 ;13200 ;16400 ;22 ;702464 ;23415 ;0 ;;;;0 ; +;Japan;BCP;BCP 600x45;[];600 ;45 ;600 ;45 ;;;158 ;;;;;895 ;447 ;447 ;423000 ;14100 ;;17700 ;22 ;423000 ;14100 ;17700 ;22 ;769292 ;25643 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x16;[];650 ;16 ;650 ;16 ;;;56 ;;;;;393 ;196 ;196 ;258000 ;7940 ;;9220 ;26 ;258000 ;7940 ;9220 ;26 ;407744 ;12546 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x19;[];650 ;19 ;650 ;19 ;;;67 ;;;;;461 ;231 ;231 ;299000 ;9200 ;;10700 ;26 ;299000 ;9200 ;10700 ;26 ;477355 ;14688 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x22;[];650 ;22 ;650 ;22 ;;;77 ;;;;;528 ;264 ;264 ;337000 ;10400 ;;12200 ;25 ;337000 ;10400 ;12200 ;25 ;544881 ;16766 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x25;[];650 ;25 ;650 ;25 ;;;88 ;;;;;593 ;296 ;296 ;374000 ;11500 ;;13600 ;25 ;374000 ;11500 ;13600 ;25 ;610352 ;18780 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x28;[];650 ;28 ;650 ;28 ;;;98 ;;;;;656 ;328 ;328 ;407000 ;12500 ;;14900 ;25 ;407000 ;12500 ;14900 ;25 ;673797 ;20732 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x32;[];650 ;32 ;650 ;32 ;;;112 ;;;;;738 ;369 ;369 ;449000 ;13800 ;;16600 ;25 ;449000 ;13800 ;16600 ;25 ;755293 ;23240 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x36;[];650 ;36 ;650 ;36 ;;;126 ;;;;;817 ;409 ;409 ;487000 ;15000 ;;18200 ;24 ;487000 ;15000 ;18200 ;24 ;833312 ;25640 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x40;[];650 ;40 ;650 ;40 ;;;140 ;;;;;894 ;447 ;447 ;521000 ;16000 ;;19700 ;24 ;521000 ;16000 ;19700 ;24 ;907924 ;27936 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x45;[];650 ;45 ;650 ;45 ;;;158 ;;;;;985 ;492 ;492 ;558000 ;17200 ;;21300 ;24 ;558000 ;17200 ;21300 ;24 ;996503 ;30662 ;0 ;;;;0 ; +;Japan;BCP;BCP 650x50;[];650 ;50 ;650 ;50 ;;;175 ;;;;;1071 ;536 ;536 ;590000 ;18200 ;;22900 ;24 ;590000 ;18200 ;22900 ;24 ;1080000 ;33231 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x16;[];700 ;16 ;700 ;16 ;;;56 ;;;;;425 ;212 ;212 ;325000 ;9300 ;;10800 ;28 ;325000 ;9300 ;10800 ;28 ;512022 ;14629 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x19;[];700 ;19 ;700 ;19 ;;;67 ;;;;;499 ;250 ;250 ;378000 ;10800 ;;12600 ;28 ;378000 ;10800 ;12600 ;28 ;600060 ;17145 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x22;[];700 ;22 ;700 ;22 ;;;77 ;;;;;572 ;286 ;286 ;427000 ;12200 ;;14300 ;27 ;427000 ;12200 ;14300 ;27 ;685665 ;19590 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x25;[];700 ;25 ;700 ;25 ;;;88 ;;;;;643 ;321 ;321 ;474000 ;13500 ;;16000 ;27 ;474000 ;13500 ;16000 ;27 ;768867 ;21968 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x28;[];700 ;28 ;700 ;28 ;;;98 ;;;;;712 ;356 ;356 ;518000 ;14800 ;;17600 ;27 ;518000 ;14800 ;17600 ;27 ;849700 ;24277 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x32;[];700 ;32 ;700 ;32 ;;;112 ;;;;;802 ;401 ;401 ;573000 ;16400 ;;19600 ;27 ;573000 ;16400 ;19600 ;27 ;953848 ;27253 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x36;[];700 ;36 ;700 ;36 ;;;126 ;;;;;889 ;445 ;445 ;623000 ;17800 ;;21500 ;27 ;623000 ;17800 ;21500 ;27 ;1053918 ;30112 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x40;[];700 ;40 ;700 ;40 ;;;140 ;;;;;974 ;487 ;487 ;669000 ;19100 ;;23300 ;26 ;669000 ;19100 ;23300 ;26 ;1149984 ;32857 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x45;[];700 ;45 ;700 ;45 ;;;158 ;;;;;1075 ;538 ;538 ;720000 ;20600 ;;25300 ;26 ;720000 ;20600 ;25300 ;26 ;1264551 ;36130 ;0 ;;;;0 ; +;Japan;BCP;BCP 700x50;[];700 ;50 ;700 ;50 ;;;175 ;;;;;1171 ;586 ;586 ;764000 ;21800 ;;27200 ;26 ;764000 ;21800 ;27200 ;26 ;1373125 ;39232 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x19;[];750 ;19 ;750 ;19 ;;;67 ;;;;;537 ;269 ;269 ;469000 ;12500 ;;14500 ;30 ;469000 ;12500 ;14500 ;30 ;742174 ;19791 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x22;[];750 ;22 ;750 ;22 ;;;77 ;;;;;616 ;308 ;308 ;531000 ;14200 ;;16600 ;29 ;531000 ;14200 ;16600 ;29 ;848822 ;22635 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x25;[];750 ;25 ;750 ;25 ;;;88 ;;;;;693 ;346 ;346 ;591000 ;15700 ;;18500 ;29 ;591000 ;15700 ;18500 ;29 ;952695 ;25405 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x28;[];750 ;28 ;750 ;28 ;;;98 ;;;;;768 ;384 ;384 ;647000 ;17200 ;;20400 ;29 ;647000 ;17200 ;20400 ;29 ;1053828 ;28102 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x32;[];750 ;32 ;750 ;32 ;;;112 ;;;;;866 ;433 ;433 ;717000 ;19100 ;;22800 ;29 ;717000 ;19100 ;22800 ;29 ;1184468 ;31586 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x36;[];750 ;36 ;750 ;36 ;;;126 ;;;;;961 ;481 ;481 ;782000 ;20900 ;;25000 ;29 ;782000 ;20900 ;25000 ;29 ;1310380 ;34943 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x40;[];750 ;40 ;750 ;40 ;;;140 ;;;;;1054 ;527 ;527 ;842000 ;22400 ;;27200 ;28 ;842000 ;22400 ;27200 ;28 ;1431644 ;38177 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x45;[];750 ;45 ;750 ;45 ;;;158 ;;;;;1165 ;583 ;583 ;909000 ;24200 ;;29700 ;28 ;909000 ;24200 ;29700 ;28 ;1576812 ;42048 ;0 ;;;;0 ; +;Japan;BCP;BCP 750x50;[];750 ;50 ;750 ;50 ;;;175 ;;;;;1271 ;636 ;636 ;969000 ;25800 ;;32000 ;28 ;969000 ;25800 ;32000 ;28 ;1715000 ;45733 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x19;[];800 ;19 ;800 ;19 ;;;67 ;;;;;575 ;288 ;288 ;574000 ;14300 ;;16600 ;32 ;574000 ;14300 ;16600 ;32 ;905121 ;22628 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x22;[];800 ;22 ;800 ;22 ;;;77 ;;;;;660 ;330 ;330 ;651000 ;16300 ;;19000 ;31 ;651000 ;16300 ;19000 ;31 ;1036004 ;25900 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x25;[];800 ;25 ;800 ;25 ;;;88 ;;;;;743 ;371 ;371 ;725000 ;18100 ;;21200 ;31 ;725000 ;18100 ;21200 ;31 ;1163711 ;29093 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x28;[];800 ;28 ;800 ;28 ;;;98 ;;;;;824 ;412 ;412 ;795000 ;19900 ;;23400 ;31 ;795000 ;19900 ;23400 ;31 ;1288279 ;32207 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x32;[];800 ;32 ;800 ;32 ;;;112 ;;;;;930 ;465 ;465 ;884000 ;22100 ;;26200 ;31 ;884000 ;22100 ;26200 ;31 ;1449551 ;36239 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x36;[];800 ;36 ;800 ;36 ;;;126 ;;;;;1033 ;517 ;517 ;966000 ;24100 ;;28900 ;31 ;966000 ;24100 ;28900 ;31 ;1605397 ;40135 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x40;[];800 ;40 ;800 ;40 ;;;140 ;;;;;1134 ;567 ;567 ;1040000 ;26100 ;;31400 ;30 ;1040000 ;26100 ;31400 ;30 ;1755904 ;43898 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x45;[];800 ;45 ;800 ;45 ;;;158 ;;;;;1255 ;628 ;628 ;1130000 ;28200 ;;34300 ;30 ;1130000 ;28200 ;34300 ;30 ;1936660 ;48416 ;0 ;;;;0 ; +;Japan;BCP;BCP 800x50;[];800 ;50 ;800 ;50 ;;;175 ;;;;;1371 ;686 ;686 ;1210000 ;30200 ;;37100 ;30 ;1210000 ;30200 ;37100 ;30 ;2109375 ;52734 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x19;[];850 ;19 ;850 ;19 ;;;67 ;;;;;613 ;307 ;307 ;694000 ;16300 ;;18900 ;34 ;694000 ;16300 ;18900 ;34 ;1090327 ;25655 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x22;[];850 ;22 ;850 ;22 ;;;77 ;;;;;704 ;352 ;352 ;788000 ;18500 ;;21600 ;34 ;788000 ;18500 ;21600 ;34 ;1248860 ;29385 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x25;[];850 ;25 ;850 ;25 ;;;88 ;;;;;793 ;396 ;396 ;879000 ;20700 ;;24200 ;33 ;879000 ;20700 ;24200 ;33 ;1403789 ;33030 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x28;[];850 ;28 ;850 ;28 ;;;98 ;;;;;880 ;440 ;440 ;965000 ;22700 ;;26700 ;33 ;965000 ;22700 ;26700 ;33 ;1555154 ;36592 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x32;[];850 ;32 ;850 ;32 ;;;112 ;;;;;994 ;497 ;497 ;1070000 ;25300 ;;29900 ;33 ;1070000 ;25300 ;29900 ;33 ;1751499 ;41212 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x36;[];850 ;36 ;850 ;36 ;;;126 ;;;;;1105 ;553 ;553 ;1180000 ;27700 ;;33000 ;33 ;1180000 ;27700 ;33000 ;33 ;1941671 ;45686 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x40;[];850 ;40 ;850 ;40 ;;;140 ;;;;;1214 ;607 ;607 ;1270000 ;29900 ;;35900 ;32 ;1270000 ;29900 ;35900 ;32 ;2125764 ;50018 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x45;[];850 ;45 ;850 ;45 ;;;158 ;;;;;1345 ;673 ;673 ;1380000 ;32500 ;;39300 ;32 ;1380000 ;32500 ;39300 ;32 ;2347471 ;55235 ;0 ;;;;0 ; +;Japan;BCP;BCP 850x50;[];850 ;50 ;850 ;50 ;;;175 ;;;;;1471 ;736 ;736 ;1480000 ;34900 ;;42600 ;32 ;1480000 ;34900 ;42600 ;32 ;2560000 ;60235 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x19;[];900 ;19 ;900 ;19 ;;;67 ;;;;;651 ;326 ;326 ;829000 ;18400 ;;21300 ;36 ;829000 ;18400 ;21300 ;36 ;1299216 ;28871 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x22;[];900 ;22 ;900 ;22 ;;;77 ;;;;;748 ;374 ;374 ;943000 ;21000 ;;24300 ;36 ;943000 ;21000 ;24300 ;36 ;1489040 ;33090 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x25;[];900 ;25 ;900 ;25 ;;;88 ;;;;;843 ;421 ;421 ;1050000 ;23400 ;;27300 ;35 ;1050000 ;23400 ;27300 ;35 ;1674805 ;37218 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x28;[];900 ;28 ;900 ;28 ;;;98 ;;;;;936 ;468 ;468 ;1160000 ;25700 ;;30100 ;35 ;1160000 ;25700 ;30100 ;35 ;1856554 ;41257 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x32;[];900 ;32 ;900 ;32 ;;;112 ;;;;;1058 ;529 ;529 ;1290000 ;28700 ;;33800 ;35 ;1290000 ;28700 ;33800 ;35 ;2092711 ;46505 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x36;[];900 ;36 ;900 ;36 ;;;126 ;;;;;1177 ;589 ;589 ;1420000 ;31500 ;;37300 ;35 ;1420000 ;31500 ;37300 ;35 ;2321901 ;51598 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x40;[];900 ;40 ;900 ;40 ;;;140 ;;;;;1294 ;647 ;647 ;1530000 ;34100 ;;40700 ;34 ;1530000 ;34100 ;40700 ;34 ;2544224 ;56538 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x45;[];900 ;45 ;900 ;45 ;;;158 ;;;;;1435 ;718 ;718 ;1670000 ;37100 ;;44700 ;34 ;1670000 ;37100 ;44700 ;34 ;2812619 ;62503 ;0 ;;;;0 ; +;Japan;BCP;BCP 900x50;[];900 ;50 ;900 ;50 ;;;175 ;;;;;1571 ;786 ;786 ;1790000 ;39900 ;;48400 ;34 ;1790000 ;39900 ;48400 ;34 ;3070625 ;68236 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x22;[];950 ;22 ;950 ;22 ;;;77 ;;;;;792 ;396 ;396 ;1120000 ;23500 ;;27200 ;38 ;1120000 ;23500 ;27200 ;38 ;1758193 ;37015 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x25;[];950 ;25 ;950 ;25 ;;;88 ;;;;;893 ;446 ;446 ;1250000 ;26300 ;;30600 ;37 ;1250000 ;26300 ;30600 ;37 ;1978633 ;41655 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x28;[];950 ;28 ;950 ;28 ;;;98 ;;;;;992 ;496 ;496 ;1370000 ;28900 ;;33800 ;37 ;1370000 ;28900 ;33800 ;37 ;2194577 ;46202 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x32;[];950 ;32 ;950 ;32 ;;;112 ;;;;;1122 ;561 ;561 ;1530000 ;32300 ;;38000 ;37 ;1530000 ;32300 ;38000 ;37 ;2475586 ;52118 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x36;[];950 ;36 ;950 ;36 ;;;126 ;;;;;1249 ;625 ;625 ;1680000 ;35500 ;;42000 ;37 ;1680000 ;35500 ;42000 ;37 ;2748787 ;57869 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x40;[];950 ;40 ;950 ;40 ;;;140 ;;;;;1374 ;687 ;687 ;1830000 ;38500 ;;45800 ;37 ;1830000 ;38500 ;45800 ;37 ;3014284 ;63459 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x45;[];950 ;45 ;950 ;45 ;;;158 ;;;;;1525 ;763 ;763 ;1990000 ;42000 ;;50400 ;36 ;1990000 ;42000 ;50400 ;36 ;3335479 ;70221 ;0 ;;;;0 ; +;Japan;BCP;BCP 950x50;[];950 ;50 ;950 ;50 ;;;175 ;;;;;1671 ;836 ;836 ;2150000 ;45200 ;;54700 ;36 ;2150000 ;45200 ;54700 ;36 ;3645000 ;76737 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x22;[];1000 ;22 ;1000 ;22 ;;;77 ;;;;;836 ;418 ;418 ;1310000 ;26200 ;;30300 ;40 ;1310000 ;26200 ;30300 ;40 ;2057971 ;41159 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x25;[];1000 ;25 ;1000 ;25 ;;;88 ;;;;;943 ;471 ;471 ;1470000 ;29300 ;;34000 ;39 ;1470000 ;29300 ;34000 ;39 ;2317148 ;46343 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x28;[];1000 ;28 ;1000 ;28 ;;;98 ;;;;;1048 ;524 ;524 ;1610000 ;32300 ;;37700 ;39 ;1610000 ;32300 ;37700 ;39 ;2571324 ;51426 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x32;[];1000 ;32 ;1000 ;32 ;;;112 ;;;;;1186 ;593 ;593 ;1810000 ;36100 ;;42400 ;39 ;1810000 ;36100 ;42400 ;39 ;2902526 ;58051 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x36;[];1000 ;36 ;1000 ;36 ;;;126 ;;;;;1321 ;661 ;661 ;1990000 ;39700 ;;46900 ;39 ;1990000 ;39700 ;46900 ;39 ;3225029 ;64501 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x40;[];1000 ;40 ;1000 ;40 ;;;140 ;;;;;1454 ;727 ;727 ;2160000 ;43100 ;;51200 ;39 ;2160000 ;43100 ;51200 ;39 ;3538944 ;70779 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x45;[];1000 ;45 ;1000 ;45 ;;;158 ;;;;;1615 ;808 ;808 ;2360000 ;47200 ;;56400 ;38 ;2360000 ;47200 ;56400 ;38 ;3919427 ;78389 ;0 ;;;;0 ; +;Japan;BCP;BCP 1000x50;[];1000 ;50 ;1000 ;50 ;;;175 ;;;;;1771 ;886 ;886 ;2540000 ;50900 ;;61300 ;38 ;2540000 ;50900 ;61300 ;38 ;4286875 ;85738 ;0 ;;;;0 ; +;Japan;BCP;BCP 1050x25;[];1050 ;25 ;1050 ;25 ;;;88 ;;;;;993 ;496 ;496 ;1710000 ;32500 ;;37700 ;42 ;1710000 ;32500 ;37700 ;42 ;2692227 ;51281 ;0 ;;;;0 ; +;Japan;BCP;BCP 1050x28;[];1050 ;28 ;1050 ;28 ;;;98 ;;;;;1104 ;552 ;552 ;1880000 ;35900 ;;41800 ;41 ;1880000 ;35900 ;41800 ;41 ;2988895 ;56931 ;0 ;;;;0 ; +;Japan;BCP;BCP 1050x32;[];1050 ;32 ;1050 ;32 ;;;112 ;;;;;1250 ;625 ;625 ;2110000 ;40100 ;;47000 ;41 ;2110000 ;40100 ;47000 ;41 ;3375929 ;64303 ;0 ;;;;0 ; +;Japan;BCP;BCP 1050x36;[];1050 ;36 ;1050 ;36 ;;;126 ;;;;;1393 ;697 ;697 ;2320000 ;44200 ;;52000 ;41 ;2320000 ;44200 ;52000 ;41 ;3753327 ;71492 ;0 ;;;;0 ; +;Japan;BCP;BCP 1050x40;[];1050 ;40 ;1050 ;40 ;;;140 ;;;;;1534 ;767 ;767 ;2520000 ;48100 ;;56900 ;41 ;2520000 ;48100 ;56900 ;41 ;4121204 ;78499 ;0 ;;;;0 ; +;Japan;BCP;BCP 1050x45;[];1050 ;45 ;1050 ;45 ;;;158 ;;;;;1705 ;853 ;853 ;2760000 ;52600 ;;62700 ;40 ;2760000 ;52600 ;62700 ;40 ;4567838 ;87006 ;0 ;;;;0 ; +;Japan;BCP;BCP 1050x50;[];1050 ;50 ;1050 ;50 ;;;175 ;;;;;1871 ;936 ;936 ;2990000 ;56900 ;;68300 ;40 ;2990000 ;56900 ;68300 ;40 ;5000000 ;95238 ;0 ;;;;0 ; +;Japan;BCP;BCP 1100x25;[];1100 ;25 ;1100 ;25 ;;;88 ;;;;;1043 ;522 ;522 ;1970000 ;35900 ;;41600 ;44 ;1970000 ;35900 ;41600 ;44 ;3105742 ;56468 ;0 ;;;;0 ; +;Japan;BCP;BCP 1100x28;[];1100 ;28 ;1100 ;28 ;;;98 ;;;;;1160 ;580 ;580 ;2180000 ;39600 ;;46100 ;43 ;2180000 ;39600 ;46100 ;43 ;3449391 ;62716 ;0 ;;;;0 ; +;Japan;BCP;BCP 1100x32;[];1100 ;32 ;1100 ;32 ;;;112 ;;;;;1314 ;657 ;657 ;2440000 ;44400 ;;51900 ;43 ;2440000 ;44400 ;51900 ;43 ;3898197 ;70876 ;0 ;;;;0 ; +;Japan;BCP;BCP 1100x36;[];1100 ;36 ;1100 ;36 ;;;126 ;;;;;1465 ;733 ;733 ;2690000 ;48900 ;;57500 ;43 ;2690000 ;48900 ;57500 ;43 ;4336381 ;78843 ;0 ;;;;0 ; +;Japan;BCP;BCP 1100x40;[];1100 ;40 ;1100 ;40 ;;;140 ;;;;;1614 ;807 ;807 ;2930000 ;53300 ;;62900 ;43 ;2930000 ;53300 ;62900 ;43 ;4764064 ;86619 ;0 ;;;;0 ; +;Japan;BCP;BCP 1100x45;[];1100 ;45 ;1100 ;45 ;;;158 ;;;;;1795 ;898 ;898 ;3210000 ;58400 ;;69400 ;42 ;3210000 ;58400 ;69400 ;42 ;5284086 ;96074 ;0 ;;;;0 ; +;Japan;BCP;BCP 1100x50;[];1100 ;50 ;1100 ;50 ;;;175 ;;;;;1971 ;986 ;986 ;3480000 ;63200 ;;75700 ;42 ;3480000 ;63200 ;75700 ;42 ;5788125 ;105239 ;0 ;;;;0 ; +;Japan;BCP;BCP 1150x25;[];1150 ;25 ;1150 ;25 ;;;88 ;;;;;1093 ;547 ;547 ;2270000 ;39400 ;;45600 ;46 ;2270000 ;39400 ;45600 ;46 ;3559570 ;61906 ;0 ;;;;0 ; +;Japan;BCP;BCP 1150x28;[];1150 ;28 ;1150 ;28 ;;;98 ;;;;;1216 ;608 ;608 ;2500000 ;43600 ;;50600 ;45 ;2500000 ;43600 ;50600 ;45 ;3954910 ;68781 ;0 ;;;;0 ; +;Japan;BCP;BCP 1150x32;[];1150 ;32 ;1150 ;32 ;;;112 ;;;;;1378 ;689 ;689 ;2810000 ;48900 ;;57000 ;45 ;2810000 ;48900 ;57000 ;45 ;4471728 ;77769 ;0 ;;;;0 ; +;Japan;BCP;BCP 1150x36;[];1150 ;36 ;1150 ;36 ;;;126 ;;;;;1537 ;769 ;769 ;3100000 ;53900 ;;63200 ;45 ;3100000 ;53900 ;63200 ;45 ;4976890 ;86555 ;0 ;;;;0 ; +;Japan;BCP;BCP 1150x40;[];1150 ;40 ;1150 ;40 ;;;140 ;;;;;1694 ;847 ;847 ;3380000 ;58800 ;;69200 ;45 ;3380000 ;58800 ;69200 ;45 ;5470524 ;95140 ;0 ;;;;0 ; +;Japan;BCP;BCP 1150x45;[];1150 ;45 ;1150 ;45 ;;;158 ;;;;;1885 ;943 ;943 ;3710000 ;64500 ;;76500 ;44 ;3710000 ;64500 ;76500 ;44 ;6071547 ;105592 ;0 ;;;;0 ; +;Japan;BCP;BCP 1150x50;[];1150 ;50 ;1150 ;50 ;;;175 ;;;;;2071 ;1036 ;1036 ;4020000 ;69900 ;;83400 ;44 ;4020000 ;69900 ;83400 ;44 ;6655000 ;115739 ;0 ;;;;0 ; +;Japan;BCP;BCP 1200x25;[];1200 ;25 ;1200 ;25 ;;;88 ;;;;;1143 ;572 ;572 ;2590000 ;43100 ;;49800 ;48 ;2590000 ;43100 ;49800 ;48 ;4055586 ;67593 ;0 ;;;;0 ; +;Japan;BCP;BCP 1200x28;[];1200 ;28 ;1200 ;28 ;;;98 ;;;;;1272 ;636 ;636 ;2860000 ;47700 ;;55300 ;47 ;2860000 ;47700 ;55300 ;47 ;4507553 ;75126 ;0 ;;;;0 ; +;Japan;BCP;BCP 1200x32;[];1200 ;32 ;1200 ;32 ;;;112 ;;;;;1442 ;721 ;721 ;3210000 ;53500 ;;62300 ;47 ;3210000 ;53500 ;62300 ;47 ;5098924 ;84982 ;0 ;;;;0 ; +;Japan;BCP;BCP 1200x36;[];1200 ;36 ;1200 ;36 ;;;126 ;;;;;1609 ;805 ;805 ;3550000 ;59100 ;;69200 ;47 ;3550000 ;59100 ;69200 ;47 ;5677556 ;94626 ;0 ;;;;0 ; +;Japan;BCP;BCP 1200x40;[];1200 ;40 ;1200 ;40 ;;;140 ;;;;;1774 ;887 ;887 ;3870000 ;64500 ;;75800 ;47 ;3870000 ;64500 ;75800 ;47 ;6243584 ;104060 ;0 ;;;;0 ; +;Japan;BCP;BCP 1200x45;[];1200 ;45 ;1200 ;45 ;;;158 ;;;;;1975 ;988 ;988 ;4250000 ;70900 ;;83800 ;46 ;4250000 ;70900 ;83800 ;46 ;6933595 ;115560 ;0 ;;;;0 ; +;Japan;BCP;BCP 1200x50;[];1200 ;50 ;1200 ;50 ;;;175 ;;;;;2171 ;1086 ;1086 ;4620000 ;76900 ;;91500 ;46 ;4620000 ;76900 ;91500 ;46 ;7604375 ;126740 ;0 ;;;;0 ; +;Japan;BCP;BCP 1250x25;[];1250 ;25 ;1250 ;25 ;;;88 ;;;;;1193 ;597 ;597 ;2940000 ;47000 ;;54300 ;50 ;2940000 ;47000 ;54300 ;50 ;4595664 ;73531 ;0 ;;;;0 ; +;Japan;BCP;BCP 1250x28;[];1250 ;28 ;1250 ;28 ;;;98 ;;;;;1328 ;664 ;664 ;3250000 ;52000 ;;60200 ;50 ;3250000 ;52000 ;60200 ;50 ;5109421 ;81751 ;0 ;;;;0 ; +;Japan;BCP;BCP 1250x32;[];1250 ;32 ;1250 ;32 ;;;112 ;;;;;1506 ;753 ;753 ;3650000 ;58400 ;;67900 ;49 ;3650000 ;58400 ;67900 ;49 ;5782183 ;92515 ;0 ;;;;0 ; +;Japan;BCP;BCP 1250x36;[];1250 ;36 ;1250 ;36 ;;;126 ;;;;;1681 ;841 ;841 ;4040000 ;64600 ;;75400 ;49 ;4040000 ;64600 ;75400 ;49 ;6441078 ;103057 ;0 ;;;;0 ; +;Japan;BCP;BCP 1250x40;[];1250 ;40 ;1250 ;40 ;;;140 ;;;;;1854 ;927 ;927 ;4410000 ;70500 ;;82700 ;49 ;4410000 ;70500 ;82700 ;49 ;7086244 ;113380 ;0 ;;;;0 ; +;Japan;BCP;BCP 1250x45;[];1250 ;45 ;1250 ;45 ;;;158 ;;;;;2065 ;1033 ;1033 ;4850000 ;77600 ;;91500 ;49 ;4850000 ;77600 ;91500 ;49 ;7873606 ;125978 ;0 ;;;;0 ; +;Japan;BCP;BCP 1250x50;[];1250 ;50 ;1250 ;50 ;;;175 ;;;;;2271 ;1136 ;1136 ;5270000 ;84300 ;;100000 ;48 ;5270000 ;84300 ;100000 ;48 ;8640000 ;138240 ;0 ;;;;0 ; +;Japan;BCP;BCP 1300x25;[];1300 ;25 ;1300 ;25 ;;;88 ;;;;;1243 ;622 ;622 ;3320000 ;51100 ;;58900 ;52 ;3320000 ;51100 ;58900 ;52 ;5181680 ;79718 ;0 ;;;;0 ; +;Japan;BCP;BCP 1300x28;[];1300 ;28 ;1300 ;28 ;;;98 ;;;;;1384 ;692 ;692 ;3670000 ;56500 ;;65300 ;52 ;3670000 ;56500 ;65300 ;52 ;5762612 ;88656 ;0 ;;;;0 ; +;Japan;BCP;BCP 1300x32;[];1300 ;32 ;1300 ;32 ;;;112 ;;;;;1570 ;785 ;785 ;4130000 ;63500 ;;73800 ;51 ;4130000 ;63500 ;73800 ;51 ;6523907 ;100368 ;0 ;;;;0 ; +;Japan;BCP;BCP 1300x36;[];1300 ;36 ;1300 ;36 ;;;126 ;;;;;1753 ;877 ;877 ;4570000 ;70300 ;;82000 ;51 ;4570000 ;70300 ;82000 ;51 ;7270156 ;111849 ;0 ;;;;0 ; +;Japan;BCP;BCP 1300x40;[];1300 ;40 ;1300 ;40 ;;;140 ;;;;;1934 ;967 ;967 ;4990000 ;76800 ;;89900 ;51 ;4990000 ;76800 ;89900 ;51 ;8001504 ;123100 ;0 ;;;;0 ; +;Japan;BCP;BCP 1300x45;[];1300 ;45 ;1300 ;45 ;;;158 ;;;;;2155 ;1078 ;1078 ;5500000 ;84600 ;;99600 ;51 ;5500000 ;84600 ;99600 ;51 ;8894954 ;136845 ;0 ;;;;0 ; +;Japan;BCP;BCP 1300x50;[];1300 ;50 ;1300 ;50 ;;;175 ;;;;;2371 ;1186 ;1186 ;5980000 ;91900 ;;109000 ;50 ;5980000 ;91900 ;109000 ;50 ;9765625 ;150240 ;0 ;;;;0 ; +;Japan;BCP;BCP 1350x25;[];1350 ;25 ;1350 ;25 ;;;88 ;;;;;1293 ;647 ;647 ;3730000 ;55300 ;;63700 ;54 ;3730000 ;55300 ;63700 ;54 ;5815508 ;86156 ;0 ;;;;0 ; +;Japan;BCP;BCP 1350x28;[];1350 ;28 ;1350 ;28 ;;;98 ;;;;;1440 ;720 ;720 ;4130000 ;61200 ;;70700 ;54 ;4130000 ;61200 ;70700 ;54 ;6469227 ;95840 ;0 ;;;;0 ; +;Japan;BCP;BCP 1350x32;[];1350 ;32 ;1350 ;32 ;;;112 ;;;;;1634 ;817 ;817 ;4650000 ;68800 ;;79800 ;53 ;4650000 ;68800 ;79800 ;53 ;7326494 ;108541 ;0 ;;;;0 ; +;Japan;BCP;BCP 1350x36;[];1350 ;36 ;1350 ;36 ;;;126 ;;;;;1825 ;913 ;913 ;5140000 ;76200 ;;88700 ;53 ;5140000 ;76200 ;88700 ;53 ;8167490 ;121000 ;0 ;;;;0 ; +;Japan;BCP;BCP 1350x40;[];1350 ;40 ;1350 ;40 ;;;140 ;;;;;2014 ;1007 ;1007 ;5620000 ;83300 ;;97400 ;53 ;5620000 ;83300 ;97400 ;53 ;8992364 ;133220 ;0 ;;;;0 ; +;Japan;BCP;BCP 1350x45;[];1350 ;45 ;1350 ;45 ;;;158 ;;;;;2245 ;1123 ;1123 ;6200000 ;91800 ;;108000 ;53 ;6200000 ;91800 ;108000 ;53 ;10001014 ;148163 ;0 ;;;;0 ; +;Japan;BCP;BCP 1350x50;[];1350 ;50 ;1350 ;50 ;;;175 ;;;;;2471 ;1236 ;1236 ;6750000 ;100000 ;;118000 ;52 ;6750000 ;100000 ;118000 ;52 ;10985000 ;162741 ;0 ;;;;0 ; +;Japan;BCP;BCP 1400x25;[];1400 ;25 ;1400 ;25 ;;;88 ;;;;;1343 ;672 ;672 ;4180000 ;59700 ;;68700 ;56 ;4180000 ;59700 ;68700 ;56 ;6499023 ;92843 ;0 ;;;;0 ; +;Japan;BCP;BCP 1400x28;[];1400 ;28 ;1400 ;28 ;;;98 ;;;;;1496 ;748 ;748 ;4620000 ;66100 ;;76200 ;56 ;4620000 ;66100 ;76200 ;56 ;7231366 ;103305 ;0 ;;;;0 ; +;Japan;BCP;BCP 1400x32;[];1400 ;32 ;1400 ;32 ;;;112 ;;;;;1698 ;849 ;849 ;5210000 ;74400 ;;86100 ;55 ;5210000 ;74400 ;86100 ;55 ;8192346 ;117034 ;0 ;;;;0 ; +;Japan;BCP;BCP 1400x36;[];1400 ;36 ;1400 ;36 ;;;126 ;;;;;1897 ;949 ;949 ;5770000 ;82400 ;;95800 ;55 ;5770000 ;82400 ;95800 ;55 ;9135780 ;130511 ;0 ;;;;0 ; +;Japan;BCP;BCP 1400x40;[];1400 ;40 ;1400 ;40 ;;;140 ;;;;;2094 ;1047 ;1047 ;6310000 ;90100 ;;105000 ;55 ;6310000 ;90100 ;105000 ;55 ;10061824 ;143740 ;0 ;;;;0 ; +;Japan;BCP;BCP 1400x45;[];1400 ;45 ;1400 ;45 ;;;158 ;;;;;2335 ;1168 ;1168 ;6960000 ;99400 ;;117000 ;55 ;6960000 ;99400 ;117000 ;55 ;11195162 ;159931 ;0 ;;;;0 ; +;Japan;BCP;BCP 1400x50;[];1400 ;50 ;1400 ;50 ;;;175 ;;;;;2571 ;1286 ;1286 ;7580000 ;108000 ;;128000 ;54 ;7580000 ;108000 ;128000 ;54 ;12301875 ;175741 ;0 ;;;;0 ; \ No newline at end of file diff --git a/Samples/RC_sample.stb b/Samples/RC_sample.stb deleted file mode 100644 index 69ad9327..00000000 --- a/Samples/RC_sample.stb +++ /dev/null @@ -1,1495 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Samples/SampleBuilding.stb b/Samples/SampleBuilding.stb new file mode 100644 index 00000000..c62fff51 --- /dev/null +++ b/Samples/SampleBuilding.stb @@ -0,0 +1,1265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Samples/ShowStbModel.gh b/Samples/ShowStbModel.gh index 02bedb2b..69ca8cdf 100644 Binary files a/Samples/ShowStbModel.gh and b/Samples/ShowStbModel.gh differ diff --git a/website/docs/Changelog.md b/website/docs/Changelog.md new file mode 100644 index 00000000..49b97b27 --- /dev/null +++ b/website/docs/Changelog.md @@ -0,0 +1,63 @@ +--- +id: Changelog +title: Changelog +--- + +--- + +## [v1.3.1 - 2021-03-28](https://github.com/hrntsm/HoaryFox/releases/tag/v1.3.1) + +### 追加 + +- Brep と Line を Rhino へ情報を持った形で Bake できるようにした。 + +### 変更 + +- Stb2Brep コンポーネントで出力される Brep を部材ごとに Closed Brep になるようにした。 + +--- + +## [v1.2.2 - 2021-02-17](https://github.com/hrntsm/HoaryFox/releases/tag/v1.2.2) + +### 追加 + +- 本ドキュメントサイトの公開 +- SetCroSecFamilyName コンポーネントによって、Karamba3D への変換で断面の Family 名を指定できるようにした + +### 修正 + +- ST-Bridge から Karamba3D への変換で、材料の単位が間違っていたものを修正 + +### 変更 + +- ST-Bridge から Karamba3D への変換で、RC の断面名を「Id + 数字」から、「BD- や CD- + 断面サイズ」の表現とした + - 例えば BD-300x600 のような形式 +- FrameBuilder コンポーネントを FrameBuilder by angle コンポーネントと NodeBuilder コンポーネントに分けた + - もともとは 45 度で柱と梁を区別していたが、この変更により入力した角度で区別するようにした + - それに伴い、Rhino のビューポート状に柱、梁、ブレースのどの区分になっているかテキストで表示するようにした + +--- + +## [v1.2.1 - 2020-12-31](https://github.com/hrntsm/HoaryFox/releases/tag/v1.2.1) + +### 修正 + +- Karamba3D へ変換するコンポーネントがうまく動かなかったため、内部での Karamba3D への参照パスを変更し動作するようにした + +--- + +## [v1.2.0 - 2020-12-30](https://github.com/hrntsm/HoaryFox/releases/tag/v1.2.0) + +### 追加 + +- ST-Bridge への書き出しが可能になった + +### その他 + +- ST-Bridge を扱う部分を [STBDotNet](https://github.com/hrntsm/STBDotNet/tree/main) として分離したライブラリにし、保守性をあげた + +--- + +## [v0.9.0 - v1.1.3](https://github.com/hrntsm/HoaryFox/releases) + +上記バージョンは GitHub のリリースページを確認してください。 diff --git a/website/docs/Component/Geometry.md b/website/docs/Component/Geometry.md index 6a16e872..435856be 100644 --- a/website/docs/Component/Geometry.md +++ b/website/docs/Component/Geometry.md @@ -3,7 +3,7 @@ id: Geometry title: Geometry --- -読み込んだ STB データから部材を可視化、Bake するコンポーネントのカテゴリ +読み込んだ ST-Bridge データから部材を可視化、Bake するコンポーネントのカテゴリ --- @@ -21,11 +21,11 @@ title: Geometry |出力|説明| |---|:---:| |Nodes| 節点の Point3d のリストを出力| -|Columns| 柱の Line のリストを出力| -|Girders| 大梁の Line のリストを出力| -|Posts| 間柱の Line のリストを出力| -|Beams| 小梁の Line のリストを出力| -|Braces| ブレースの Line のリストを出力| +|Columns| 柱の Line のツリーを出力| +|Girders| 大梁の Line のツリーを出力| +|Posts| 間柱の Line のツリーを出力| +|Beams| 小梁の Line のツリーを出力| +|Braces| ブレースの Line のツリーを出力| --- @@ -42,15 +42,33 @@ title: Geometry |出力|説明| |---|:---:| -|Columns| 柱形状を表す Brep のリストを出力| -|Girders| 大梁形状を表す Brep のリストを出力| -|Posts| 間柱形状を表す Brep のリストを出力| -|Beams| 小梁形状を表す Brep のリストを出力| -|Braces| ブレース形状を表す Brep のリストを出力| -|Slabs| スラブ形状を表す Brep のリストを出力| -|Walls| 壁形状を表す Brep のリストを出力| +|Columns| 柱形状を表す Brep のツリーを出力| +|Girders| 大梁形状を表す Brep のツリーを出力| +|Posts| 間柱形状を表す Brep のツリーを出力| +|Beams| 小梁形状を表す Brep のツリーを出力| +|Braces| ブレース形状を表す Brep のツリーを出力| +|Slabs| スラブ形状を表す Brep のツリーを出力| +|Walls| 壁形状を表す Brep のツリーを出力| ### 表示仕様 -- 壁は開口を含めて出力します -- スラブは凹形状の場合うまく出力されないことがあります +- 床、壁の開口は反映されません。 +- 平面でないスラブでは近似した面を張るため処理が重い場合があります。 + +--- + +## Axis + +![](../../images/Component/Axis.png) + +階と軸をラインで表示する + +|入力|説明| +|---|:---:| +|Data|Load STB file コンポーネントの Data 出力を入力| +|Factor|軸線の長さの比率| +|Size|軸名、階名の文字のサイズ。デフォルトは 12| + +|出力|説明| +|---|:---:| +|Axis| 軸と階を示す Line の出力| \ No newline at end of file diff --git a/website/docs/Component/IO.md b/website/docs/Component/IO.md index 9d94de0d..031c96e5 100644 --- a/website/docs/Component/IO.md +++ b/website/docs/Component/IO.md @@ -11,7 +11,7 @@ title: IO ![](../../images/Component/LoadStbFile.png) -STB データの読み込み +ST-Bridge データの読み込み |入力|説明| |---|:---:| @@ -27,7 +27,7 @@ STB データの読み込み ![](../../images/Component/ExportStbFile.png) -STB データの書き出し +ST-Bridge データの書き出し |入力|説明| |---|:---:| @@ -36,27 +36,29 @@ STB データの書き出し |Story|階情報, StoryBuilder コンポーネントの Story 出力を入力| |Member|部材情報, FrameBuilder コンポーネントの Member 出力を入力| |Section|断面情報, FrameBuilder コンポーネントの Section 出力を入力| -|Path|作成した ST-Bridge データの出力先を指定。デフォルト値はデスクトップです| +|Path|作成した ST-Bridge データの出力先を指定。デフォルト値はデスクトップ| |Out?|出力を行うかのブール値。True にすると出力します| |出力|説明| |---|:---:| |Stb|作成した ST-Bridge データ| -こちらのコンポーネントの細かいの使い方・変換仕様は、Usage の [Export ST-Bridge file](../Usage/ExportSTB) の記事も参照してください。 +:::important +細かいの使い方・変換仕様は、Usage の [Export ST-Bridge file](../Usage/ExportSTB) の記事も参照してください。 +::: --- -## Convert to karamba +## Convert to karamba3D ![](../../images/Component/ConvertToKaramba.png) -読み込んだ STB データを 構造解析を行うコンポーネント [Karamba3D](https://www.karamba3d.com/) のデータに変換 +読み込んだ ST-Bridge データを 構造解析を行うコンポーネントの [Karamba3D](https://www.karamba3d.com/) のデータに変換 |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|FamilyName|断面のファミリー名の指定。入力しない場合、SetCroSecFamilyName コンポーネントのデフォルト値が入る| +|FamilyName|断面のファミリー名の指定。
入力しない場合、SetCroSecFamilyName コンポーネントのデフォルト値が入る| |出力|説明| |---|:---:| @@ -86,4 +88,6 @@ Karamba3D 内の断面につけるファミリー名の設定を行うコンポ |---|:---:| |FamilyName|Karamba3D での断面のファミリー名の設定| -こちらのコンポーネントの細かいの使い方・変換仕様は、Usage の [Convert to Karamba3D](../Usage/ConvertToKaramba) の記事も参照してください。 \ No newline at end of file +:::important +細かいの使い方・変換仕様は、Usage の [Convert to Karamba3D](../Usage/ConvertToKaramba) の記事も参照してください。 +::: diff --git a/website/docs/Component/NameTag.md b/website/docs/Component/NameTag.md index 9ced2d4f..904ba56d 100644 --- a/website/docs/Component/NameTag.md +++ b/website/docs/Component/NameTag.md @@ -16,11 +16,11 @@ title: NameTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12| |出力|説明| |---|:---:| -|NameTag|符号のリスト| +|NameTag|符号のツリー| --- @@ -33,11 +33,11 @@ title: NameTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|NameTag|符号のリスト| +|NameTag|符号のツリー| --- @@ -50,11 +50,11 @@ title: NameTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|NameTag|符号のリスト| +|NameTag|符号のツリー| --- @@ -67,11 +67,11 @@ title: NameTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|NameTag|符号のリスト| +|NameTag|符号のツリー| --- @@ -84,8 +84,42 @@ title: NameTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|NameTag|符号のリスト| +|NameTag|符号のツリー| + +--- + +## Slab Name Tag + +![](../../images/Component/SlabNameTag.png) + +ブレースの部材符号表示 + +|入力|説明| +|---|:---:| +|Data|Load STB file コンポーネントの Data 出力を入力| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| + +|出力|説明| +|---|:---:| +|NameTag|符号のツリー| + +--- + +## Wall Name Tag + +![](../../images/Component/WallNameTag.png) + +ブレースの部材符号表示 + +|入力|説明| +|---|:---:| +|Data|Load STB file コンポーネントの Data 出力を入力| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| + +|出力|説明| +|---|:---:| +|NameTag|符号のツリー| diff --git a/website/docs/Component/SectionTag.md b/website/docs/Component/SectionTag.md index 8f221dd5..c007e444 100644 --- a/website/docs/Component/SectionTag.md +++ b/website/docs/Component/SectionTag.md @@ -16,11 +16,11 @@ title: SectionTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|SecTag|符号のリスト| +|SecTag|符号のツリー| --- @@ -33,11 +33,11 @@ title: SectionTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|SecTag|符号のリスト| +|SecTag|符号のツリー| --- @@ -50,11 +50,11 @@ title: SectionTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|SecTag|符号のリスト| +|SecTag|符号のツリー| --- @@ -67,11 +67,11 @@ title: SectionTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|SecTag|符号のリスト| +|SecTag|符号のツリー| --- @@ -84,8 +84,42 @@ title: SectionTag |入力|説明| |---|:---:| |Data|Load STB file コンポーネントの Data 出力を入力| -|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは12です| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| |出力|説明| |---|:---:| -|SecTag|符号のリスト| +|SecTag|符号のツリー| + +--- + +## Slab Section Tag + +![](../../images/Component/SlabSectionTag.png) + +ブレースの断面情報表示 + +|入力|説明| +|---|:---:| +|Data|Load STB file コンポーネントの Data 出力を入力| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| + +|出力|説明| +|---|:---:| +|SecTag|符号のツリー| + +--- + +## Wall Section Tag + +![](../../images/Component/WallSectionTag.png) + +ブレースの断面情報表示 + +|入力|説明| +|---|:---:| +|Data|Load STB file コンポーネントの Data 出力を入力| +|Size|Rhino のビューポートに表示する文字サイズ。デフォルトは 12| + +|出力|説明| +|---|:---:| +|SecTag|符号のツリー| diff --git a/website/docs/Component/StbBuilder.md b/website/docs/Component/StbBuilder.md index 435133f0..c8aa5734 100644 --- a/website/docs/Component/StbBuilder.md +++ b/website/docs/Component/StbBuilder.md @@ -3,10 +3,10 @@ id: StbBuilder title: StbBuilder --- -STB 書き出しのための情報を作成するコンポーネントのカテゴリ +ST-Bridge 書き出しのための情報を作成するコンポーネントのカテゴリ :::note -このコンポーネントの使用方法や注意点は [Export ST-Bridge file](../Usage/ExportSTB) にも詳しく書いていますので、そちらも参照してください。 +使用方法や注意点は [Export ST-Bridge file](../Usage/ExportSTB) にも詳しく書いていますので、そちらも参照してください。 ::: --- @@ -58,7 +58,7 @@ STB 書き出しのための情報を作成するコンポーネントのカテ |Distance|原点からの軸の距離（mm）| |Range|軸の幅（mm）| |Name|軸の名前| -|Direcrion|軸の方向| +|Direction|軸の方向| |出力|説明| |---|:---:| diff --git a/website/docs/License.md b/website/docs/License.md new file mode 100644 index 00000000..fba2705d --- /dev/null +++ b/website/docs/License.md @@ -0,0 +1,22 @@ +--- +id: License +title: License +--- + +HoaryFox は MIT ライセンスで公開しています。 +正式なライセンスの内容は [ライセンスページ](https://github.com/hrntsm/HoaryFox/blob/main/LICENSE) をご確認ください。 + +以下にライセンスの日本語訳を示しますが、あくまで参考であり、正式なライセンスは上記リンク先にある内容となります。 + +--- + +Copyright (c) 2019 hrntsm + +以下に定める条件に従い、本ソフトウェアおよび関連文書のファイル（以下「ソフトウェア」）の複製を取得するすべての人に対し、ソフトウェアを無制限に扱うことを無償で許可します。 +これには、ソフトウェアの複製を使用、複写、変更、結合、掲載、頒布、サブライセンス、および/または販売する権利、およびソフトウェアを提供する相手に同じことを許可する権利も無制限に含まれます。 + +上記の著作権表示および本許諾表示を、ソフトウェアのすべての複製または重要な部分に記載するものとします。 + +ソフトウェアは「現状のまま」で、明示であるか暗黙であるかを問わず、何らの保証もなく提供されます。 +ここでいう保証とは、商品性、特定の目的への適合性、および権利非侵害についての保証も含みますが、それに限定されるものではありません。 +作者または著作権者は、契約行為、不法行為、またはそれ以外であろうと、ソフトウェアに起因または関連し、あるいはソフトウェアの使用またはその他の扱いによって生じる一切の請求、損害、その他の義務について何らの責任も負わないものとします。 diff --git a/website/docs/Usage/BakeGeometry.md b/website/docs/Usage/BakeGeometry.md index 266e30b5..3a0355cb 100644 --- a/website/docs/Usage/BakeGeometry.md +++ b/website/docs/Usage/BakeGeometry.md @@ -3,9 +3,10 @@ id: BakeGeometry title: Bake Geometry --- -STB のモデルを Grasshopper に読み込んで、Rhino へ Bake する方法について説明します。こちらの内容は Samples フォルダーの ShowStbModel.gh のモデルを参照してください。 +ST-Bridge のモデルを Grasshopper に読み込んで、Rhino へ Bake する方法について説明します。 +こちらの内容は Samples フォルダーの ShowStbModel.gh のモデルを参照してください。 -## STB ファイルを読み込み +## ST-Bridge ファイルを読み込み ファイルを開くと以下のようになっているため、path コンポーネントを右クリックし Select one existing file を選択し可視化したいstbファイルを選択してください。 読み込みにエラーがない場合、その隣にある Load STB data コンポーネントでデータの変換が行われます。この出力を各可視化コンポーネントにつなぐことで Rhino のビューポート上に情報が可視化されます。 @@ -19,6 +20,8 @@ Bake の入力に Button などを使用して True を入力すると Rhino へ レイヤーは、Column、Girder、Post、Beam、Brace、Slab、Wall にわかれ、その中でさらに部材符号ごとのサブレイヤーに分かれます。 -Bake されたジオメトリには、メタ情報を追加しています。ジオメトリを選択し、Properties の Attribure User Text を確認すると、断面サイズなどの値を確認することができるような BIM 的な機能になっています。 +Bake されたジオメトリには、メタ情報を追加しています。 +ジオメトリを選択し、Properties の Attribute User Text を確認すると、断面サイズなどの値を確認することができるような BIM 的な機能になっています。 +なお、Rhino 側で UserText を編集してもモデルを Grasshopper 側へ反映することはできません。 ![](../../images/BakeGeometry/Bake.png) diff --git a/website/docs/Usage/ConvertToKaramba.md b/website/docs/Usage/ConvertToKaramba.md index 402a9b36..1487fd0d 100644 --- a/website/docs/Usage/ConvertToKaramba.md +++ b/website/docs/Usage/ConvertToKaramba.md @@ -3,19 +3,18 @@ id: ConvertToKaramba title: Convert to Karamba3D --- -STB のデータを使って Karamba3D のモデルを作成する方法を説明します。こちらの内容は Samples フォルダーの Convert_to_Karamba.gh のモデルを参照してください。 +ST-Bridge のデータを使って Karamba3D のモデルを作成する方法を説明します。こちらの内容は Samples フォルダーの Convert_to_Karamba.gh のモデルを参照してください。 ## データの変換 -[Show ST-Bridge model](./ShowSTBModel) で説明したように STB のデータを Grasshopper で読み込めるようにしてください。 -読み込んだ結果を以下のように Convert to Karamba コンポーネントに入力することでデータの変換が行われます。 +[Show ST-Bridge model](./ShowSTBModel) で説明したように ST-Bridge のデータを Load STB File コンポーネントで読み込んでください。 +読み込んだ結果を以下のように Convert to Karamba コンポーネントに入力することでデータの変換が行われます。 -要素と断面が変換対象です。変換したものはそのまま Karamba の Assmeble Model(Karamba3D) コンポーネントの入力にすることができるため、後は Load と Support の設定を行うだけで Karamba で解析が実行可能です。 -材料(Material) の情報は CrossSection の出力に含まれているため、別途設定する必要はありません。 +要素と断面が変換対象です。変換したものはそのまま Karamba3D の Assemble Model(Karamba3D) コンポーネントの入力にすることができるため、後は Load と Support の設定を行うだけで Karamba3D で解析が実行可能です。 +材料 (Material) の情報は CrossSection の出力に含まれているため、別途設定する必要はありません。 断面のファミリー名は以下のように形状ごとに SetFamilyName コンポーネントで任意に設定できます。設定しない場合は "HF-Box" のように "HF-" から始まるファミリー名になります。 - ![](../../images/ConvertToKaramba/gh.png) ## 変換の仕様 @@ -28,7 +27,7 @@ STB のデータを使って Karamba3D のモデルを作成する方法を説 ### 部材名称 -- 簡便のために、STB で持っているIDを名前として変換しています。(例 "Id15" のような名前) +- 簡便のために、STB で持っている ID を名前として変換しています。(例 "Id15" のような名前) - そのため、部材符号は失われます。 ### 断面形状 @@ -44,27 +43,34 @@ STB のデータを使って Karamba3D のモデルを作成する方法を説 - T 断面: I-Section として変換 - フラットバー: Trapezoid として変換 - 箱型断面: []-Section として変換 - - L 断面, C断面, 丸鋼: Karamba3D に対応断面がないこと、かつ基本的にはブレースとして仕様される部材と思われるので、軸断面積を合わせる形で正方形の Trapezoid として変換 - - 背中合わせや2丁づかいには対応していないため、STB 上でそのように設定されていても単独の断面として変換されます。 + - L 断面, C 断面, 丸鋼: Karamba3D に対応断面がないこと、かつ基本的にはブレースとして仕様される部材と思われるので、軸断面積を合わせる形で正方形の Trapezoid として変換 + - 背中合わせや 2 丁づかいには対応していないため、STB 上でそのように設定されていても単独の断面として変換されます。 ### 材料 -- RC - - 断面(StbSections) の設定で StbSecColumn_RC, および StbSecBeam_RC で出力されているものを RC として変換しています。 - - 材料は STB で指定可能ですが、材料名の文字列であり、特定の形式で記述されているかわけではないためすべて FC21 相当の材料特性を持つものとしています。 - - ヤング率: 21860 N/mm2 - - ポアソン比: 0.2 - - 密度: 24 kN/m3 - - Karamba の fy: 14 N/mm2 -- S + +- 鉄筋コンクリート部材 + - 断面(StbSections) の設定で StbSecColumn_RC、StbSecColumn_SRC、StbSecBeam_RC および StbSecBeam_SRC で出力されているものを RC として変換しています。 + - 材料は ST-Bridge 内で指定されたものを設定します。ただし、材料名の文字列でありヤング率などの値が直接指定されているわけではないため以下の条件の下で変換しています。 + - 対応している材料名 : Fc18, Fc21, Fc24, Fc27, Fc30, Fc33, Fc36, Fc40, Fc42, Fc45, Fc50, Fc55, Fc60 + - これに該当しない場合、または変換に失敗した場合は Fc21 をとして材料が割り当てられます。 + - 日本建築学会の RC 規準の式により値を計算します。 + - Fc21 での変換結果は以下になります。 + - ヤング率: 21860 N/mm2 + - ポアソン比: 0.2 + - 密度: 24 kN/m3 + - fy: 14 N/mm2 +- 鉄骨部材 - 上記以外の断面に対して、鉄の材料を与えています。 - - RC の材料指定と同じ理由で、すべて SN400 相当の材料特性を持つものとしています。 + - RC とは異なり材質によって fy を除き値が変わらないため、すべて SN400 相当の材料特性を持つものとしています。 - ヤング率: 205000 N/mm2 - ポアソン比: 0.3 - 密度: 78.5 kN/m3 - - Karamba の fy: 235 N/mm2 + - fy: 235 N/mm2 +- 木部材 + - ST-Bridge が木に非対応なため本機能では扱いません。 :::note 非対応機能も要望があれば適宜対応しますので、Contact よりご連絡ください。 -::: \ No newline at end of file +::: diff --git a/website/docs/Usage/ExportSTB.md b/website/docs/Usage/ExportSTB.md index 06f60a2e..656d4309 100644 --- a/website/docs/Usage/ExportSTB.md +++ b/website/docs/Usage/ExportSTB.md @@ -4,16 +4,17 @@ title: Export ST-Bridge file --- Karamba3D のデータから ST-Bridge のデータを作成する方法を説明します。こちらの内容は Samples フォルダーの ExportSTB.gh のモデルを参照してください。 -ST-Bridge の version 1.4 の形式で出力を行います。 +ST-Bridge の version 2.0.3 の形式で出力を行います。 ## Karamba3D モデルの変換 Karamba3D で作成したモデルから以下を作成します。 + - 節点（StbNodes） - 部材情報（StbMembers） - 断面情報（StbSections） -以下のように Karamba3D の AssmebleModel コンポーネントなどから出力される Model のデータを FrameBuilder by angle コンポーネントと NodeBuilder に入力することでデータを変換します。 +以下のように Karamba3D の AssembleModel コンポーネントなどから出力される Model のデータを FrameBuilder by angle コンポーネントと NodeBuilder に入力することでデータを変換します。 変換された部材が、柱・梁・ブレースのどれに変換されたかがテキストで Rhino のビューポートに表示されます。柱と梁は部材の角度で分類しているため、想定の区分でなかった場合は Angle の入力に適切な角度を入力してください。 ![](../../images/ExportStb/FrameBuilder.png) @@ -26,9 +27,10 @@ Karamba3D からの出力に際して、モデル化の注意点については AxisBuilder コンポーネントで軸（StbAxes）のデータを作成します。 基本的な挙動の考えとしては、Distance で指定した軸から Range の幅（Dist ± Range）にある節点を軸に属する節点として処理します。 -コンポーネントの出力を見ることで、軸の方向、原点からの距離、所属節点数の確認をすることができます。 -入力の仕様は以下です。わかりづらいので今後改良予定です。リストで入力し、同一のインデックスでの入力をマッチさせて変換します。 +入力の仕様は以下です。 +リストで入力し、同一のインデックスでの入力をマッチさせて変換します。 + - Node: 節点情報です。NodeBuilder の出力の Node を入れてください - Distance: 原点からの軸の距離を指定してください。 - 軸の方向は全体座標系での X 軸または Y 軸に平行になります。 @@ -45,7 +47,6 @@ AxisBuilder コンポーネントで軸（StbAxes）のデータを作成しま StoryBuilder コンポーネントで階（StbStories）のデータを作成します。 基本的な挙動は AxisBuilder コンポーネントと同様です。 -コンポーネントの出力を見ることで、階名、階高、所属節点数の確認をすることができます。 - Node: 節点情報です。NodeBuilder の出力の Node を入れてください。 - Height: 階高の情報です。原点からの高さを入力してください。 @@ -56,25 +57,36 @@ StoryBuilder コンポーネントで階（StbStories）のデータを作成し ## データの出力 -上記の3つで変換したデータを全て Export STB file コンポーネントに入力することでデータをまとめて1つの ST-Bridge ファイルを作成します。 -Path で指定したパスに STB ファイルを出力します。指定しない場合、デスクトップに model.stb というファイルで出力されます。 -Out? の値を True にするとファイルが出力されます。出力を確認することでデータの変換状況の概略を確認することができます。 +上記の 3 つで変換したデータを全て Export STB file コンポーネントに入力することでデータをまとめて 1 つの ST-Bridge ファイルを作成します。 +Path で指定したパスに ST-Bridge ファイルを出力します。指定しない場合、デスクトップに model.stb というファイルで出力されます。 +Out? の値を True にするとファイルが出力されます。 ![](../../images/ExportStb/ExportStbfile.png) --- +## Karamba3D を使った構造最適化を行ったモデルの出力 + +本機能を使った Karamba3D との連携の参考に Samples のフォルダに以下のようなオフィスビルの構造最適化を行い、その結果を ST-Bridge で出力するデータ ExportOptimizedOfficeBuilding2STB.gh を入れています。 +このデータで最適化した建物の ST-Bridge データは SampleBuilding.stb として Samples のフォルダに含まれています。 + +最適化は Karamba3D のフル版の機能を使用するため、フリー版、トライアル版では試すことはできません。 + +![](../../images/ExportStb/OptimizedModel2STB.png) + +--- + ## 変換の仕様 -以下の仕様により ST-Brige データの作成を行います。 +以下の仕様により ST-Bridge データの作成を行います。 ### 対象 -- ST-Bridge version 1.4 の形式で出力します。 +- ST-Bridge version 2.0.3 の形式で出力します。 - 柱、梁、ブレースを変換し、床壁のような面材は変換しません :::note -ST-Bridge version 2 の形式での出力には今後対応予定です。 +ST-Bridge v2.0.3 の計算編の出力には非対応です。 ::: ### 部材の判別 @@ -83,11 +95,11 @@ ST-Bridge version 2 の形式での出力には今後対応予定です。 - Karamba3D でトラス要素として扱っているものはブレースとして変換 - 全体座標系の Z 軸に対しての FrameBuilder の Angle に入力された部材の角度未満である部材は柱、それ以上の場合は梁として変換 - 部材の判別は ST-Bridge における StbMember 内での各表現に対応します（例えば StbColumn など） -- STB の梁部材には、部材が基礎部材かのフラグ（isFoundation）があるが全て False で出力します +- ST-Bridge の梁部材には、部材が基礎部材かのフラグ（isFoundation）があるが全て False で出力します ### 材質の判別 -- Karamba3D の 材料を作成する際に設定する Family の名前が "Steel" の場合は S 部材、"Concrete" の場合は RC 部材とします +- Karamba3D の 材料を作成する際に設定する Family の名前が "Steel" の場合は鉄骨部材、"Concrete" の場合は 鉄筋コンクリート部材とします - 材質の判別は ST-Bridge における StbSections 内での各表現に対応します（例えば StbSecColumn_RC など） :::important @@ -104,19 +116,17 @@ ST-Bridge version 2 の形式での出力には今後対応予定です。 - Karamba3D の Cross Section コンポーネントの Name で設定した名称で断面を作成します :::important -Name の設定ごとに STB ファイルに出力しているため、必ず Name を設定するようにしてください -Name が重複している場合、HoaryFox のコンバーターでは同一断面として処理するため、1つの断面しか出力されません。 +Name の設定ごとに ST-Bridge ファイルに出力しているため、必ず Name を設定するようにしてください +Name が重複している場合、HoaryFox のコンバーターでは同一断面として処理するため、1 つの断面しか出力されません。 ::: ### 断面形状 -- Karamba3D で設定した断面の形状に合わせてSTBに出力します -- 変換にエラーがある時は、10mmの角材として出力します -- RC 断面は Karamba3D では配筋情報を持たないため以下で出力します - - 主筋: 梁ならば 上端も下端も 3-D22、柱ならば 8-D22 - - せん断補強筋: 2-D10@100 -- S 断面の場合、材質は フランジ、ウェブともに SN400 として出力します +- Karamba3D で設定した断面の形状に合わせて ST-Bridge に出力します +- 変換にエラーがある時は、10mm の角材として出力します +- RC 断面は Karamba3D では配筋情報を持たないため鉄筋情報はありません。 +- S 断面の場合、材質はフランジ、ウェブともに SN400 として出力します :::note 非対応機能も要望があれば適宜対応しますので、Contact よりご連絡ください。 -::: \ No newline at end of file +::: diff --git a/website/docs/Usage/HowToInstall.md b/website/docs/Usage/HowToInstall.md index 73257341..148529a5 100644 --- a/website/docs/Usage/HowToInstall.md +++ b/website/docs/Usage/HowToInstall.md @@ -8,14 +8,37 @@ title: How to install HoaryFox のインストール方法について紹介します。 1. Food4Rhino の [HoaryFox](https://www.food4rhino.com/app/hoaryfox) のサイトからファイルをダウンロード + - HoaryFox のバージョン 2 以降は ST-Bridge のバージョン 2 のみの対応となります。 + - ST-Bridge のバージョン 1 のデータを扱う場合は HoaryFox のバージョン 1.3 を使用してください。 1. ダウンロードした zip ファイルを右クリックしプロパティから全般のタブの中にあるセキュリティの項目を「許可する」にし、zip を解凍する 1. Grasshopper を起動して File > Special Folders > Components folder を選択することで表示されるフォルダに、1. でダウンロードしたファイルの中にある 「HoaryFox」 という名前のフォルダを入れる 1. Rhino を再起動する +## 動作環境 + +対応OS +- Windows +- Mac + - Apple silicon での動作は未確認 + - Karamba3D 連携については、Mac 版の Karamba3D がないため動きません + +対応バージョン +- Rhino6 +- Rhino7 + ## Karamba3D との連携 -Karamba3D との連携機能を使う場合は Karamba.gha を管理者権限のないフォルダに移動してください。Karamba3D のフォルダは通常 Program flies > Rhino > Plug-ins にあります。 +Karamba3D との連携機能を使う場合は Karamba.gha と同じフォルダに HoaryFox のフォルダを移動してください。 +Karamba.gha はデフォルトでは C:\Program Files\Rhino xx\Plugins\Karamba にあります。 :::note 連携が必要ない場合は、HoaryFoxのフォルダ内にある karambaConnect.gha ファイルを削除するとコンポーネントの読み込みエラーを回避できます。 -::: \ No newline at end of file +::: + +## 各ソフトとの連携の概要 + +HoaryFox は下図のように ST-Bridge を介して Rhinoceros/Grasshopper/Karamba3D と BIM ソフト、一貫構造計算との連携を行うことができます。 + +詳細は各コンポーネントの紹介ページを参照してください。 + +![](../../images/HowToInstall/relation.png) \ No newline at end of file diff --git a/website/docs/Usage/ShowSTBModel.md b/website/docs/Usage/ShowSTBModel.md index 925784ca..c22ec011 100644 --- a/website/docs/Usage/ShowSTBModel.md +++ b/website/docs/Usage/ShowSTBModel.md @@ -7,7 +7,7 @@ STB のモデルを Grasshopper に読み込んで表示する方法について ## STB ファイルを読み込み -ファイルを開くと以下のようになっているため、path コンポーネントを右クリックし Select one existing file を選択し可視化したいstbファイルを選択してください。 +ファイルを開くと以下のようになっているため、path コンポーネントを右クリックし Select one existing file を選択し可視化したい stb ファイルを選択してください。 読み込みにエラーがない場合、その隣にある Load STB data コンポーネントでデータの変換が行われます。この出力を各可視化コンポーネントにつなぐことで Rhino のビューポート上に情報が可視化されます。 ![](../../images/ShowStbModel/input.png) @@ -17,15 +17,20 @@ STB のモデルを Grasshopper に読み込んで表示する方法について ### 部材の表示 [Geometry](../Component/Geometry) のカテゴリのコンポーネントを使用します。 -躯体のデータをラインで表示したい場合は **"Stb to Line"** コンポーネント、大きさを含めて Brep で表現したい場合は **"Stb to Brep"** コンポーネントを使用してください。 +躯体のデータをラインで表示したい場合は **"Stb to Line"** コンポーネント、大きさを含めて Brep で表現したい場合は **"Stb to Brep"** コンポーネントを使用してください。 +これらのコンポーネントの Bake 機能を使用することで、ST-Bridge の情報を UserText として持った状態で部材ごとにレイヤー分けされて Rhino に Bake することができます。 +階、軸の表示をしたい場合は **"Axis"** コンポーネントを使用してください。 ### 部材符号の表示 [NameTag](../Component/NameTag) のカテゴリのコンポーネントを使用します。 -柱、間柱、大梁、小梁、ブレースそれぞれに可視化コンポーネントを用意しているので、可視化したいもののコンポーネントに対して、Load STB data コンポーネントの出力をつなげてください。符号のサイズは Size の入力で変更できます。 +柱、間柱、大梁、小梁、ブレースそれぞれに可視化コンポーネントを用意しているので、可視化したいもののコンポーネントに対して、Load STB data コンポーネントの出力をつなげてください。 +符号のサイズは Size の入力で変更できます。 +部材の断面名をテキストとしてビューポート上に表示します。 ### 断面情報の表示 [SectionTag](../Component/SectionTag) のカテゴリのコンポーネントを使用します。 -柱、間柱、大梁、小梁、ブレースそれぞれに可視化コンポーネントを用意しているので、可視化したいもののコンポーネントに対して、Load STB data コンポーネントの出力をつなげてください。符号のサイズは Size の入力で変更できます。 +柱、間柱、大梁、小梁、ブレース、床、壁それぞれに可視化コンポーネントを用意しているので、可視化したいもののコンポーネントに対して、Load STB data コンポーネントの出力をつなげてください。 +符号のサイズは Size の入力で変更できます。 部材の断面サイズをテキストとしてビューポート上に出力します。 diff --git a/website/docs/contact.md b/website/docs/contact.md index 3c50d8f8..8fb9fcac 100644 --- a/website/docs/contact.md +++ b/website/docs/contact.md @@ -5,11 +5,14 @@ title: contact お気軽にお問い合わせください。 -## Mail - -contact(a)hrntsm.com　(a) を @ に変えてください。 - ## Discussions -簡単な質問、要望などは以下のディスカッションサイトの利用もどうぞ +質問、要望などは以下のディスカッションサイトの確認、利用をお願いします。 https://github.com/hrntsm/HoaryFox/discussions + +## Mail + +メールによる問い合わせも対応していますが、 +公開可能なものは、情報の蓄積のため上記サイトへ投稿するようにお願いしています。 + +contact(a)hrntsm.com　(a) を @ に変えてください。 diff --git a/website/docs/doc1.md b/website/docs/doc1.md deleted file mode 100644 index 28286ecc..00000000 --- a/website/docs/doc1.md +++ /dev/null @@ -1,203 +0,0 @@ ---- -id: doc1 -title: Style Guide -sidebar_label: Style Guide -slug: / ---- - -You can write content using [GitHub-flavored Markdown syntax](https://github.github.com/gfm/). - -## Markdown Syntax - -To serve as an example page when styling markdown based Docusaurus sites. - -## Headers - -# H1 - Create the best documentation - -## H2 - Create the best documentation - -### H3 - Create the best documentation - -#### H4 - Create the best documentation - -##### H5 - Create the best documentation - -###### H6 - Create the best documentation - ---- - -## Emphasis - -Emphasis, aka italics, with *asterisks* or _underscores_. - -Strong emphasis, aka bold, with **asterisks** or __underscores__. - -Combined emphasis with **asterisks and _underscores_**. - -Strikethrough uses two tildes. ~~Scratch this.~~ - ---- - -## Lists - -1. First ordered list item -1. Another item - - Unordered sub-list. -1. Actual numbers don't matter, just that it's a number - 1. Ordered sub-list -1. And another item. - -* Unordered list can use asterisks - -- Or minuses - -+ Or pluses - ---- - -## Links - -[I'm an inline-style link](https://www.google.com/) - -[I'm an inline-style link with title](https://www.google.com/ "Google's Homepage") - -[I'm a reference-style link][arbitrary case-insensitive reference text] - -[You can use numbers for reference-style link definitions][1] - -Or leave it empty and use the [link text itself]. - -URLs and URLs in angle brackets will automatically get turned into links. http://www.example.com/ or and sometimes example.com (but not on GitHub, for example). - -Some text to show that the reference links can follow later. - -[arbitrary case-insensitive reference text]: https://www.mozilla.org/ -[1]: http://slashdot.org/ -[link text itself]: http://www.reddit.com/ - ---- - -## Images - -Here's our logo (hover to see the title text): - -Inline-style: ![alt text](https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png 'Logo Title Text 1') - -Reference-style: ![alt text][logo] - -[logo]: https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png 'Logo Title Text 2' - -Images from any folder can be used by providing path to file. Path should be relative to markdown file. - -![img](../static/img/logo.svg) - ---- - -## Code - -```javascript -var s = 'JavaScript syntax highlighting'; -alert(s); -``` - -```python -s = "Python syntax highlighting" -print(s) -``` - -``` -No language indicated, so no syntax highlighting. -But let's throw in a tag. -``` - -```js {2} -function highlightMe() { - console.log('This line can be highlighted!'); -} -``` - ---- - -## Tables - -Colons can be used to align columns. - -| Tables | Are | Cool | -| ------------- | :-----------: | -----: | -| col 3 is | right-aligned | \$1600 | -| col 2 is | centered | \$12 | -| zebra stripes | are neat | \$1 | - -There must be at least 3 dashes separating each header cell. The outer pipes (|) are optional, and you don't need to make the raw Markdown line up prettily. You can also use inline Markdown. - -| Markdown | Less | Pretty | -| -------- | --------- | ---------- | -| _Still_ | `renders` | **nicely** | -| 1 | 2 | 3 | - ---- - -## Blockquotes - -> Blockquotes are very handy in email to emulate reply text. This line is part of the same quote. - -Quote break. - -> This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can _put_ **Markdown** into a blockquote. - ---- - -## Inline HTML - -
-
Definition list
-
Is something people use sometimes.
- -
Markdown in HTML
-
Does *not* work **very** well. Use HTML tags.
-
- ---- - -## Line Breaks - -Here's a line for us to start with. - -This line is separated from the one above by two newlines, so it will be a _separate paragraph_. - -This line is also a separate paragraph, but... This line is only separated by a single newline, so it's a separate line in the _same paragraph_. - ---- - -## Admonitions - -:::note - -This is a note - -::: - -:::tip - -This is a tip - -::: - -:::important - -This is important - -::: - -:::caution - -This is a caution - -::: - -:::warning - -This is a warning - -::: diff --git a/website/docs/doc2.md b/website/docs/doc2.md deleted file mode 100644 index 16cfce40..00000000 --- a/website/docs/doc2.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -id: doc2 -title: Document Number 2 ---- - -This is a link to [another document.](doc3.md) This is a link to an [external page.](http://www.example.com/) diff --git a/website/docs/doc3.md b/website/docs/doc3.md deleted file mode 100644 index 2c40cc68..00000000 --- a/website/docs/doc3.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -id: doc3 -title: This is Document Number 3 ---- - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. In ac euismod odio, eu consequat dui. Nullam molestie consectetur risus id imperdiet. Proin sodales ornare turpis, non mollis massa ultricies id. Nam at nibh scelerisque, feugiat ante non, dapibus tortor. Vivamus volutpat diam quis tellus elementum bibendum. Praesent semper gravida velit quis aliquam. Etiam in cursus neque. Nam lectus ligula, malesuada et mauris a, bibendum faucibus mi. Phasellus ut interdum felis. Phasellus in odio pulvinar, porttitor urna eget, fringilla lectus. Aliquam sollicitudin est eros. Mauris consectetur quam vitae mauris interdum hendrerit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. - -Duis et egestas libero, imperdiet faucibus ipsum. Sed posuere eget urna vel feugiat. Vivamus a arcu sagittis, fermentum urna dapibus, congue lectus. Fusce vulputate porttitor nisl, ac cursus elit volutpat vitae. Nullam vitae ipsum egestas, convallis quam non, porta nibh. Morbi gravida erat nec neque bibendum, eu pellentesque velit posuere. Fusce aliquam erat eu massa eleifend tristique. - -Sed consequat sollicitudin ipsum eget tempus. Integer a aliquet velit. In justo nibh, pellentesque non suscipit eget, gravida vel lacus. Donec odio ante, malesuada in massa quis, pharetra tristique ligula. Donec eros est, tristique eget finibus quis, semper non nisl. Vivamus et elit nec enim ornare placerat. Sed posuere odio a elit cursus sagittis. - -Phasellus feugiat purus eu tortor ultrices finibus. Ut libero nibh, lobortis et libero nec, dapibus posuere eros. Sed sagittis euismod justo at consectetur. Nulla finibus libero placerat, cursus sapien at, eleifend ligula. Vivamus elit nisl, hendrerit ac nibh eu, ultrices tempus dui. Nam tellus neque, commodo non rhoncus eu, gravida in risus. Nullam id iaculis tortor. - -Nullam at odio in sem varius tempor sit amet vel lorem. Etiam eu hendrerit nisl. Fusce nibh mauris, vulputate sit amet ex vitae, congue rhoncus nisl. Sed eget tellus purus. Nullam tempus commodo erat ut tristique. Cras accumsan massa sit amet justo consequat eleifend. Integer scelerisque vitae tellus id consectetur. diff --git a/website/docs/mdx.md b/website/docs/mdx.md deleted file mode 100644 index f0210fb7..00000000 --- a/website/docs/mdx.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -id: mdx -title: Powered by MDX ---- - -You can write JSX and use React components within your Markdown thanks to [MDX](https://mdxjs.com/). - -export const Highlight = ({children, color}) => ( {children} ); - -Docusaurus green and Facebook blue are my favorite colors. - -I can write **Markdown** alongside my _JSX_! diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 87898e10..9ad80ee5 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -8,9 +8,22 @@ module.exports = { favicon: 'img/HFicon.png', organizationName: 'hrntsm', // Usually your GitHub org/user name. projectName: 'HoaryFox', // Usually your repo name. + i18n: { + defaultLocale: 'ja', + locales: ['ja', 'en'], + localeConfigs: { + ja: { + label: '日本語', + }, + en: { + label: 'English', + } + } + }, themeConfig: { + hideableSidebar: true, image: `img/HFicon.png`, - metadates:[ + metadates: [ { name: `twitter:card`, content: `summary` @@ -44,7 +57,7 @@ module.exports = { position: 'right', }, { - href: 'https://hiron.dev', + href: 'https://hiron.dev/about/', label: 'AboutMe', position: 'right' }, @@ -52,6 +65,10 @@ module.exports = { to: 'docs/contact', label: 'Contact', position: 'right' + }, + { + type: 'localeDropdown', + position: 'right', } ], }, @@ -61,6 +78,10 @@ module.exports = { { title: 'Docs', items: [ + { + label: 'License', + to: 'docs/License', + }, { label: 'Component', to: 'docs/Component/Geometry', @@ -82,6 +103,10 @@ module.exports = { label: 'Twitter', href: 'https://twitter.com/hiron_rgkr', }, + { + label: 'Discussion', + href: 'https://github.com/hrntsm/HoaryFox/discussions', + } ], }, { @@ -107,15 +132,13 @@ module.exports = { { docs: { sidebarPath: require.resolve('./sidebars.js'), - // Please change this to your repo. editUrl: - 'https://github.com/facebook/docusaurus/edit/master/website/', + 'https://github.com/hrntsm/HoaryFox/edit/develop/website/', }, blog: { showReadingTime: true, - // Please change this to your repo. editUrl: - 'https://github.com/facebook/docusaurus/edit/master/website/blog/', + 'https://github.com/hrntsm/HoaryFox/edit/develop/website/', }, theme: { customCss: require.resolve('./src/css/custom.css'), diff --git a/website/i18n/en/code.json b/website/i18n/en/code.json new file mode 100644 index 00000000..e04bdf94 --- /dev/null +++ b/website/i18n/en/code.json @@ -0,0 +1,11 @@ +{ + "HoaryFox は簡単に建築構造向け BIM データ \"ST-Bridge\" を Grasshopper で扱えるように設計しています。": { + "message": "HoaryFox is designed to easily handle \"ST-Bridge\", BIM data for Japan building structures in Grasshopper." + }, + "Grasshopper の可視化や形状最適化機能を使った構造設計の効率化を目指しています。": { + "message": "We aim to improve the efficiency of structural design using Grasshopper's visualization and shape optimization capabilities." + }, + "Grasshopper の構造解析ツール Karamba3D への ST-Bridge データの入出力をサポートします。": { + "message": "Supports the input and output of ST-Bridge data to and from Grasshopper's structural analysis tool Karamba3D." + } +} \ No newline at end of file diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current.json b/website/i18n/en/docusaurus-plugin-content-docs/current.json new file mode 100644 index 00000000..a99b97ac --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current.json @@ -0,0 +1,14 @@ +{ + "version.label": { + "message": "Next", + "description": "The label for version current" + }, + "sidebar.someSidebar.category.Component": { + "message": "Component", + "description": "The label for category Component in sidebar someSidebar" + }, + "sidebar.someSidebar.category.Usage": { + "message": "Usage", + "description": "The label for category Usage in sidebar someSidebar" + } +} \ No newline at end of file diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Changelog.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Changelog.md new file mode 100644 index 00000000..c1b3bb5c --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Changelog.md @@ -0,0 +1,65 @@ +--- +id: Changelog +title: Changelog +--- + +--- + +## [v1.3.1 - 2021-03-28](https://github.com/hrntsm/HoaryFox/releases/tag/v1.3.1) + +### ADD + +- Bake function for Brep and Line + +### UPDATE + +- Brep to be exported by Stb2Brep, merged into a single Brep + +--- + +## [v1.2.2 - 2021-02-17](https://github.com/hrntsm/HoaryFox/releases/tag/v1.2.2) + +### ADD + +- Create a documentation site +- SetCroSecFamilyName component to specify the family name of the cross-section + +### FIX + +- Fixed wrong units in material properties + +### UPDATE + +- RC cross-section names have been changed from "Id + number" to BD- or CD- to indicate the cross-section size. + - For example, BD-300x600. +- The FrameBuilder using Karamba3D component has been separated into two parts: frame conversion and nodal conversion. + - Framebuilder by angle and NodeBuilderFrameBuilder + - Allowed input of the angle for determining the column and beam when converting + - Added text output to Rhino viewport to show results of the above decisions + +--- + +## [v1.2.1 - 2020-12-31](https://github.com/hrntsm/HoaryFox/releases/tag/v1.2.1) + +### FIX + +- Change the karamba3D reference path, since the builder component wouldn't load to GH. + +--- + +## [v1.2.0 - 2020-12-30](https://github.com/hrntsm/HoaryFox/releases/tag/v1.2.0) + +### ADD + +- ST-Bridge export feature. + +### その他 + +- The part that handles STB was made independent as STBDotNet. + - The reading part is still the same as the previous STBReader and will be updated in the next fix. + +--- + +## [v0.9.0 - v1.1.3](https://github.com/hrntsm/HoaryFox/releases) + +Please check the GitHub release page for the above versions. diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Component/Geometry.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/Geometry.md new file mode 100644 index 00000000..c5eca7a2 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/Geometry.md @@ -0,0 +1,53 @@ +--- +id: Geometry +title: Geometry +--- + +Category of components to be visualized and baked from loaded STB data + +--- + +## Stb to Line + +![](../../images/Component/StbToLine.png) + +Display a part as a Line + +| Input | Explanation | +| ----- | :-----------------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Bake | Layers each Line according to its cross-sectional sign and bakes it | + +| Output | Explanation | +| ------- | :------------------------------: | +| Nodes | Output the Point3d list of nodes | +| Columns | Output list of column lines | +| Posts | output list of intercolumn lines | +| Beams | Output list of small beam lines | +| Braces | output list of braces lines | + +## Stb to Brep + +![](../../images/Component/StbToBrep.png) + +Display a component in Brep. + +| Input | Explanation | +| ----- | :--------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Bake | Bake each Brep layered by cross-sectional code | + +| Output | Explanation | +| ------- | :----------------------------------------------: | +| Columns | Output list of Brep's representing column shapes | +| Girders | Output list of breps for beams | +| Posts | Output list of Brep for columns | +| Beams | Output list of Brep for small beam shapes | +| Braces | output list of breps for braces | +| Slabs | output list of Brep for slab shapes | +| Walls | output a list of Brep for wall shapes | + +### Display specification + +- Walls should include openings. +- Slabs may not output properly if they are concave diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Component/IO.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/IO.md new file mode 100644 index 00000000..4397ad36 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/IO.md @@ -0,0 +1,87 @@ +--- +id: IO +title: IO +--- + +Categories of components that perform data input and output + +--- + +## Load STB file + +![](../../images/Component/LoadStbFile.png) + +Load STB data + +| Input | Explanation | +| ----- | :--------------------: | +| Path | path of ST-Bridge file | + +| Output | Description | +| ------ | :-----------------------------: | +| Data | Data of the read ST-Bridge file | + +## Export STB file + +![](../../images/Component/ExportStbFile.png) + +Exporting STB data + +| Input | Description | +| ------- | :-------------------------------------------------------------------------------------: | +| Node | Nodal information, input Node output of FrameBuilder component | +| Axis | axis information, input Axis output from AxisBuilder component | +| Story | Story information, enter the Story output of the StoryBuilder component | +| Member | Member information, enter the Member output of the FrameBuilder component | +| Section | Section information, enter the Section output of the FrameBuilder component | +| Path | Specify the output destination for the created ST-Bridge data. Default value is desktop | +| Out? | Boolean value for whether to output; if true, output will occur | + +| Output | Description | +| ------ | :--------------------: | +| Stb | Created ST-Bridge data | + +The detailed usage and conversion specification of this component can be found in [Export ST-Bridge file](../Usage/ExportSTB) article. + +--- + +## Convert to karamba + +![](../../images/Component/ConvertToKaramba.png) + +Convert the read STB data to the data of the component [Karamba3D](https://www.karamba3d.com/) for structural analysis + +| Input | Explanation | +| ---------- | :-------------------------------------------------------------------------------------------------------------------------------------------: | +| Data | Load STB file Input data output of the component | +| FamilyName | Specification of the family name of the cross section.
If not entered, the default value of the SetCroSecFamilyName component is entered | + +| Output | Description | +| ------------ | :-------------------------------------: | +| ElementBeam | Karamba3D beam element | +| CrossSection | Cross section information for Karamba3D | + +--- + +## SetCroSecFamilyName + +![](../../images/Component/SetCroSecFamilyName.png) + +A component that sets the family name for the cross section in Karamba3D. + +| Input | Description | +| ------ | :---------------------------------------------------------------------: | +| Box | Family name for box-shaped cross section. Default is HF-Box | +| H | Family name for H-shaped cross sections. Defaults to HF-H | +| Circle | Family name for circular solid cross sections. Defaults to HF-Circle | +| Pipe | Family name for circular hollow cross sections. Defaults to HF-Pipe | +| FB | Cross section family name for flat bars. Defaults to HF-FB | +| L | Cross section family name for L-shaped cross sections. Default is HF-L | +| T | Cross section family name for T-shaped cross sections. Defaults to HF-T | +| Other | Other cross section family names. Default is HF-Other | + +| Output | Description | +| ---------- | :--------------------------------------------------------: | +| FamilyName | Setting the family name of the cross section in Karamba3D. | + +The detailed usage and conversion specification of this component can be found in the [Convert to Karamba3D](../Usage/ConvertToKaramba) article. diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Component/NameTag.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/NameTag.md new file mode 100644 index 00000000..d7483b17 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/NameTag.md @@ -0,0 +1,91 @@ +--- +id: NameTag +title: NameTag +--- + +Category of components that display name tags. + +--- + +## Column Name Tag + +![](../../images/Component/ColumnNameTag.png) + +Display the member tags of a column + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------- | :----------: | +| NameTag | List of tags | + +--- + +## Post Name Tag + +![](../../images/Component/PostNameTag.png) + +Display the tags of a member of a column + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------- | :----------: | +| NameTag | List of tags | + +--- + +## Girder Name Tag + +![](../../images/Component/GirderNameTag.png) + +Display the member tags of a large beam + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------- | :----------: | +| NameTag | List of tags | + +--- + +## Beam Name Tag + +![](../../images/Component/BeamNameTag.png) + +Display the tags of a small beam component + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------- | :----------: | +| NameTag | List of tags | + +--- + +## Brace Name Tag + +![](../../images/Component/BraceNameTag.png) + +Display the brace's member tags. + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------- | :----------: | +| NameTag | list of tags | diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Component/SectionTag.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/SectionTag.md new file mode 100644 index 00000000..67697673 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/SectionTag.md @@ -0,0 +1,91 @@ +--- +id: SectionTag +title: SectionTag +--- + +Category of components that display cross-sectional information. + +--- + +## Column Section Tag + +![](../../images/Component/ColumnSectionTag.png) + +Display column section information + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------ | :----------: | +| SecTag | list of tags | + +--- + +## Post Section Tag + +![](../../images/Component/PostSectionTag.png) + +Display cross-sectional information for columns + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------ | :----------: | +| SecTag | list of tags | + +--- + +## Girder Section Tag + +![](../../images/Component/GirderSectionTag.png) + +Display cross-section information for large beams + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------ | :----------: | +| SecTag | list of tags | + +--- + +## Beam Section Tag + +![](../../images/Component/BeamSectionTag.png) + +Display cross section information for small beams + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------ | :----------: | +| SecTag | list of tags | + +--- + +## Brace Section Tag + +![](../../images/Component/BraceSectionTag.png) + +Display brace section information. + +| Input | Explanation | +| ----- | :----------------------------------------------------------: | +| Data | Load STB file Input the Data output of the component | +| Size | Character size to display in Rhino's viewport. Default is 12 | + +| Output | Description | +| ------ | :----------: | +| SecTag | list of tags | diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Component/StbBuilder.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/StbBuilder.md new file mode 100644 index 00000000..ba3ae3b8 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Component/StbBuilder.md @@ -0,0 +1,82 @@ +--- +id: StbBuilder +title: StbBuilder +--- + +Categories of components that create information for STB export + +:::note +The usage and notes for this component are also described in [Export ST-Bridge file](../Usage/ExportSTB) for more details. +::: + +--- + +## Frame Builder by angle + +![](../../images/Component/FrameBuilder.png) + +Create the frame information from the Karamba3D model. +To classify columns and beams, enter the angle of the global coordinate with respect to the Z-axis in Angle, and if the angle is within that range, the column is determined to be a column. + +| Input | description | +| ----- | :-------------------------------------------------------------: | +| Model | Input the Model output of Karamba3D | +| Angle | Angle (rad) to be used when determining between column and beam | + +| output | description | +| ------- | :-------------------------------: | +| Member | Member information (StbMembers) | +| Section | Section information (StbSections) | + +--- + +## Node Builder + +![](../../images/Component/NodeBuilder.png) + +Create the nodal information from the Karamba3D model. + +| Input | Explanation | +| ----- | :----------------------------: | +| Model | Input Karamba3D's Model output | + +| output | description | +| ------ | :--------------------------: | +| Node | Nodal information (StbNodes) | + +## Axis Builder + +![](../../images/Component/AxisBuilder.png) + +Create the axis information + +| Input | Description | +| --------- | :------------------------------------------------------: | +| Node | Nodal information, input the Node output of FrameBuilder | +| Distance | distance of the axis from the origin (mm) | +| Range | width of axis (mm) | +| Name | name of axis | +| Direction | direction of the axis | + +| Output | Description | +| ------ | :-------------------------: | +| Axis | axis information (StbAxes)} | + +--- + +## Story Builder + +![](../../images/Component/StoryBuilder.png) + +Create the floor information + +| input | description | +| ------ | :------------------------------------------------------: | +| Node | Nodal information, input the Node output of FrameBuilder | +| Height | height of the floor from the origin (mm) | +| Range | width of the floor (mm) | +| Name | Name of the floor | + +| Output | Description | +| ------ | :----------------------------: | +| Story | Story information (StbStories) | diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/License.md b/website/i18n/en/docusaurus-plugin-content-docs/current/License.md new file mode 100644 index 00000000..bbe1dee3 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/License.md @@ -0,0 +1,20 @@ +--- +id: License +title: License +--- + +HoaryFox is released under MIT license. +Please check the [license page](https://github.com/hrntsm/HoaryFox/blob/main/LICENSE) for the official license details. + +--- + +Summary + +- Permissions + - Commercial use + - Modification + - Distribution + - Private use +- Limitations + - Liability + - Warranty \ No newline at end of file diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/BakeGeometry.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/BakeGeometry.md new file mode 100644 index 00000000..64350b52 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/BakeGeometry.md @@ -0,0 +1,24 @@ +--- +id: BakeGeometry +title: Bake Geometry +--- + +This section explains how to load an STB model into Grasshopper and bake it into Rhino. Please refer to the model in ShowStbModel.gh in the Samples folder. + +## Load the STB file + +When you open the file, it should look like this: Right click on the path component and select one existing file, then select the stb file you want to visualize. +If there are no errors in loading, the Load STB data component next to it will convert the data. Connect this output to the visualization components to visualize the information in the Rhino viewport. + +![](../../images/ShowStbModel/input.png) + +## Geometry Bake + +The Stb2Brep component and the Stb2Line component have a Bake function. +The Bake status is as shown in the following image. + +Layers are divided into Column, Girder, Post, Beam, Brace, Slab, and Wall, which are further divided into sublayers for each member code. + +We add meta information to the baked geometry. When you select the geometry and check the Attribure User Text in the Properties, you can see the section size and other values, which is a BIM-like function. + +![](../../images/BakeGeometry/Bake.png) diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ConvertToKaramba.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ConvertToKaramba.md new file mode 100644 index 00000000..24c956e8 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ConvertToKaramba.md @@ -0,0 +1,70 @@ +--- +id: ConvertToKaramba +title: Convert to Karamba3D +--- + +This section explains how to create a Karamba3D model using the STB data. Please refer to the Convert_to_Karamba.gh model in the Samples folder for the content here. + +## Data Conversion + +Make sure that Grasshopper can read the STB data as described in Show ST-Bridge model. +The data will be converted by entering the imported results into the Convert to Karamba component as shown below. + +The elements and sections will be converted. The converted data can be used as input for Karamba3d's Assemble Model (Karamba3D) component, so you only need to set the Load and Support settings to run the analysis in Karamba3d. +The material information is included in the CrossSection output, so there is no need to set it separately. + +The family name of the cross section can be set arbitrarily by the SetFamilyName component for each shape as shown below. If not set, the family name will start with "HF-", such as "HF-Box". + +![](../../images/ConvertToKaramba/gh.png) + +## Conversion specifications + +The following specifications are used to convert the data from STB to Karamba3D. + +### Conversion target + +- Convert columns, beams and braces, but not face materials such as floor walls + +### Element name + +- For simplicity, the IDs in STB are converted as names. (e.g. "Id15"). +- Therefore, the member code will be lost. + +### Cross-sectional shape + +- Even if a member has multiple cross sections or tapers, it will be converted as a member with only the center section. +- RC Column + - Rectangular cross section: Convert as Trapezoid + - Circular cross section: Since there is no circular solid cross section in Karamba3D, convert to match the axial cross section in 0-Section. +- RC Beams + - All converted as Trapezoid +- S section + - H-section: Converted as I-Section + - T-section: Converted as I-Section + - Flat bars: Converted as Trapezoid + - Box section: Converted as []-Section + - L-section, C-section, round steel: Converted as square Trapezoid to match the axial cross-sectional area, since Karamba3D does not support these cross-sections and they are basically used as braces. + - Since back-to-back and double bracing are not supported, the cross section will be converted as a single section even if it is set as such in STB. + +### Material + +- RC + - StbSecColumn_RC and StbSecBeam_RC are converted as RC. + - The material can be specified in STB, but it is a string of material names and not necessarily in a specific format, so it is assumed that all materials have FC21 equivalent material properties. + - Young's modulus: 21860 N/mm2 + - Poisson's ratio: 0.2 + - Density: 24 kN/m3 + - Karamba3d fy: 14 N/mm2 +- S + - For cross sections other than the above, steel material is given. + - For the same reason as the material specification for RC, all of them are assumed to have material properties equivalent to SN400. + - Young's modulus: 205000 N/mm2 + - Poisson's ratio: 0.3 + - Density: 78.5 kN/m3 + - Karamba3d fy: 235 N/mm2 + +:::note + +If you have any requests for unsupported functions, please contact us. + +::: diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ExportSTB.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ExportSTB.md new file mode 100644 index 00000000..c91ea2ea --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ExportSTB.md @@ -0,0 +1,124 @@ +--- +id: ExportSTB +title: Export ST-Bridge file +--- + +This section explains how to create ST-Bridge data from Karamba3D data. Please refer to the ExportSTB.gh model in the Samples folder for the details. +The output will be in ST-Bridge version 1.4 format. + +## Convert Karamba3D model + +From the model created by Karamba3D, the following will be created + +- Nodes (StbNodes) +- Part information (StbMembers) +- Section information (StbSections) + +The model data output from the AssembleModel component of Karamba3D will be converted by inputting the data into the FrameBuilder by angle component and NodeBuilder as follows. +The Rhino viewport will display text to indicate whether the converted member is a column, beam, or brace. Columns and beams are classified based on the angle of the member, so if this is not the expected classification, enter the appropriate angle in the Angle input. + +![](../../images/ExportStb/FrameBuilder.png) + +:::note +Please see the conversion specification at the bottom of this page for more information on how to model the output from Karamba3D. +::: + +## Creating Axis Information + +The AxisBuilder component is used to create data for the axes (StbAxes). +The basic idea of the behavior is that nodes that are within the Range width (Dist ± Range) from the axis specified by Distance are treated as nodes belonging to the axis. +By looking at the output of the component, you can check the direction of the axis, the distance from the origin, and the number of nodes belonging to the axis. + +The specification of the input is as follows. It is not easy to understand, so it will be improved in the future. The input is a list, and inputs with the same index are matched and converted. + +- Node: nodal information, please enter the Node from the NodeBuilder output +- Distance: Specify the distance of the axis from the origin. + - The direction of the axis will be parallel to the X or Y axis of the overall coordinate system. + - The direction of the axis is parallel to the X-axis or Y-axis of the overall coordinate system. Whether the specified Distance is in the X-direction or Y-direction is specified by the Direction input. +- Range: Specify the width of the nodal point belonging to the axis set in Distance. + - Due to the fact that nodal coordinates are in floating point format, it is recommended to set a value greater than 0, even if all nodes are on the axis. +- Name: The name of the axis. +- Direction: Specifies the direction of the axis. + - A value of 0 means that the axis will be treated as X-directed, and a value of 1 means that the axis will be treated as Y-directed. + +![](../../images/ExportStb/AxisBuilder.png) + +## Create the floor information + +The StoryBuilder component is used to create data for floors (StbStories). +The basic behavior is the same as the AxisBuilder component. +By looking at the output of the component, you can check the name of the floor, the height of the floor, and the number of nodes it belongs to. + +- Node: Nodal information, enter the Node in the NodeBuilder output. +- Height: Floor height information. Please enter the height from the origin. +- Range: Specify the width of the nodal point for the floor specified by Height. +- Name: This is the name of the floor. + +![](../../images/ExportStb/StoryBuilder.png) + +## Output the data + +By inputting all the data converted by the above three into the Export STB file component, the data will be combined to create a single ST-Bridge file. +The STB file will be output to the path specified in Path. If not specified, the file will be output to the desktop as model.stb. +If you set the value of Out? to True, the file will be output. By checking the output, you can get an overview of the data conversion status. + +![](../../images/ExportStb/ExportStbfile.png) + +--- + +## Conversion specifications + +ST-Bridge data is created according to the following specifications. + +### Target + +- Output in ST-Bridge version 1.4 format. +- Convert columns, beams, and braces, but not surface materials such as floor walls. + +:::note +Output in ST-Bridge version 2 format will be supported in the future. +::: + +### Part Identification + +- The Karamba3D model does not distinguish between column and beam braces, so the following specifications are used + - If a part is treated as a truss element in Karamba3D, it is converted to a brace. + - If the angle of a member is less than the angle entered in FrameBuilder's Angle to the Z-axis of the overall coordinate system, the member is considered to be a column; if the angle is greater than the angle, the member is considered to be a beam. +- The identification of the member corresponds to the respective representation in StbMember in ST-Bridge (e.g. StbColumn). +- STB beam members have a flag (isFoundation) to indicate whether the member is a foundation member, but all are output as False. + +### Material Identification + +- In Karamba3D, if the Family name is "Steel", the material is assumed to be S. If the Family name is "Concrete", the material is assumed to be RC. +- The material identification corresponds to the respective expression in StbSections in ST-Bridge (e.g. StbSecColumn_RC). + +:::important +If the family name of the material is other than the above, an error occurs. +::: + +### Material name + +- Do not use Karamba3D's own names. +- Karamba3D has an internal order of material names, which is a combination of numbers: C for columns, G for beams, V for braces. (C1, G1, etc.) + +### Cross Section Name + +- Create a cross section with the name set in the Name field of the Cross Section component in Karamba3D. + +:::important +Since each name is output to the STB file, please make sure to set the name. +If there is a duplicate Name, HoaryFox Converter will treat it as the same section, so only one section will be output. +::: + +### Cross section shape + +- The cross section will be output to STB according to the cross section shape set in Karamba3D. +- If there is an error in the conversion, the cross section will be output as a 10 mm square. +- RC cross-section does not have reinforcement information in Karamba3D, so it will be output as follows + - Main reinforcement: 3-D22 at top and bottom for beams, 8-D22 for columns + - Shear reinforcement: 2-D10@100 +- For S-section, the material is SN400 for both flange and web. + +:::note +If you have any requests for unsupported functions, please contact us. +::: diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/HowToInstall.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/HowToInstall.md new file mode 100644 index 00000000..8164f040 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/HowToInstall.md @@ -0,0 +1,29 @@ +--- +id: HowToInstall +title: How to install +--- + +## Introduction + +This section describes how to install HoaryFox. + +1. Download the file from Food4Rhino's [HoaryFox](https://www.food4rhino.com/app/hoaryfox) site. +1. Right-click on the downloaded zip file, select "Allow" for the security item in the General tab, and unzip it in step 1. +1. start Grasshopper, select File > Special Folders > Components folder, and put the folder named "HoaryFox" in the file downloaded in step 1. +1. restart Rhino + +## Karamba3d Integration + +If you want to use the Karamba3D integration feature, move Karamba.gha to a folder where you do not have administrative privileges; Karamba3D folders are usually located in Program flies > Rhino > Plug-ins. + +:::note +If you do not need the linkage, you can avoid component loading errors by deleting the karambaConnect.gha file in the HoaryFox folder. +::: + +## Overview of the integration with each software + +HoaryFox can be linked with Rhinoceros/Grasshopper/Karamba3D, BIM software, and integrated structural calculation via ST-Bridge as shown below. + +For details, please refer to the introduction page of each component. + +![](../../images/HowToInstall/relation.png) diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ShowSTBModel.md b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ShowSTBModel.md new file mode 100644 index 00000000..33e7ba82 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/Usage/ShowSTBModel.md @@ -0,0 +1,31 @@ +--- +id: ShowSTBModel +title: Show ST-Bridge model +--- + +This section explains how to load and display the STB model in Grasshopper. Please refer to the model in ShowStbModel.gh in the Samples folder for this content. + +## Load the STB file + +When you open the file, it should look like this: Right-click on the path component and select Select one existing file, then select the stb file you want to visualize. +If there are no errors in loading, the Load STB data component next to it will convert the data. Connect this output to the visualization components to visualize the information in the Rhino viewport. + +![](../../images/ShowStbModel/input.png) + +## Visualization + +### Display geometry. + +[Geometry](../Component/Geometry) category components. +Use the **"Stb to Line"** component if you want to display the frame data as a line, or the **"Stb to Brep"** component if you want to represent it in Brep, including the size. + +### Display Name tag. + +[NameTag](../Component/NameTag) category of components. +There are visualization components for columns, spacers, beams, beams, and braces, so you can connect the output of the Load STB data component to the component you want to visualize. The size of the sign can be changed by entering the Size. + +### Display section tag. + +[SectionTag](../Component/SectionTag) category of components. +There are visualization components for columns, spans, beams, beams, and braces, so connect the output of the Load STB data component to the component you want to visualize. The size of the sign can be changed by entering the Size. +The cross-sectional size of the part will be output as text on the viewport. diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/contact.md b/website/i18n/en/docusaurus-plugin-content-docs/current/contact.md new file mode 100644 index 00000000..d5f4659c --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/contact.md @@ -0,0 +1,18 @@ +--- +id: contact +title: contact +--- + +Please feel free to contact us. + +## Discussions + +Please check and use the following discussion sites for questions and requests. +https://github.com/hrntsm/HoaryFox/discussions + +## Mail + +We do respond to e-mail inquiries, but +If you have any questions or requests, please check the following discussion sites. + +contact(a)hrntsm.com (change "a" to @) diff --git a/website/i18n/en/docusaurus-plugin-content-docs/current/donation.md b/website/i18n/en/docusaurus-plugin-content-docs/current/donation.md new file mode 100644 index 00000000..f3c194a8 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/current/donation.md @@ -0,0 +1,13 @@ +--- +id: donation +title: donation +--- + +Thank you for downloading HoaryFox. +This software is being updated with your support. +If you like this software, please donation. + +pixivFANBOX +https://hiron.fanbox.cc/ + +Thank you for reading. \ No newline at end of file diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/BakeGeometry/Bake.png b/website/i18n/en/docusaurus-plugin-content-docs/images/BakeGeometry/Bake.png new file mode 100644 index 00000000..079e7549 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/BakeGeometry/Bake.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/AxisBuilder.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/AxisBuilder.png new file mode 100644 index 00000000..fe46f0ce Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/AxisBuilder.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BeamNameTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BeamNameTag.png new file mode 100644 index 00000000..47de2188 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BeamNameTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BeamSectionTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BeamSectionTag.png new file mode 100644 index 00000000..f54374e6 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BeamSectionTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BraceNameTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BraceNameTag.png new file mode 100644 index 00000000..afebcefb Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BraceNameTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BraceSectionTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BraceSectionTag.png new file mode 100644 index 00000000..6baf78cd Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/BraceSectionTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ColumnNameTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ColumnNameTag.png new file mode 100644 index 00000000..031b13d9 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ColumnNameTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ColumnSectionTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ColumnSectionTag.png new file mode 100644 index 00000000..42e7789a Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ColumnSectionTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ConvertToKaramba.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ConvertToKaramba.png new file mode 100644 index 00000000..75c44bb4 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ConvertToKaramba.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ExportStbFile.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ExportStbFile.png new file mode 100644 index 00000000..5616b7c0 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/ExportStbFile.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/FrameBuilder.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/FrameBuilder.png new file mode 100644 index 00000000..0c975dfe Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/FrameBuilder.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/GirderNameTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/GirderNameTag.png new file mode 100644 index 00000000..04634c4c Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/GirderNameTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/GirderSectionTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/GirderSectionTag.png new file mode 100644 index 00000000..da1581f5 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/GirderSectionTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/LoadStbFile.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/LoadStbFile.png new file mode 100644 index 00000000..075d2cff Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/LoadStbFile.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/NodeBuilder.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/NodeBuilder.png new file mode 100644 index 00000000..1e960bd8 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/NodeBuilder.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/PostNameTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/PostNameTag.png new file mode 100644 index 00000000..548917f3 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/PostNameTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/PostSectionTag.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/PostSectionTag.png new file mode 100644 index 00000000..2563ea93 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/PostSectionTag.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/SetCroSecFamilyName.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/SetCroSecFamilyName.png new file mode 100644 index 00000000..644d69bc Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/SetCroSecFamilyName.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StbToBrep.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StbToBrep.png new file mode 100644 index 00000000..f0b6d2b5 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StbToBrep.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StbToLine.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StbToLine.png new file mode 100644 index 00000000..9f44f0d6 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StbToLine.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StoryBuilder.png b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StoryBuilder.png new file mode 100644 index 00000000..dc88128a Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/Component/StoryBuilder.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/ConvertToKaramba/gh.png b/website/i18n/en/docusaurus-plugin-content-docs/images/ConvertToKaramba/gh.png new file mode 100644 index 00000000..4c1a0663 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/ConvertToKaramba/gh.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/AxisBuilder.png b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/AxisBuilder.png new file mode 100644 index 00000000..c58587a3 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/AxisBuilder.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/ExportStbfile.png b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/ExportStbfile.png new file mode 100644 index 00000000..dc97fa5f Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/ExportStbfile.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/FrameBuilder.jpg b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/FrameBuilder.jpg new file mode 100644 index 00000000..3f1af1a5 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/FrameBuilder.jpg differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/FrameBuilder.png b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/FrameBuilder.png new file mode 100644 index 00000000..9918aef3 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/FrameBuilder.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/StoryBuilder.png b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/StoryBuilder.png new file mode 100644 index 00000000..334e70ec Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/ExportStb/StoryBuilder.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/HowToInstall/relation.png b/website/i18n/en/docusaurus-plugin-content-docs/images/HowToInstall/relation.png new file mode 100644 index 00000000..17923dd7 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/HowToInstall/relation.png differ diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/HowToInstall/relation.svg b/website/i18n/en/docusaurus-plugin-content-docs/images/HowToInstall/relation.svg new file mode 100644 index 00000000..0166f9a3 --- /dev/null +++ b/website/i18n/en/docusaurus-plugin-content-docs/images/HowToInstall/relation.svg @@ -0,0 +1,12463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ST-Bridge + + + 一貫構造計算ソフト + + + + + + + + HoaryFox + + diff --git a/website/i18n/en/docusaurus-plugin-content-docs/images/ShowStbModel/input.png b/website/i18n/en/docusaurus-plugin-content-docs/images/ShowStbModel/input.png new file mode 100644 index 00000000..dea051d7 Binary files /dev/null and b/website/i18n/en/docusaurus-plugin-content-docs/images/ShowStbModel/input.png differ diff --git a/website/i18n/en/docusaurus-theme-classic/footer.json b/website/i18n/en/docusaurus-theme-classic/footer.json new file mode 100644 index 00000000..ba047572 --- /dev/null +++ b/website/i18n/en/docusaurus-theme-classic/footer.json @@ -0,0 +1,42 @@ +{ + "link.title.Docs": { + "message": "Docs", + "description": "The title of the footer links column with title=Docs in the footer" + }, + "link.title.Community": { + "message": "Community", + "description": "The title of the footer links column with title=Community in the footer" + }, + "link.title.More": { + "message": "More", + "description": "The title of the footer links column with title=More in the footer" + }, + "link.item.label.Component": { + "message": "Component", + "description": "The label of footer link with label=Component linking to docs/Component/Geometry" + }, + "link.item.label.Usage": { + "message": "Usage", + "description": "The label of footer link with label=Usage linking to docs/Usage/ShowSTBModel" + }, + "link.item.label.Food4Rhino": { + "message": "Food4Rhino", + "description": "The label of footer link with label=Food4Rhino linking to https://www.food4rhino.com/app/hoaryfox" + }, + "link.item.label.Twitter": { + "message": "Twitter", + "description": "The label of footer link with label=Twitter linking to https://twitter.com/hiron_rgkr" + }, + "link.item.label.Blog": { + "message": "Blog", + "description": "The label of footer link with label=Blog linking to blog" + }, + "link.item.label.Donation": { + "message": "Donation", + "description": "The label of footer link with label=Donation linking to docs/donation" + }, + "copyright": { + "message": "Copyright © 2021 hrntsm, Inc. Built with Docusaurus.", + "description": "The footer copyright" + } +} \ No newline at end of file diff --git a/website/i18n/en/docusaurus-theme-classic/navbar.json b/website/i18n/en/docusaurus-theme-classic/navbar.json new file mode 100644 index 00000000..99197152 --- /dev/null +++ b/website/i18n/en/docusaurus-theme-classic/navbar.json @@ -0,0 +1,26 @@ +{ + "title": { + "message": "HoaryFox", + "description": "The title in the navbar" + }, + "item.label.Docs": { + "message": "Docs", + "description": "Navbar item with label Docs" + }, + "item.label.Blog": { + "message": "Blog", + "description": "Navbar item with label Blog" + }, + "item.label.GitHub": { + "message": "GitHub", + "description": "Navbar item with label GitHub" + }, + "item.label.AboutMe": { + "message": "AboutMe", + "description": "Navbar item with label AboutMe" + }, + "item.label.Contact": { + "message": "Contact", + "description": "Navbar item with label Contact" + } +} \ No newline at end of file diff --git a/website/images/Component/Axis.png b/website/images/Component/Axis.png new file mode 100644 index 00000000..e6d54f68 Binary files /dev/null and b/website/images/Component/Axis.png differ diff --git a/website/images/Component/SlabNameTag.png b/website/images/Component/SlabNameTag.png new file mode 100644 index 00000000..00147bbc Binary files /dev/null and b/website/images/Component/SlabNameTag.png differ diff --git a/website/images/Component/SlabSectionTag.png b/website/images/Component/SlabSectionTag.png new file mode 100644 index 00000000..4fa4e326 Binary files /dev/null and b/website/images/Component/SlabSectionTag.png differ diff --git a/website/images/Component/WallNameTag.png b/website/images/Component/WallNameTag.png new file mode 100644 index 00000000..bfc36301 Binary files /dev/null and b/website/images/Component/WallNameTag.png differ diff --git a/website/images/Component/WallSectionTag.png b/website/images/Component/WallSectionTag.png new file mode 100644 index 00000000..57b2f762 Binary files /dev/null and b/website/images/Component/WallSectionTag.png differ diff --git a/website/images/ExportStb/OptimizedModel2STB.png b/website/images/ExportStb/OptimizedModel2STB.png new file mode 100644 index 00000000..e9fd4c75 Binary files /dev/null and b/website/images/ExportStb/OptimizedModel2STB.png differ diff --git a/website/images/HowToInstall/relation.png b/website/images/HowToInstall/relation.png new file mode 100644 index 00000000..17923dd7 Binary files /dev/null and b/website/images/HowToInstall/relation.png differ diff --git a/website/images/HowToInstall/relation.svg b/website/images/HowToInstall/relation.svg new file mode 100644 index 00000000..0166f9a3 --- /dev/null +++ b/website/images/HowToInstall/relation.svg @@ -0,0 +1,12463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ST-Bridge + + + 一貫構造計算ソフト + + + + + + + + HoaryFox + + diff --git a/website/package-lock.json b/website/package-lock.json index 8d809a89..38df4450 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -5,420 +5,432 @@ "requires": true, "dependencies": { "@algolia/autocomplete-core": { - "version": "1.0.0-alpha.38", - "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.0.0-alpha.38.tgz", - "integrity": "sha512-mN/cMSNqMvkodkUZ8yMZUof8RquKCjNMGJwt+sejpLuvq4/kTzZZmsJQW7pplWxp+E/axXkdfMwkh/OdRTa8vA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.2.2.tgz", + "integrity": "sha512-JOQaURze45qVa8OOFDh+ozj2a/ObSRsVyz6Zd0aiBeej+RSTqrr1hDVpGNbbXYLW26G5ujuc9QIdH+rBHn95nw==", "requires": { - "@algolia/autocomplete-shared": "1.0.0-alpha.38" + "@algolia/autocomplete-shared": "1.2.2" } }, "@algolia/autocomplete-preset-algolia": { - "version": "1.0.0-alpha.38", - "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.0.0-alpha.38.tgz", - "integrity": "sha512-wwdU1kjUWkOa0XrGi9Smp2eS6R3hfOze1O0AUnAFQ+kGLOpo02DmydU1yXRFfXnYgW3mW97CvsMpMe73BWKkDA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.2.2.tgz", + "integrity": "sha512-AZkh+bAMaJDzMZTelFOXJTJqkp5VPGH8W3n0B+Ggce7DdozlMRsDLguKTCQAkZ0dJ1EbBPyFL5ztL/JImB137Q==", "requires": { - "@algolia/autocomplete-shared": "1.0.0-alpha.38" + "@algolia/autocomplete-shared": "1.2.2" } }, "@algolia/autocomplete-shared": { - "version": "1.0.0-alpha.38", - "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.0.0-alpha.38.tgz", - "integrity": "sha512-4GPHme9Wm8JN2ZTQWZaOgfJk28Z3WdC9XUaAhdd0Vii0GZkBMXSwlpeLPvKyrpuaocnkrMPafKJOMRHU0baMGQ==" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.2.2.tgz", + "integrity": "sha512-mLTl7d2C1xVVazHt/bqh9EE/u2lbp5YOxLDdcjILXmUqOs5HH1D4SuySblXaQG1uf28FhTqMGp35qE5wJQnqAw==" }, "@algolia/cache-browser-local-storage": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.8.3.tgz", - "integrity": "sha512-Cwc03hikHSUI+xvgUdN+H+f6jFyoDsC9fegzXzJ2nPn1YSN9EXzDMBnbrgl0sbl9iLGXe0EIGMYqR2giCv1wMQ==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.10.5.tgz", + "integrity": "sha512-cfX2rEKOtuuljcGI5DMDHClwZHdDqd2nT2Ohsc8aHtBiz6bUxKVyIqxr2gaC6tU8AgPtrTVBzcxCA+UavXpKww==", "requires": { - "@algolia/cache-common": "4.8.3" + "@algolia/cache-common": "4.10.5" } }, "@algolia/cache-common": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.8.3.tgz", - "integrity": "sha512-Cf7zZ2i6H+tLSBTkFePHhYvlgc9fnMPKsF9qTmiU38kFIGORy/TN2Fx5n1GBuRLIzaSXvcf+oHv1HvU0u1gE1g==" + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.10.5.tgz", + "integrity": "sha512-1mClwdmTHll+OnHkG+yeRoFM17kSxDs4qXkjf6rNZhoZGXDvfYLy3YcZ1FX4Kyz0DJv8aroq5RYGBDsWkHj6Tw==" }, "@algolia/cache-in-memory": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.8.3.tgz", - "integrity": "sha512-+N7tkvmijXiDy2E7u1mM73AGEgGPWFmEmPeJS96oT46I98KXAwVPNYbcAqBE79YlixdXpkYJk41cFcORzNh+Iw==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.10.5.tgz", + "integrity": "sha512-+ciQnfIGi5wjMk02XhEY8fmy2pzy+oY1nIIfu8LBOglaSipCRAtjk6WhHc7/KIbXPiYzIwuDbM2K1+YOwSGjwA==", "requires": { - "@algolia/cache-common": "4.8.3" + "@algolia/cache-common": "4.10.5" } }, "@algolia/client-account": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.8.3.tgz", - "integrity": "sha512-Uku8LqnXBwfDCtsTCDYTUOz2/2oqcAQCKgaO0uGdIR8DTQENBXFQvzziambHdn9KuFuY+6Et9k1+cjpTPBDTBg==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.10.5.tgz", + "integrity": "sha512-I9UkSS2glXm7RBZYZIALjBMmXSQbw/fI/djPcBHxiwXIheNIlqIFl2SNPkvihpPF979BSkzjqdJNRPhE1vku3Q==", "requires": { - "@algolia/client-common": "4.8.3", - "@algolia/client-search": "4.8.3", - "@algolia/transporter": "4.8.3" + "@algolia/client-common": "4.10.5", + "@algolia/client-search": "4.10.5", + "@algolia/transporter": "4.10.5" } }, "@algolia/client-analytics": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.8.3.tgz", - "integrity": "sha512-9ensIWmjYJprZ+YjAVSZdWUG05xEnbytENXp508X59tf34IMIX8BR2xl0RjAQODtxBdAteGxuKt5THX6U9tQLA==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.10.5.tgz", + "integrity": "sha512-h2owwJSkovPxzc+xIsjY1pMl0gj+jdVwP9rcnGjlaTY2fqHbSLrR9yvGyyr6305LvTppxsQnfAbRdE/5Z3eFxw==", "requires": { - "@algolia/client-common": "4.8.3", - "@algolia/client-search": "4.8.3", - "@algolia/requester-common": "4.8.3", - "@algolia/transporter": "4.8.3" + "@algolia/client-common": "4.10.5", + "@algolia/client-search": "4.10.5", + "@algolia/requester-common": "4.10.5", + "@algolia/transporter": "4.10.5" } }, "@algolia/client-common": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.8.3.tgz", - "integrity": "sha512-TU3623AEFAWUQlDTznkgAMSYo8lfS9pNs5QYDQzkvzWdqK0GBDWthwdRfo9iIsfxiR9qdCMHqwEu+AlZMVhNSA==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.10.5.tgz", + "integrity": "sha512-21FAvIai5qm8DVmZHm2Gp4LssQ/a0nWwMchAx+1hIRj1TX7OcdW6oZDPyZ8asQdvTtK7rStQrRnD8a95SCUnzA==", "requires": { - "@algolia/requester-common": "4.8.3", - "@algolia/transporter": "4.8.3" + "@algolia/requester-common": "4.10.5", + "@algolia/transporter": "4.10.5" } }, - "@algolia/client-recommendation": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/client-recommendation/-/client-recommendation-4.8.3.tgz", - "integrity": "sha512-qysGbmkcc6Agt29E38KWJq9JuxjGsyEYoKuX9K+P5HyQh08yR/BlRYrA8mB7vT/OIUHRGFToGO6Vq/rcg0NIOQ==", + "@algolia/client-personalization": { + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.10.5.tgz", + "integrity": "sha512-nH+IyFKBi8tCyzGOanJTbXC5t4dspSovX3+ABfmwKWUYllYzmiQNFUadpb3qo+MLA3jFx5IwBesjneN6dD5o3w==", "requires": { - "@algolia/client-common": "4.8.3", - "@algolia/requester-common": "4.8.3", - "@algolia/transporter": "4.8.3" + "@algolia/client-common": "4.10.5", + "@algolia/requester-common": "4.10.5", + "@algolia/transporter": "4.10.5" } }, "@algolia/client-search": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.8.3.tgz", - "integrity": "sha512-rAnvoy3GAhbzOQVniFcKVn1eM2NX77LearzYNCbtFrFYavG+hJI187bNVmajToiuGZ10FfJvK99X2OB1AzzezQ==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.10.5.tgz", + "integrity": "sha512-1eQFMz9uodrc5OM+9HeT+hHcfR1E1AsgFWXwyJ9Q3xejA2c1c4eObGgOgC9ZoshuHHdptaTN1m3rexqAxXRDBg==", "requires": { - "@algolia/client-common": "4.8.3", - "@algolia/requester-common": "4.8.3", - "@algolia/transporter": "4.8.3" + "@algolia/client-common": "4.10.5", + "@algolia/requester-common": "4.10.5", + "@algolia/transporter": "4.10.5" } }, "@algolia/logger-common": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.8.3.tgz", - "integrity": "sha512-03wksHRbhl2DouEKnqWuUb64s1lV6kDAAabMCQ2Du1fb8X/WhDmxHC4UXMzypeOGlH5BZBsgVwSB7vsZLP3MZg==" + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.10.5.tgz", + "integrity": "sha512-gRJo9zt1UYP4k3woEmZm4iuEBIQd/FrArIsjzsL/b+ihNoOqIxZKTSuGFU4UUZOEhvmxDReiA4gzvQXG+TMTmA==" }, "@algolia/logger-console": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.8.3.tgz", - "integrity": "sha512-Npt+hI4UF8t3TLMluL5utr9Gc11BjL5kDnGZOhDOAz5jYiSO2nrHMFmnpLT4Cy/u7a5t7EB5dlypuC4/AGStkA==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.10.5.tgz", + "integrity": "sha512-4WfIbn4253EDU12u9UiYvz+QTvAXDv39mKNg9xSoMCjKE5szcQxfcSczw2byc6pYhahOJ9PmxPBfs1doqsdTKQ==", "requires": { - "@algolia/logger-common": "4.8.3" + "@algolia/logger-common": "4.10.5" } }, "@algolia/requester-browser-xhr": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.8.3.tgz", - "integrity": "sha512-/LTTIpgEmEwkyhn8yXxDdBWqXqzlgw5w2PtTpIwkSlP2/jDwdR/9w1TkFzhNbJ81ki6LAEQM5mSwoTTnbIIecg==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.10.5.tgz", + "integrity": "sha512-53/MURQEqtK+bGdfq4ITSPwTh5hnADU99qzvpAINGQveUFNSFGERipJxHjTJjIrjFz3vxj5kKwjtxDnU6ygO9g==", "requires": { - "@algolia/requester-common": "4.8.3" + "@algolia/requester-common": "4.10.5" } }, "@algolia/requester-common": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.8.3.tgz", - "integrity": "sha512-+Yo9vBkofoKR1SCqqtMnmnfq9yt/BiaDewY/6bYSMNxSYCnu2Fw1JKSIaf/4zos09PMSsxGpLohZwGas3+0GDQ==" + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.10.5.tgz", + "integrity": "sha512-UkVa1Oyuj6NPiAEt5ZvrbVopEv1m/mKqjs40KLB+dvfZnNcj+9Fry4Oxnt15HMy/HLORXsx4UwcthAvBuOXE9Q==" }, "@algolia/requester-node-http": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.8.3.tgz", - "integrity": "sha512-k2fiKIeMIFqgC01FnzII6kqC2GQBAfbNaUX4k7QCPa6P8t4sp2xE6fImOUiztLnnL3C9X9ZX6Fw3L+cudi7jvQ==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.10.5.tgz", + "integrity": "sha512-aNEKVKXL4fiiC+bS7yJwAHdxln81ieBwY3tsMCtM4zF9f5KwCzY2OtN4WKEZa5AAADVcghSAUdyjs4AcGUlO5w==", "requires": { - "@algolia/requester-common": "4.8.3" + "@algolia/requester-common": "4.10.5" } }, "@algolia/transporter": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.8.3.tgz", - "integrity": "sha512-nU7fy2iU8snxATlsks0MjMyv97QJWQmOVwTjDc+KZ4+nue8CLcgm4LA4dsTBqvxeCQIoEtt3n72GwXcaqiJSjQ==", + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.10.5.tgz", + "integrity": "sha512-F8DLkmIlvCoMwSCZA3FKHtmdjH3o5clbt0pi2ktFStVNpC6ZDmY307HcK619bKP5xW6h8sVJhcvrLB775D2cyA==", "requires": { - "@algolia/cache-common": "4.8.3", - "@algolia/logger-common": "4.8.3", - "@algolia/requester-common": "4.8.3" + "@algolia/cache-common": "4.10.5", + "@algolia/logger-common": "4.10.5", + "@algolia/requester-common": "4.10.5" } }, "@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==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz", + "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==", "requires": { - "@babel/highlight": "^7.10.4" + "@babel/highlight": "^7.14.5" } }, "@babel/compat-data": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz", - "integrity": "sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==" }, "@babel/core": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz", - "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==", - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.10", - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helpers": "^7.12.5", - "@babel/parser": "^7.12.10", - "@babel/template": "^7.12.7", - "@babel/traverse": "^7.12.10", - "@babel/types": "^7.12.10", + "version": "7.15.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz", + "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.15.4", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helpers": "^7.15.4", + "@babel/parser": "^7.15.5", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4", "convert-source-map": "^1.7.0", "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", + "gensync": "^1.0.0-beta.2", "json5": "^2.1.2", - "lodash": "^4.17.19", - "semver": "^5.4.1", + "semver": "^6.3.0", "source-map": "^0.5.0" }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, "@babel/generator": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz", - "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz", + "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==", "requires": { - "@babel/types": "^7.12.11", + "@babel/types": "^7.15.4", "jsesc": "^2.5.1", "source-map": "^0.5.0" } }, "@babel/helper-annotate-as-pure": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz", - "integrity": "sha512-XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz", + "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==", "requires": { - "@babel/types": "^7.12.10" + "@babel/types": "^7.15.4" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz", - "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz", + "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==", "requires": { - "@babel/helper-explode-assignable-expression": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-explode-assignable-expression": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-compilation-targets": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz", - "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", + "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", "requires": { - "@babel/compat-data": "^7.12.5", - "@babel/helper-validator-option": "^7.12.1", - "browserslist": "^4.14.5", - "semver": "^5.5.0" + "@babel/compat-data": "^7.15.0", + "@babel/helper-validator-option": "^7.14.5", + "browserslist": "^4.16.6", + "semver": "^6.3.0" }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, "@babel/helper-create-class-features-plugin": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz", - "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz", + "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==", "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-member-expression-to-functions": "^7.12.1", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-replace-supers": "^7.12.1", - "@babel/helper-split-export-declaration": "^7.10.4" + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz", - "integrity": "sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz", + "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==", "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-annotate-as-pure": "^7.14.5", "regexpu-core": "^4.7.1" } }, - "@babel/helper-define-map": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz", - "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", + "@babel/helper-define-polyfill-provider": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", + "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/types": "^7.10.5", - "lodash": "^4.17.19" + "@babel/helper-compilation-targets": "^7.13.0", + "@babel/helper-module-imports": "^7.12.13", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/traverse": "^7.13.0", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2", + "semver": "^6.1.2" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, "@babel/helper-explode-assignable-expression": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz", - "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz", + "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==", "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.15.4" } }, "@babel/helper-function-name": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz", - "integrity": "sha512-AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", + "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", "requires": { - "@babel/helper-get-function-arity": "^7.12.10", - "@babel/template": "^7.12.7", - "@babel/types": "^7.12.11" + "@babel/helper-get-function-arity": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-get-function-arity": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz", - "integrity": "sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", + "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", "requires": { - "@babel/types": "^7.12.10" + "@babel/types": "^7.15.4" } }, "@babel/helper-hoist-variables": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz", - "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", + "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "^7.15.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz", - "integrity": "sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", + "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", "requires": { - "@babel/types": "^7.12.7" + "@babel/types": "^7.15.4" } }, "@babel/helper-module-imports": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz", - "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", + "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", "requires": { - "@babel/types": "^7.12.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-module-transforms": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", - "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz", + "integrity": "sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==", "requires": { - "@babel/helper-module-imports": "^7.12.1", - "@babel/helper-replace-supers": "^7.12.1", - "@babel/helper-simple-access": "^7.12.1", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/helper-validator-identifier": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1", - "lodash": "^4.17.19" + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-simple-access": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/helper-validator-identifier": "^7.14.9", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-optimise-call-expression": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz", - "integrity": "sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", + "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", "requires": { - "@babel/types": "^7.12.10" + "@babel/types": "^7.15.4" } }, "@babel/helper-plugin-utils": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", - "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", + "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==" }, "@babel/helper-remap-async-to-generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz", - "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz", + "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==", "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-wrap-function": "^7.10.4", - "@babel/types": "^7.12.1" + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-wrap-function": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-replace-supers": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz", - "integrity": "sha512-q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", + "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.12.7", - "@babel/helper-optimise-call-expression": "^7.12.10", - "@babel/traverse": "^7.12.10", - "@babel/types": "^7.12.11" + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-simple-access": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", - "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", + "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.15.4" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", - "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz", + "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==", "requires": { - "@babel/types": "^7.12.1" + "@babel/types": "^7.15.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz", - "integrity": "sha512-LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", + "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", "requires": { - "@babel/types": "^7.12.11" + "@babel/types": "^7.15.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==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==" }, "@babel/helper-validator-option": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.11.tgz", - "integrity": "sha512-TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw==" + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", + "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==" }, "@babel/helper-wrap-function": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz", - "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz", + "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==", "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-function-name": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helpers": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz", - "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", + "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", "requires": { - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.12.5", - "@babel/types": "^7.12.5" + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", + "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", "requires": { - "@babel/helper-validator-identifier": "^7.10.4", + "@babel/helper-validator-identifier": "^7.14.5", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -436,128 +448,161 @@ } }, "@babel/parser": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz", - "integrity": "sha512-N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg==" + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz", + "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==" + }, + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz", + "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4", + "@babel/plugin-proposal-optional-chaining": "^7.14.5" + } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz", - "integrity": "sha512-nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz", + "integrity": "sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.12.1", - "@babel/plugin-syntax-async-generators": "^7.8.0" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.15.4", + "@babel/plugin-syntax-async-generators": "^7.8.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz", - "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz", + "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-proposal-class-static-block": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz", + "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==", + "requires": { + "@babel/helper-create-class-features-plugin": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz", - "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz", + "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-dynamic-import": "^7.8.0" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" } }, "@babel/plugin-proposal-export-namespace-from": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz", - "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz", + "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz", - "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz", + "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.0" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" } }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz", - "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz", + "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz", - "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz", + "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz", - "integrity": "sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz", + "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz", - "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz", + "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.12.1" + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.15.4" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz", - "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz", + "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz", - "integrity": "sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz", + "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", - "@babel/plugin-syntax-optional-chaining": "^7.8.0" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" } }, "@babel/plugin-proposal-private-methods": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz", - "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz", + "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" + } + }, + "@babel/plugin-proposal-private-property-in-object": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz", + "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-create-class-features-plugin": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz", - "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz", + "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-async-generators": { @@ -569,11 +614,19 @@ } }, "@babel/plugin-syntax-class-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz", - "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==", + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.12.13" + } + }, + "@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-dynamic-import": { @@ -601,11 +654,11 @@ } }, "@babel/plugin-syntax-jsx": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz", - "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz", + "integrity": "sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-logical-assignment-operators": { @@ -656,153 +709,160 @@ "@babel/helper-plugin-utils": "^7.8.0" } }, + "@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, "@babel/plugin-syntax-top-level-await": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz", - "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-syntax-typescript": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz", - "integrity": "sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz", + "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz", - "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz", + "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz", - "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz", + "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==", "requires": { - "@babel/helper-module-imports": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.12.1" + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.14.5" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz", - "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz", + "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz", - "integrity": "sha512-VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ==", + "version": "7.15.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz", + "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-classes": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz", - "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==", - "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-define-map": "^7.10.4", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.12.1", - "@babel/helper-split-export-declaration": "^7.10.4", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz", + "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==", + "requires": { + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz", - "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz", + "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-destructuring": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz", - "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==", + "version": "7.14.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz", + "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz", - "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz", + "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz", - "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz", + "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz", - "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz", + "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==", "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-for-of": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz", - "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz", + "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-function-name": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz", - "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz", + "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==", "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-function-name": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz", - "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz", + "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz", - "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz", + "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz", - "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz", + "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==", "requires": { - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", "babel-plugin-dynamic-import-node": "^2.3.3" }, "dependencies": { @@ -817,13 +877,13 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz", - "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz", + "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==", "requires": { - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-simple-access": "^7.12.1", + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-simple-access": "^7.15.4", "babel-plugin-dynamic-import-node": "^2.3.3" }, "dependencies": { @@ -838,14 +898,14 @@ } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz", - "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==", - "requires": { - "@babel/helper-hoist-variables": "^7.10.4", - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-validator-identifier": "^7.10.4", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz", + "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==", + "requires": { + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.9", "babel-plugin-dynamic-import-node": "^2.3.3" }, "dependencies": { @@ -860,278 +920,288 @@ } }, "@babel/plugin-transform-modules-umd": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz", - "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz", + "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==", "requires": { - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz", - "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz", + "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1" + "@babel/helper-create-regexp-features-plugin": "^7.14.5" } }, "@babel/plugin-transform-new-target": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz", - "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz", + "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-object-super": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz", - "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz", + "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-replace-supers": "^7.14.5" } }, "@babel/plugin-transform-parameters": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz", - "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz", + "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-property-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz", - "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz", + "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-react-constant-elements": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.1.tgz", - "integrity": "sha512-KOHd0tIRLoER+J+8f9DblZDa1fLGPwaaN1DI1TVHuQFOpjHV22C3CUB3obeC4fexHY9nx+fH0hQNvLFFfA1mxA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.14.5.tgz", + "integrity": "sha512-NBqLEx1GxllIOXJInJAQbrnwwYJsV3WaMHIcOwD8rhYS0AabTWn7kHdHgPgu5RmHLU0q4DMxhAMu8ue/KampgQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-react-display-name": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz", - "integrity": "sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==", + "version": "7.15.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz", + "integrity": "sha512-yQZ/i/pUCJAHI/LbtZr413S3VT26qNrEm0M5RRxQJA947/YNYwbZbBaXGDrq6CG5QsZycI1VIP6d7pQaBfP+8Q==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-react-jsx": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz", - "integrity": "sha512-JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz", + "integrity": "sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw==", "requires": { - "@babel/helper-annotate-as-pure": "^7.12.10", - "@babel/helper-module-imports": "^7.12.5", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-jsx": "^7.12.1", - "@babel/types": "^7.12.12" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-jsx": "^7.14.5", + "@babel/types": "^7.14.9" } }, "@babel/plugin-transform-react-jsx-development": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.12.tgz", - "integrity": "sha512-i1AxnKxHeMxUaWVXQOSIco4tvVvvCxMSfeBMnMM06mpaJt3g+MpxYQQrDfojUQldP1xxraPSJYSMEljoWM/dCg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz", + "integrity": "sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ==", "requires": { - "@babel/plugin-transform-react-jsx": "^7.12.12" + "@babel/plugin-transform-react-jsx": "^7.14.5" } }, "@babel/plugin-transform-react-pure-annotations": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz", - "integrity": "sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz", + "integrity": "sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g==", "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-annotate-as-pure": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-regenerator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz", - "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz", + "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==", "requires": { "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz", - "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz", + "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-runtime": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz", - "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==", - "requires": { - "@babel/helper-module-imports": "^7.12.5", - "@babel/helper-plugin-utils": "^7.10.4", - "semver": "^5.5.1" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz", + "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==", + "requires": { + "@babel/helper-module-imports": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.2", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "semver": "^6.3.0" }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz", - "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz", + "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-spread": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz", - "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==", + "version": "7.14.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz", + "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz", - "integrity": "sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz", + "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-template-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz", - "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz", + "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz", - "integrity": "sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz", + "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-typescript": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz", - "integrity": "sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz", + "integrity": "sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==", "requires": { - "@babel/helper-create-class-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-typescript": "^7.12.1" + "@babel/helper-create-class-features-plugin": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/plugin-syntax-typescript": "^7.14.5" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz", - "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz", + "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz", - "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz", + "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==", "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.14.5", + "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/preset-env": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz", - "integrity": "sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==", - "requires": { - "@babel/compat-data": "^7.12.7", - "@babel/helper-compilation-targets": "^7.12.5", - "@babel/helper-module-imports": "^7.12.5", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-validator-option": "^7.12.11", - "@babel/plugin-proposal-async-generator-functions": "^7.12.1", - "@babel/plugin-proposal-class-properties": "^7.12.1", - "@babel/plugin-proposal-dynamic-import": "^7.12.1", - "@babel/plugin-proposal-export-namespace-from": "^7.12.1", - "@babel/plugin-proposal-json-strings": "^7.12.1", - "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", - "@babel/plugin-proposal-numeric-separator": "^7.12.7", - "@babel/plugin-proposal-object-rest-spread": "^7.12.1", - "@babel/plugin-proposal-optional-catch-binding": "^7.12.1", - "@babel/plugin-proposal-optional-chaining": "^7.12.7", - "@babel/plugin-proposal-private-methods": "^7.12.1", - "@babel/plugin-proposal-unicode-property-regex": "^7.12.1", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-class-properties": "^7.12.1", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.6.tgz", + "integrity": "sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==", + "requires": { + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4", + "@babel/plugin-proposal-async-generator-functions": "^7.15.4", + "@babel/plugin-proposal-class-properties": "^7.14.5", + "@babel/plugin-proposal-class-static-block": "^7.15.4", + "@babel/plugin-proposal-dynamic-import": "^7.14.5", + "@babel/plugin-proposal-export-namespace-from": "^7.14.5", + "@babel/plugin-proposal-json-strings": "^7.14.5", + "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", + "@babel/plugin-proposal-numeric-separator": "^7.14.5", + "@babel/plugin-proposal-object-rest-spread": "^7.15.6", + "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5", + "@babel/plugin-proposal-private-methods": "^7.14.5", + "@babel/plugin-proposal-private-property-in-object": "^7.15.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.12.1", - "@babel/plugin-transform-arrow-functions": "^7.12.1", - "@babel/plugin-transform-async-to-generator": "^7.12.1", - "@babel/plugin-transform-block-scoped-functions": "^7.12.1", - "@babel/plugin-transform-block-scoping": "^7.12.11", - "@babel/plugin-transform-classes": "^7.12.1", - "@babel/plugin-transform-computed-properties": "^7.12.1", - "@babel/plugin-transform-destructuring": "^7.12.1", - "@babel/plugin-transform-dotall-regex": "^7.12.1", - "@babel/plugin-transform-duplicate-keys": "^7.12.1", - "@babel/plugin-transform-exponentiation-operator": "^7.12.1", - "@babel/plugin-transform-for-of": "^7.12.1", - "@babel/plugin-transform-function-name": "^7.12.1", - "@babel/plugin-transform-literals": "^7.12.1", - "@babel/plugin-transform-member-expression-literals": "^7.12.1", - "@babel/plugin-transform-modules-amd": "^7.12.1", - "@babel/plugin-transform-modules-commonjs": "^7.12.1", - "@babel/plugin-transform-modules-systemjs": "^7.12.1", - "@babel/plugin-transform-modules-umd": "^7.12.1", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1", - "@babel/plugin-transform-new-target": "^7.12.1", - "@babel/plugin-transform-object-super": "^7.12.1", - "@babel/plugin-transform-parameters": "^7.12.1", - "@babel/plugin-transform-property-literals": "^7.12.1", - "@babel/plugin-transform-regenerator": "^7.12.1", - "@babel/plugin-transform-reserved-words": "^7.12.1", - "@babel/plugin-transform-shorthand-properties": "^7.12.1", - "@babel/plugin-transform-spread": "^7.12.1", - "@babel/plugin-transform-sticky-regex": "^7.12.7", - "@babel/plugin-transform-template-literals": "^7.12.1", - "@babel/plugin-transform-typeof-symbol": "^7.12.10", - "@babel/plugin-transform-unicode-escapes": "^7.12.1", - "@babel/plugin-transform-unicode-regex": "^7.12.1", - "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.12.11", - "core-js-compat": "^3.8.0", - "semver": "^5.5.0" + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-transform-arrow-functions": "^7.14.5", + "@babel/plugin-transform-async-to-generator": "^7.14.5", + "@babel/plugin-transform-block-scoped-functions": "^7.14.5", + "@babel/plugin-transform-block-scoping": "^7.15.3", + "@babel/plugin-transform-classes": "^7.15.4", + "@babel/plugin-transform-computed-properties": "^7.14.5", + "@babel/plugin-transform-destructuring": "^7.14.7", + "@babel/plugin-transform-dotall-regex": "^7.14.5", + "@babel/plugin-transform-duplicate-keys": "^7.14.5", + "@babel/plugin-transform-exponentiation-operator": "^7.14.5", + "@babel/plugin-transform-for-of": "^7.15.4", + "@babel/plugin-transform-function-name": "^7.14.5", + "@babel/plugin-transform-literals": "^7.14.5", + "@babel/plugin-transform-member-expression-literals": "^7.14.5", + "@babel/plugin-transform-modules-amd": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.15.4", + "@babel/plugin-transform-modules-systemjs": "^7.15.4", + "@babel/plugin-transform-modules-umd": "^7.14.5", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", + "@babel/plugin-transform-new-target": "^7.14.5", + "@babel/plugin-transform-object-super": "^7.14.5", + "@babel/plugin-transform-parameters": "^7.15.4", + "@babel/plugin-transform-property-literals": "^7.14.5", + "@babel/plugin-transform-regenerator": "^7.14.5", + "@babel/plugin-transform-reserved-words": "^7.14.5", + "@babel/plugin-transform-shorthand-properties": "^7.14.5", + "@babel/plugin-transform-spread": "^7.14.6", + "@babel/plugin-transform-sticky-regex": "^7.14.5", + "@babel/plugin-transform-template-literals": "^7.14.5", + "@babel/plugin-transform-typeof-symbol": "^7.14.5", + "@babel/plugin-transform-unicode-escapes": "^7.14.5", + "@babel/plugin-transform-unicode-regex": "^7.14.5", + "@babel/preset-modules": "^0.1.4", + "@babel/types": "^7.15.6", + "babel-plugin-polyfill-corejs2": "^0.2.2", + "babel-plugin-polyfill-corejs3": "^0.2.2", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "core-js-compat": "^3.16.0", + "semver": "^6.3.0" }, "dependencies": { "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, @@ -1148,321 +1218,331 @@ } }, "@babel/preset-react": { - "version": "7.12.10", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.12.10.tgz", - "integrity": "sha512-vtQNjaHRl4DUpp+t+g4wvTHsLQuye+n0H/wsXIZRn69oz/fvNC7gQ4IK73zGJBaxvHoxElDvnYCthMcT7uzFoQ==", + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.14.5.tgz", + "integrity": "sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-transform-react-display-name": "^7.12.1", - "@babel/plugin-transform-react-jsx": "^7.12.10", - "@babel/plugin-transform-react-jsx-development": "^7.12.7", - "@babel/plugin-transform-react-pure-annotations": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-transform-react-display-name": "^7.14.5", + "@babel/plugin-transform-react-jsx": "^7.14.5", + "@babel/plugin-transform-react-jsx-development": "^7.14.5", + "@babel/plugin-transform-react-pure-annotations": "^7.14.5" } }, "@babel/preset-typescript": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz", - "integrity": "sha512-nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz", + "integrity": "sha512-lt0Y/8V3y06Wq/8H/u0WakrqciZ7Fz7mwPDHWUJAXlABL5hiUG42BNlRXiELNjeWjO5rWmnNKlx+yzJvxezHow==", "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-validator-option": "^7.12.1", - "@babel/plugin-transform-typescript": "^7.12.1" + "@babel/helper-plugin-utils": "^7.14.5", + "@babel/helper-validator-option": "^7.14.5", + "@babel/plugin-transform-typescript": "^7.15.0" } }, "@babel/runtime": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", - "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz", - "integrity": "sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz", + "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==", "requires": { - "core-js-pure": "^3.0.0", + "core-js-pure": "^3.16.0", "regenerator-runtime": "^0.13.4" } }, "@babel/template": { - "version": "7.12.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz", - "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", + "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/parser": "^7.12.7", - "@babel/types": "^7.12.7" + "@babel/code-frame": "^7.14.5", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/traverse": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz", - "integrity": "sha512-s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w==", - "requires": { - "@babel/code-frame": "^7.12.11", - "@babel/generator": "^7.12.11", - "@babel/helper-function-name": "^7.12.11", - "@babel/helper-split-export-declaration": "^7.12.11", - "@babel/parser": "^7.12.11", - "@babel/types": "^7.12.12", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", + "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", + "requires": { + "@babel/code-frame": "^7.14.5", + "@babel/generator": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4", "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" + "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.12.12", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz", - "integrity": "sha512-lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "requires": { - "@babel/helper-validator-identifier": "^7.12.11", - "lodash": "^4.17.19", + "@babel/helper-validator-identifier": "^7.14.9", "to-fast-properties": "^2.0.0" } }, - "@csstools/convert-colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz", - "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==" - }, "@docsearch/css": { - "version": "3.0.0-alpha.32", - "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.0.0-alpha.32.tgz", - "integrity": "sha512-wafLX/jT1NPAwifPhzMJX394PjKdqf5TA4cz/JgvBYR1/+MiErLk/pyCmocXkawWGR17/6u2qw3wYvXu/Qe/DQ==" + "version": "3.0.0-alpha.40", + "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.0.0-alpha.40.tgz", + "integrity": "sha512-PrOTPgJMl+Iji1zOH0+J0PEDMriJ1teGxbgll7o4h8JrvJW6sJGqQw7/bLW7enWiFaxbJMK76w1yyPNLFHV7Qg==" }, "@docsearch/react": { - "version": "3.0.0-alpha.32", - "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.0.0-alpha.32.tgz", - "integrity": "sha512-2jqzPJu4y0mWiwwm+Kfgf/97Q8XaGxj1+jJfGJpJLkJyD8S2tK4OikyIRWI9gI9k3m48HxFm0+P8uAYYtIyjqA==", + "version": "3.0.0-alpha.40", + "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.0.0-alpha.40.tgz", + "integrity": "sha512-aKxnu7sgpP1R7jtgOV/pZdJEHXx6Ts+jnS9U/ejSUS2BMUpwQI5SA3oLs1BA5TA9kIViJ5E+rrjh0VsbcsJ6sQ==", "requires": { - "@algolia/autocomplete-core": "^1.0.0-alpha.35", - "@algolia/autocomplete-preset-algolia": "^1.0.0-alpha.35", - "@docsearch/css": "3.0.0-alpha.32", + "@algolia/autocomplete-core": "1.2.2", + "@algolia/autocomplete-preset-algolia": "1.2.2", + "@docsearch/css": "3.0.0-alpha.40", "algoliasearch": "^4.0.0" } }, "@docusaurus/core": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-2.0.0-alpha.70.tgz", - "integrity": "sha512-ccDcr5eb5T3C6k7VoqTclBFwjVkIHK1zISdhqzRNVl8AZTql1bYMvGUJP+2WbF6RSdmsGTNWreaUlrJc00dQqw==", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/core/-/core-2.0.0-beta.6.tgz", + "integrity": "sha512-XMeI+lJKeJBGYBNOfO/Tc+5FMf21E5p1xZjfe75cgYcfZdERZ+W7aemXquwReno8xxHb4Rnfmi9dxkbOLDjqDA==", "requires": { - "@babel/core": "^7.12.3", - "@babel/generator": "^7.12.5", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", - "@babel/plugin-proposal-optional-chaining": "^7.12.1", + "@babel/core": "^7.12.16", + "@babel/generator": "^7.12.15", "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.12.1", - "@babel/preset-env": "^7.12.1", - "@babel/preset-react": "^7.12.5", - "@babel/preset-typescript": "^7.12.1", + "@babel/plugin-transform-runtime": "^7.12.15", + "@babel/preset-env": "^7.12.16", + "@babel/preset-react": "^7.12.13", + "@babel/preset-typescript": "^7.12.16", "@babel/runtime": "^7.12.5", - "@babel/runtime-corejs3": "^7.12.5", - "@babel/traverse": "^7.12.5", - "@docusaurus/cssnano-preset": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", - "@docusaurus/utils-validation": "2.0.0-alpha.70", - "@endiliey/static-site-generator-webpack-plugin": "^4.0.0", - "@svgr/webpack": "^5.4.0", - "babel-loader": "^8.2.1", + "@babel/runtime-corejs3": "^7.12.13", + "@babel/traverse": "^7.12.13", + "@docusaurus/cssnano-preset": "2.0.0-beta.6", + "@docusaurus/react-loadable": "5.5.0", + "@docusaurus/types": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "@docusaurus/utils-common": "2.0.0-beta.6", + "@docusaurus/utils-validation": "2.0.0-beta.6", + "@slorber/static-site-generator-webpack-plugin": "^4.0.0", + "@svgr/webpack": "^5.5.0", + "autoprefixer": "^10.2.5", + "babel-loader": "^8.2.2", "babel-plugin-dynamic-import-node": "2.3.0", - "boxen": "^4.2.0", - "cache-loader": "^4.1.0", - "chalk": "^3.0.0", - "chokidar": "^3.4.3", - "clean-css": "^4.2.3", - "commander": "^4.0.1", - "copy-webpack-plugin": "^6.3.0", - "core-js": "^2.6.5", - "css-loader": "^3.4.2", - "del": "^5.1.0", + "boxen": "^5.0.1", + "chalk": "^4.1.1", + "chokidar": "^3.5.1", + "clean-css": "^5.1.5", + "commander": "^5.1.0", + "copy-webpack-plugin": "^9.0.0", + "core-js": "^3.9.1", + "css-loader": "^5.1.1", + "css-minimizer-webpack-plugin": "^3.0.1", + "cssnano": "^5.0.4", + "del": "^6.0.0", "detect-port": "^1.3.0", - "eta": "^1.11.0", + "escape-html": "^1.0.3", + "eta": "^1.12.1", "express": "^4.17.1", "file-loader": "^6.2.0", - "fs-extra": "^9.0.1", - "globby": "^10.0.1", + "fs-extra": "^10.0.0", + "github-slugger": "^1.3.0", + "globby": "^11.0.2", "html-minifier-terser": "^5.1.1", "html-tags": "^3.1.0", - "html-webpack-plugin": "^4.5.0", - "import-fresh": "^3.2.2", - "inquirer": "^7.2.0", + "html-webpack-plugin": "^5.3.2", + "import-fresh": "^3.3.0", "is-root": "^2.1.0", - "joi": "^17.2.1", "leven": "^3.1.0", "lodash": "^4.17.20", - "lodash.flatmap": "^4.5.0", - "lodash.has": "^4.5.2", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "mini-css-extract-plugin": "^0.8.0", + "mini-css-extract-plugin": "^1.6.0", + "module-alias": "^2.2.2", "nprogress": "^0.2.0", - "null-loader": "^3.0.0", - "optimize-css-assets-webpack-plugin": "^5.0.4", - "pnp-webpack-plugin": "^1.6.4", - "postcss-loader": "^3.0.0", - "postcss-preset-env": "^6.7.0", - "react-dev-utils": "^10.2.1", + "postcss": "^8.2.15", + "postcss-loader": "^5.3.0", + "prompts": "^2.4.1", + "react-dev-utils": "^11.0.1", + "react-error-overlay": "^6.0.9", "react-helmet": "^6.1.0", "react-loadable": "^5.5.0", - "react-loadable-ssr-addon": "^0.3.0", + "react-loadable-ssr-addon-v5-slorber": "^1.0.1", "react-router": "^5.2.0", "react-router-config": "^5.1.1", "react-router-dom": "^5.2.0", + "remark-admonitions": "^1.2.1", "resolve-pathname": "^3.0.0", - "semver": "^6.3.0", + "rtl-detect": "^1.0.3", + "semver": "^7.3.4", "serve-handler": "^6.1.3", "shelljs": "^0.8.4", "std-env": "^2.2.1", - "terser-webpack-plugin": "^4.1.0", - "update-notifier": "^4.1.0", + "strip-ansi": "^6.0.0", + "terser-webpack-plugin": "^5.1.3", + "tslib": "^2.2.0", + "update-notifier": "^5.1.0", "url-loader": "^4.1.1", - "wait-on": "^5.2.0", - "webpack": "^4.44.1", - "webpack-bundle-analyzer": "^3.6.1", - "webpack-dev-server": "^3.11.0", - "webpack-merge": "^4.2.2", - "webpackbar": "^4.0.0" + "wait-on": "^5.3.0", + "webpack": "^5.40.0", + "webpack-bundle-analyzer": "^4.4.2", + "webpack-dev-server": "^3.11.2", + "webpack-merge": "^5.8.0", + "webpackbar": "^5.0.0-3" } }, "@docusaurus/cssnano-preset": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-alpha.70.tgz", - "integrity": "sha512-Zwk3SrlE5r/z5j/tjDcs4XoyeoyymCtEovoxLWLV7wb+iR1qb+Jdso4TRShAepbW/ff6SzjCZ8hRy8ahXPD9TA==", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/cssnano-preset/-/cssnano-preset-2.0.0-beta.6.tgz", + "integrity": "sha512-RCizp2NAbADopkX5nUz1xrAbU6hGZzziQk9RdSDGJLzMgVCN6RDotq9odS8VgzNa9x2Lx3WN527UxeEbzc2GVQ==", "requires": { - "cssnano-preset-advanced": "^4.0.7", - "postcss": "^7.0.2", - "postcss-combine-duplicated-selectors": "^9.1.0", - "postcss-sort-media-queries": "^1.7.26" + "cssnano-preset-advanced": "^5.1.1", + "postcss": "^8.2.15", + "postcss-sort-media-queries": "^3.10.11" } }, "@docusaurus/mdx-loader": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-alpha.70.tgz", - "integrity": "sha512-CDR4O4z7wO5/S8O3TAggCynnuBIGIlUT9q9uhhkDe8h5XDhF8n8d6bwqir0O+fUMN3EnyrMq6z1g4IDRB5G2vw==", - "requires": { - "@babel/parser": "^7.12.5", - "@babel/traverse": "^7.12.5", - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/mdx-loader/-/mdx-loader-2.0.0-beta.6.tgz", + "integrity": "sha512-yO6N+OESR77WZ/pXz7muOJGLletYYksx7s7wrwrr0x+A8tzdSwiHZ9op0NyjjpW5AnItU/WQQfcjv37qv4K6HA==", + "requires": { + "@babel/parser": "^7.12.16", + "@babel/traverse": "^7.12.13", + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", "@mdx-js/mdx": "^1.6.21", "@mdx-js/react": "^1.6.21", + "chalk": "^4.1.1", "escape-html": "^1.0.3", "file-loader": "^6.2.0", - "fs-extra": "^9.0.1", + "fs-extra": "^10.0.0", "github-slugger": "^1.3.0", - "gray-matter": "^4.0.2", - "loader-utils": "^2.0.0", - "mdast-util-to-string": "^1.1.0", + "gray-matter": "^4.0.3", + "mdast-util-to-string": "^2.0.0", "remark-emoji": "^2.1.0", "stringify-object": "^3.3.0", "unist-util-visit": "^2.0.2", "url-loader": "^4.1.1", - "webpack": "^4.44.1" + "webpack": "^5.40.0" } }, "@docusaurus/plugin-content-blog": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-alpha.70.tgz", - "integrity": "sha512-qWXlSDovkhCZLJR0Wz4e3YcNjlelpuSNkS1rJ8sI1ehs/n32lj7A/nVoRfS/LnOMfIciY48vVPr64VLb6dfEeg==", - "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/mdx-loader": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", - "@docusaurus/utils-validation": "2.0.0-alpha.70", - "chalk": "^3.0.0", - "feed": "^4.2.1", - "fs-extra": "^9.0.1", - "globby": "^10.0.1", - "joi": "^17.2.1", - "loader-utils": "^1.2.3", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.6.tgz", + "integrity": "sha512-ohfMt7+rPiFQImc4Clpvc9m/1yWUQAjpG3e/coJywlJYbDXvi1pmH0VKkDUMBSe/35Wtz9457DYgNFG81lhV7Q==", + "requires": { + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/mdx-loader": "2.0.0-beta.6", + "@docusaurus/types": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "@docusaurus/utils-validation": "2.0.0-beta.6", + "chalk": "^4.1.1", + "escape-string-regexp": "^4.0.0", + "feed": "^4.2.2", + "fs-extra": "^10.0.0", + "globby": "^11.0.2", + "js-yaml": "^4.0.0", + "loader-utils": "^2.0.0", "lodash": "^4.17.20", - "reading-time": "^1.2.0", + "reading-time": "^1.3.0", "remark-admonitions": "^1.2.1", - "webpack": "^4.44.1" + "tslib": "^2.2.0", + "webpack": "^5.40.0" }, "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "argparse": "^2.0.1" } } } }, "@docusaurus/plugin-content-docs": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-alpha.70.tgz", - "integrity": "sha512-LZre12Q0sxLgi2XgjQbNQMV+jFG7v0+8hRzgBL+iCRiLCa4NlV7+M6mEHJGJJXSKqbfH7CelaUOESqEgPpVQXQ==", - "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/mdx-loader": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", - "@docusaurus/utils-validation": "2.0.0-alpha.70", - "chalk": "^3.0.0", - "execa": "^3.4.0", - "fs-extra": "^9.0.1", - "globby": "^10.0.1", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.0.0-beta.6.tgz", + "integrity": "sha512-cM5WWogWmX+qKPKv332eDWGRVVT5OjskbmFKe2QimwoaON3Cv6XY8Fo2xdYopqGIU0r0z8dVtRmoGS0ji7zB7w==", + "requires": { + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/mdx-loader": "2.0.0-beta.6", + "@docusaurus/types": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "@docusaurus/utils-validation": "2.0.0-beta.6", + "chalk": "^4.1.1", + "combine-promises": "^1.1.0", + "escape-string-regexp": "^4.0.0", + "execa": "^5.0.0", + "fs-extra": "^10.0.0", + "globby": "^11.0.2", "import-fresh": "^3.2.2", - "joi": "^17.2.1", + "js-yaml": "^4.0.0", "loader-utils": "^1.2.3", - "lodash": "^4.17.19", - "lodash.flatmap": "^4.5.0", - "lodash.groupby": "^4.6.0", - "lodash.pick": "^4.4.0", - "lodash.pickby": "^4.6.0", - "lodash.sortby": "^4.6.0", + "lodash": "^4.17.20", "remark-admonitions": "^1.2.1", "shelljs": "^0.8.4", + "tslib": "^2.2.0", "utility-types": "^3.10.0", - "webpack": "^4.44.1" + "webpack": "^5.40.0" }, "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + }, "execa": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", - "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", + "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.0", - "onetime": "^5.1.0", - "p-finally": "^2.0.0", - "signal-exit": "^3.0.2", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "requires": { - "pump": "^3.0.0" - } + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" }, "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==" + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "requires": { + "argparse": "^2.0.1" + } }, "json5": { "version": "1.0.1", @@ -1489,233 +1569,238 @@ "requires": { "path-key": "^3.0.0" } - }, - "p-finally": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", - "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==" } } }, "@docusaurus/plugin-content-pages": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-alpha.70.tgz", - "integrity": "sha512-HiFa5l1RDs155ATyYKkPtyIs/d6WJgSAyVfY5ji0Bsixp/K/Kh9YUZYMeTfeMIdhGYe3AAJz+PSZHYRpwTo1wA==", - "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/mdx-loader": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", - "@docusaurus/utils-validation": "2.0.0-alpha.70", - "globby": "^10.0.1", - "joi": "^17.2.1", - "loader-utils": "^1.2.3", - "lodash": "^4.17.19", - "minimatch": "^3.0.4", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.0.0-beta.6.tgz", + "integrity": "sha512-N6wARzOA8gTFeBXZSKbAN5s1Ej6R/pVg+J946E8GCYefXTFikTNRQ8+OPhax4MRzgzoOvhTQbLbRCSoAzSmjig==", + "requires": { + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/mdx-loader": "2.0.0-beta.6", + "@docusaurus/types": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "@docusaurus/utils-validation": "2.0.0-beta.6", + "globby": "^11.0.2", + "lodash": "^4.17.20", "remark-admonitions": "^1.2.1", - "slash": "^3.0.0", - "webpack": "^4.44.1" + "tslib": "^2.1.0", + "webpack": "^5.40.0" + } + }, + "@docusaurus/plugin-debug": { + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-beta.6.tgz", + "integrity": "sha512-TJXDBR2Gr/mhBrcj+/4+rTShSm/Qg56Jfezbm/2fFvuPgVlUwy6oj08s2/kYSTmkfG7G+c4iX1GBHjtyo1KxZA==", + "requires": { + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/types": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "fs-extra": "^9.1.0", + "react-json-view": "^1.21.3", + "tslib": "^2.1.0" }, "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" } } } }, - "@docusaurus/plugin-debug": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/plugin-debug/-/plugin-debug-2.0.0-alpha.70.tgz", - "integrity": "sha512-h/x5KtS/YJerhY6C6sJOaP9gMaSVnjj1qZ6r9E/IFujQJ7bSKnk1unqBQpVXADkQhP081ENPL01ubc0/JbE1Mw==", - "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", - "react-json-view": "^1.19.1" - } - }, "@docusaurus/plugin-google-analytics": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-alpha.70.tgz", - "integrity": "sha512-Ah9W83ZnA0VvmflKNuGq5f/CaEjWJxhjkISQn09/ykEvXfWV33000Bhck4RoCr5YxD+GBEBT5suG5LKH7Qkigw==", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.0.0-beta.6.tgz", + "integrity": "sha512-AHbMNPN3gkWXYFnmHL9MBcRODByAgzHZoH/5v3xwbSV2FOZo6kx4Hp94I6oFM0o5mp+i6X7slDncgGTWSGxCMg==", "requires": { - "@docusaurus/core": "2.0.0-alpha.70" + "@docusaurus/core": "2.0.0-beta.6" } }, "@docusaurus/plugin-google-gtag": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-alpha.70.tgz", - "integrity": "sha512-K3s894PqMPQnGXEZs0bSs2bRE3bVXFYSb/RN+K9sNd7zxGuOX4UytuvpXP+1r0Hj/YTwQIjj7AKsND0ZpDJHyw==", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.0.0-beta.6.tgz", + "integrity": "sha512-uJyQ30sXbVRS3TGtVJFA0s1ozrluuREu6NK2Z3TLtKpeT2NTe5iaqXN0Xp749hr3bjbgpEe6gMixVh//jg503w==", "requires": { - "@docusaurus/core": "2.0.0-alpha.70" + "@docusaurus/core": "2.0.0-beta.6" } }, "@docusaurus/plugin-sitemap": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-alpha.70.tgz", - "integrity": "sha512-ev9yNLPoeHP03jTz67daGd7yA7YhUwHeoWz14SyiKuU7OYtwL/8SJTn/V5kMDRl7o8FRQt9T//mRkpa270hmXw==", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.0.0-beta.6.tgz", + "integrity": "sha512-jpTaODqyCgg+20RtMw8gSvCKQOvH18FpKhIu6FG+z4zgHP33qaJouVM7/1ZKPrfNt4z7xDOyBNUzzdmpssHA8A==", "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70", - "fs-extra": "^9.0.1", - "joi": "^17.2.1", - "sitemap": "^3.2.2" + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/types": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "@docusaurus/utils-common": "2.0.0-beta.6", + "@docusaurus/utils-validation": "2.0.0-beta.6", + "fs-extra": "^10.0.0", + "sitemap": "^7.0.0", + "tslib": "^2.2.0" } }, "@docusaurus/preset-classic": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.0.0-alpha.70.tgz", - "integrity": "sha512-Zx98KryJjHiqzGisWKR0glXl0HXuf/YbcK9yUl6ySyS+6cIMAuGMS0HGLgbvvEmYjywz7nMLpijzGderEOihjQ==", - "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/plugin-content-blog": "2.0.0-alpha.70", - "@docusaurus/plugin-content-docs": "2.0.0-alpha.70", - "@docusaurus/plugin-content-pages": "2.0.0-alpha.70", - "@docusaurus/plugin-debug": "2.0.0-alpha.70", - "@docusaurus/plugin-google-analytics": "2.0.0-alpha.70", - "@docusaurus/plugin-google-gtag": "2.0.0-alpha.70", - "@docusaurus/plugin-sitemap": "2.0.0-alpha.70", - "@docusaurus/theme-classic": "2.0.0-alpha.70", - "@docusaurus/theme-search-algolia": "2.0.0-alpha.70" + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/preset-classic/-/preset-classic-2.0.0-beta.6.tgz", + "integrity": "sha512-riqQRcNssNH7oto8nAjYIO79/ZucidexHTDlgD+trP56ploHLJp4kIlxb44IGOmx3es8/z4egWtM+acY/39N2Q==", + "requires": { + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/plugin-content-blog": "2.0.0-beta.6", + "@docusaurus/plugin-content-docs": "2.0.0-beta.6", + "@docusaurus/plugin-content-pages": "2.0.0-beta.6", + "@docusaurus/plugin-debug": "2.0.0-beta.6", + "@docusaurus/plugin-google-analytics": "2.0.0-beta.6", + "@docusaurus/plugin-google-gtag": "2.0.0-beta.6", + "@docusaurus/plugin-sitemap": "2.0.0-beta.6", + "@docusaurus/theme-classic": "2.0.0-beta.6", + "@docusaurus/theme-search-algolia": "2.0.0-beta.6" + } + }, + "@docusaurus/react-loadable": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@docusaurus/react-loadable/-/react-loadable-5.5.0.tgz", + "integrity": "sha512-Ld/kwUE6yATIOTLq3JCsWiTa/drisajwKqBQ2Rw6IcT+sFsKfYek8F2jSH8f68AT73xX97UehduZeCSlnuCBIg==", + "requires": { + "prop-types": "^15.6.2" } }, "@docusaurus/theme-classic": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.0.0-alpha.70.tgz", - "integrity": "sha512-lKU+fgSd08fo3LNYTw31Wty7RgAdFm8bEOwBNkKZcCFnatTSG4qyDbrDZclCQT/SpXSv9XIEKUc0irg2IH6Qrg==", - "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/plugin-content-blog": "2.0.0-alpha.70", - "@docusaurus/plugin-content-docs": "2.0.0-alpha.70", - "@docusaurus/plugin-content-pages": "2.0.0-alpha.70", - "@docusaurus/theme-common": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", - "@docusaurus/utils-validation": "2.0.0-alpha.70", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/theme-classic/-/theme-classic-2.0.0-beta.6.tgz", + "integrity": "sha512-fMb6gAKUdaojInZabimIJE+yPWs8dQfmZII7v/LHmgxafh/FylmrBkKhyJfa2ix4QRibo9E01LGX44/aKzemxw==", + "requires": { + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/plugin-content-blog": "2.0.0-beta.6", + "@docusaurus/plugin-content-docs": "2.0.0-beta.6", + "@docusaurus/plugin-content-pages": "2.0.0-beta.6", + "@docusaurus/theme-common": "2.0.0-beta.6", + "@docusaurus/types": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "@docusaurus/utils-common": "2.0.0-beta.6", + "@docusaurus/utils-validation": "2.0.0-beta.6", "@mdx-js/mdx": "^1.6.21", "@mdx-js/react": "^1.6.21", - "@types/react-toggle": "^4.0.2", + "chalk": "^4.1.1", "clsx": "^1.1.1", - "copy-text-to-clipboard": "^2.2.0", - "infima": "0.2.0-alpha.18", - "joi": "^17.2.1", - "lodash": "^4.17.19", + "copy-text-to-clipboard": "^3.0.1", + "fs-extra": "^10.0.0", + "globby": "^11.0.2", + "infima": "0.2.0-alpha.33", + "lodash": "^4.17.20", "parse-numeric-range": "^1.2.0", - "prism-react-renderer": "^1.1.1", - "prismjs": "^1.22.0", + "postcss": "^8.2.15", + "prism-react-renderer": "^1.2.1", + "prismjs": "^1.23.0", "prop-types": "^15.7.2", "react-router-dom": "^5.2.0", - "react-toggle": "^4.1.1" + "rtlcss": "^3.1.2" } }, "@docusaurus/theme-common": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-2.0.0-alpha.70.tgz", - "integrity": "sha512-Ge/dLGPCJhtyvumSMg0BlWcF00d1Qd2KnHf8kL/0nTxe257yNTHIOK95LKhIPAdcVgxG+ge9N0XcBm4KaubASQ==", - "requires": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/plugin-content-blog": "2.0.0-alpha.70", - "@docusaurus/plugin-content-docs": "2.0.0-alpha.70", - "@docusaurus/plugin-content-pages": "2.0.0-alpha.70", - "@docusaurus/types": "2.0.0-alpha.70" + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/theme-common/-/theme-common-2.0.0-beta.6.tgz", + "integrity": "sha512-53nFWMjpFdyHEvBfQQQoDm9rNKgGangy7vSp1B/F3+uRyYAItE7O4l8MdOALXFALlddiiPYvCtI1qGx2dnzndA==", + "requires": { + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/plugin-content-blog": "2.0.0-beta.6", + "@docusaurus/plugin-content-docs": "2.0.0-beta.6", + "@docusaurus/plugin-content-pages": "2.0.0-beta.6", + "@docusaurus/types": "2.0.0-beta.6", + "clsx": "^1.1.1", + "fs-extra": "^10.0.0", + "tslib": "^2.1.0" } }, "@docusaurus/theme-search-algolia": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-alpha.70.tgz", - "integrity": "sha512-xuoWZ+HUKzn1A5vPlNZM8mtyRL5uo15o34OX/i7HkTRmBVymWO1bBE0lECfDVJU2JUYGmwjpDXhZzNLDZmZRWg==", - "requires": { - "@docsearch/react": "^3.0.0-alpha.31", - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/theme-common": "2.0.0-alpha.70", - "@docusaurus/utils": "2.0.0-alpha.70", - "algoliasearch": "^4.0.0", - "algoliasearch-helper": "^3.1.1", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.0.0-beta.6.tgz", + "integrity": "sha512-GaaYdf6EEKL3jwmt9LRyiMtNvobOhw4vGuYJKbJcgba/M75kOJSbZPRrhALBAe6o4gOYbV44afzFC/jUUp7dsA==", + "requires": { + "@docsearch/react": "^3.0.0-alpha.39", + "@docusaurus/core": "2.0.0-beta.6", + "@docusaurus/theme-common": "2.0.0-beta.6", + "@docusaurus/utils": "2.0.0-beta.6", + "@docusaurus/utils-validation": "2.0.0-beta.6", + "algoliasearch": "^4.8.4", + "algoliasearch-helper": "^3.3.4", "clsx": "^1.1.1", - "eta": "^1.11.0", - "joi": "^17.2.1", - "lodash": "^4.17.19" + "eta": "^1.12.1", + "lodash": "^4.17.20" } }, "@docusaurus/types": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-2.0.0-alpha.70.tgz", - "integrity": "sha512-QoHmMiJhRDq5P/4o3eUIiJebdwRjShFlal01DST5B8MZo4k0ogl57FNHqJvIHc93NgonZzFlvC/auLlBnc/d4Q==", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/types/-/types-2.0.0-beta.6.tgz", + "integrity": "sha512-TrwxyI93XTZEhOmdEI8FPKDbGV61zE9PzXCdE1alwz1NOV+YXwcv+9sRTZEVLqBpr+TIja+IeeS6mxnyen/Ptg==", "requires": { - "@types/webpack": "^4.41.0", - "commander": "^4.0.1", + "commander": "^5.1.0", + "joi": "^17.4.0", "querystring": "0.2.0", - "webpack-merge": "^4.2.2" + "webpack": "^5.40.0", + "webpack-merge": "^5.8.0" } }, "@docusaurus/utils": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.0.0-alpha.70.tgz", - "integrity": "sha512-xNSUcE7fGcneH00CPCEY0SP5V7H6pLEcu620UiU/m1367tCMsmv+MZcnII2ACcjAtvhjS22v/KLippM3VeTXqQ==", - "requires": { - "@docusaurus/types": "2.0.0-alpha.70", - "chalk": "^3.0.0", - "escape-string-regexp": "^2.0.0", - "fs-extra": "^9.0.1", - "gray-matter": "^4.0.2", + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/utils/-/utils-2.0.0-beta.6.tgz", + "integrity": "sha512-S72/o7VDaTvrXJy+NpfuctghGGoMW30m94PMkrL3I6V+o5eE2Uzax7dbM++moclmHvi0/Khv+TXmRIQs6ZvwgQ==", + "requires": { + "@docusaurus/types": "2.0.0-beta.6", + "@types/github-slugger": "^1.3.0", + "chalk": "^4.1.1", + "escape-string-regexp": "^4.0.0", + "fs-extra": "^10.0.0", + "globby": "^11.0.4", + "gray-matter": "^4.0.3", "lodash": "^4.17.20", - "lodash.camelcase": "^4.3.0", - "lodash.kebabcase": "^4.1.1", - "resolve-pathname": "^3.0.0" + "micromatch": "^4.0.4", + "resolve-pathname": "^3.0.0", + "tslib": "^2.2.0" }, "dependencies": { "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" } } }, - "@docusaurus/utils-validation": { - "version": "2.0.0-alpha.70", - "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-2.0.0-alpha.70.tgz", - "integrity": "sha512-GJonaRjiJtlCk1+RfKA9f0YwRsSRGFMVbl6DrFidTgs4FmRb0hQsN4fnllsBvBJtbDZYwPTQ3T7c4cKJ/Ll7bQ==", + "@docusaurus/utils-common": { + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/utils-common/-/utils-common-2.0.0-beta.6.tgz", + "integrity": "sha512-MKm6bJxvsYWRl072jLR60z+71tTWSxoERh2eTmCYlegFnu3Tby3HOC8I3jDcC6VpVuoDGsBGNoQbOgy2LqQbXQ==", "requires": { - "@docusaurus/utils": "2.0.0-alpha.70", - "chalk": "^3.0.0", - "joi": "^17.2.1" + "@docusaurus/types": "2.0.0-beta.6", + "tslib": "^2.2.0" } }, - "@endiliey/static-site-generator-webpack-plugin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@endiliey/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.0.tgz", - "integrity": "sha512-3MBqYCs30qk1OBRC697NqhGouYbs71D1B8hrk/AFJC6GwF2QaJOQZtA1JYAaGSe650sZ8r5ppRTtCRXepDWlng==", + "@docusaurus/utils-validation": { + "version": "2.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@docusaurus/utils-validation/-/utils-validation-2.0.0-beta.6.tgz", + "integrity": "sha512-v0nk9bpawUd2JFDFyiHDmZuMG+/O1UvxtxvcRbvrxrul+rlzD7Q9CGxMgW3Grp2OCKQ4yFXRidBIccwqON5AVw==", "requires": { - "bluebird": "^3.7.1", - "cheerio": "^0.22.0", - "eval": "^0.1.4", - "url": "^0.11.0", - "webpack-sources": "^1.4.3" + "@docusaurus/utils": "2.0.0-beta.6", + "chalk": "^4.1.1", + "joi": "^17.4.0", + "tslib": "^2.1.0" } }, "@hapi/hoek": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz", - "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==" + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz", + "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==" }, "@hapi/topo": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz", - "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", + "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", "requires": { "@hapi/hoek": "^9.0.0" } @@ -1769,10 +1854,36 @@ "source-map": "^0.5.0" } }, + "@babel/plugin-syntax-jsx": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz", + "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "unified": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz", + "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==", + "requires": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + } } } }, @@ -1786,57 +1897,38 @@ "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.22.tgz", "integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==" }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" - } - }, "@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==", "requires": { - "@nodelib/fs.stat": "2.0.4", + "@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==" }, "@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==", "requires": { - "@nodelib/fs.scandir": "2.1.4", + "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, - "@npmcli/move-file": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz", - "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==", - "requires": { - "mkdirp": "^1.0.4" - }, - "dependencies": { - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - } - } + "@polka/url": { + "version": "1.0.0-next.20", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.20.tgz", + "integrity": "sha512-88p7+M0QGxKpmnkfXjS4V26AnoC/eiqZutE8GLdaI5X12NY75bXSdTY9NkmYb2Xyk1O+MmkuO6Frmsj84V6I8Q==" }, "@sideway/address": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.0.tgz", - "integrity": "sha512-wAH/JYRXeIFQRsxerIuLjgUu2Xszam+O5xKeatJ4oudShOOirfmsQ1D6LL54XOU2tizpCYku+s1wmU0SYdpoSA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.2.tgz", + "integrity": "sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA==", "requires": { "@hapi/hoek": "^9.0.0" } @@ -1856,6 +1948,34 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" }, + "@slorber/static-site-generator-webpack-plugin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.1.tgz", + "integrity": "sha512-PSv4RIVO1Y3kvHxjvqeVisk3E9XFoO04uwYBDWe217MFqKspplYswTuKLiJu0aLORQWzuQjfVsSlLPojwfYsLw==", + "requires": { + "bluebird": "^3.7.1", + "cheerio": "^0.22.0", + "eval": "^0.1.4", + "url": "^0.11.0", + "webpack-sources": "^1.4.3" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + } + } + }, "@svgr/babel-plugin-add-jsx-attribute": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz", @@ -1948,22 +2068,127 @@ "cosmiconfig": "^7.0.0", "deepmerge": "^4.2.2", "svgo": "^1.2.2" - } - }, - "@svgr/webpack": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz", - "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==", - "requires": { - "@babel/core": "^7.12.3", - "@babel/plugin-transform-react-constant-elements": "^7.12.1", - "@babel/preset-env": "^7.12.1", - "@babel/preset-react": "^7.12.5", - "@svgr/core": "^5.5.0", - "@svgr/plugin-jsx": "^5.5.0", - "@svgr/plugin-svgo": "^5.5.0", - "loader-utils": "^2.0.0" - } + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "css-select": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", + "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", + "requires": { + "boolbase": "^1.0.0", + "css-what": "^3.2.1", + "domutils": "^1.7.0", + "nth-check": "^1.0.2" + } + }, + "css-tree": { + "version": "1.0.0-alpha.37", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", + "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", + "requires": { + "mdn-data": "2.0.4", + "source-map": "^0.6.1" + } + }, + "css-what": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", + "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==" + }, + "dom-serializer": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "requires": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + }, + "dependencies": { + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + } + } + }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "mdn-data": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", + "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" + }, + "nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "requires": { + "boolbase": "~1.0.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "svgo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", + "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", + "requires": { + "chalk": "^2.4.1", + "coa": "^2.0.2", + "css-select": "^2.0.0", + "css-select-base-adapter": "^0.1.1", + "css-tree": "1.0.0-alpha.37", + "csso": "^4.0.2", + "js-yaml": "^3.13.1", + "mkdirp": "~0.5.1", + "object.values": "^1.1.0", + "sax": "~1.2.4", + "stable": "^0.1.8", + "unquote": "~1.1.1", + "util.promisify": "~1.0.0" + } + } + } + }, + "@svgr/webpack": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz", + "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==", + "requires": { + "@babel/core": "^7.12.3", + "@babel/plugin-transform-react-constant-elements": "^7.12.1", + "@babel/preset-env": "^7.12.1", + "@babel/preset-react": "^7.12.5", + "@svgr/core": "^5.5.0", + "@svgr/plugin-jsx": "^5.5.0", + "@svgr/plugin-svgo": "^5.5.0", + "loader-utils": "^2.0.0" + } }, "@szmarczak/http-timer": { "version": "1.1.2", @@ -1973,55 +2198,83 @@ "defer-to-connect": "^1.0.1" } }, - "@types/anymatch": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz", - "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==" + "@trysound/sax": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz", + "integrity": "sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==" + }, + "@types/eslint": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.28.0.tgz", + "integrity": "sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==", + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/eslint-scope": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.1.tgz", + "integrity": "sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==", + "requires": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "@types/estree": { + "version": "0.0.50", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz", + "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" + }, + "@types/github-slugger": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@types/github-slugger/-/github-slugger-1.3.0.tgz", + "integrity": "sha512-J/rMZa7RqiH/rT29TEVZO4nBoDP9XJOjnbbIofg7GQKs4JIduEO3WLpte+6WeUz/TcrXKlY+bM7FYrp8yFB+3g==" }, "@types/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==", "requires": { "@types/minimatch": "*", "@types/node": "*" } }, "@types/hast": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.1.tgz", - "integrity": "sha512-viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz", + "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==", "requires": { "@types/unist": "*" } }, "@types/html-minifier-terser": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", - "integrity": "sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz", + "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==" }, "@types/json-schema": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", - "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==" + "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==" }, "@types/mdast": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz", - "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz", + "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==", "requires": { "@types/unist": "*" } }, "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==" }, "@types/node": { - "version": "14.14.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.17.tgz", - "integrity": "sha512-G0lD1/7qD60TJ/mZmhog76k7NcpLWkPVGgzkRy3CTlnFu4LUQh5v2Wa661z6vnXmD8EQrnALUyf0VRtrACYztw==" + "version": "16.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz", + "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==" }, "@types/parse-json": { "version": "4.0.0", @@ -2033,254 +2286,152 @@ "resolved": "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz", "integrity": "sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==" }, - "@types/prop-types": { - "version": "15.7.3", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz", - "integrity": "sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==" - }, "@types/q": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", - "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" - }, - "@types/react": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.0.tgz", - "integrity": "sha512-aj/L7RIMsRlWML3YB6KZiXB3fV2t41+5RBGYF8z+tAKU43Px8C3cYUZsDvf1/+Bm4FK21QWBrDutu8ZJ/70qOw==", - "requires": { - "@types/prop-types": "*", - "csstype": "^3.0.2" - } - }, - "@types/react-toggle": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/react-toggle/-/react-toggle-4.0.2.tgz", - "integrity": "sha512-sHqfoKFnL0YU2+OC4meNEC8Ptx9FE8/+nFeFvNcdBa6ANA8KpAzj3R9JN8GtrvlLgjKDoYgI7iILgXYcTPo2IA==", - "requires": { - "@types/react": "*" - } - }, - "@types/source-list-map": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", - "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==" - }, - "@types/tapable": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz", - "integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==" + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz", + "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" }, - "@types/uglify-js": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz", - "integrity": "sha512-7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==", + "@types/sax": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.3.tgz", + "integrity": "sha512-+QSw6Tqvs/KQpZX8DvIl3hZSjNFLW/OqE5nlyHXtTwODaJvioN2rOWpBNEWZp2HZUFhOh+VohmJku/WxEXU2XA==", "requires": { - "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==" - } + "@types/node": "*" } }, "@types/unist": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz", - "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==" - }, - "@types/webpack": { - "version": "4.41.25", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz", - "integrity": "sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==", - "requires": { - "@types/anymatch": "*", - "@types/node": "*", - "@types/tapable": "*", - "@types/uglify-js": "*", - "@types/webpack-sources": "*", - "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==" - } - } - }, - "@types/webpack-sources": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz", - "integrity": "sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg==", - "requires": { - "@types/node": "*", - "@types/source-list-map": "*", - "source-map": "^0.7.3" - }, - "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==" - } - } + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", + "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" }, "@webassemblyjs/ast": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", - "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", + "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", "requires": { - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0" + "@webassemblyjs/helper-numbers": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz", - "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==" + "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==" }, "@webassemblyjs/helper-api-error": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz", - "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==" + "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==" }, "@webassemblyjs/helper-buffer": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz", - "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==" - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz", - "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==", - "requires": { - "@webassemblyjs/wast-printer": "1.9.0" - } + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", + "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" }, - "@webassemblyjs/helper-fsm": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz", - "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==" - }, - "@webassemblyjs/helper-module-context": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz", - "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==", + "@webassemblyjs/helper-numbers": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", + "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", "requires": { - "@webassemblyjs/ast": "1.9.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.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz", - "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==" + "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==" }, "@webassemblyjs/helper-wasm-section": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz", - "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==", + "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==", "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.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.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz", - "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", + "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "requires": { "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz", - "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", + "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "requires": { "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz", - "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", + "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" }, "@webassemblyjs/wasm-edit": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz", - "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", + "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/helper-wasm-section": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-opt": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "@webassemblyjs/wast-printer": "1.9.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.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz", - "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", + "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.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.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz", - "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", + "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.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.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz", - "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==", - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-api-error": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.0" - } - }, - "@webassemblyjs/wast-parser": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz", - "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==", - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/floating-point-hex-parser": "1.9.0", - "@webassemblyjs/helper-api-error": "1.9.0", - "@webassemblyjs/helper-code-frame": "1.9.0", - "@webassemblyjs/helper-fsm": "1.9.0", - "@xtuc/long": "4.2.2" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", + "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "requires": { + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.1", + "@webassemblyjs/ieee754": "1.11.1", + "@webassemblyjs/leb128": "1.11.1", + "@webassemblyjs/utf8": "1.11.1" } }, "@webassemblyjs/wast-printer": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz", - "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", + "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0", + "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" } }, @@ -2304,14 +2455,19 @@ } }, "acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==" + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==" + }, + "acorn-import-assertions": { + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz", + "integrity": "sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==" }, "acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==" }, "address": { "version": "1.1.2", @@ -2349,30 +2505,30 @@ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==" }, "algoliasearch": { - "version": "4.8.3", - "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.8.3.tgz", - "integrity": "sha512-pljX9jEE2TQ3i1JayhG8afNdE8UuJg3O9c7unW6QO67yRWCKr6b0t5aKC3hSVtjt7pA2TQXLKoAISb4SHx9ozQ==", - "requires": { - "@algolia/cache-browser-local-storage": "4.8.3", - "@algolia/cache-common": "4.8.3", - "@algolia/cache-in-memory": "4.8.3", - "@algolia/client-account": "4.8.3", - "@algolia/client-analytics": "4.8.3", - "@algolia/client-common": "4.8.3", - "@algolia/client-recommendation": "4.8.3", - "@algolia/client-search": "4.8.3", - "@algolia/logger-common": "4.8.3", - "@algolia/logger-console": "4.8.3", - "@algolia/requester-browser-xhr": "4.8.3", - "@algolia/requester-common": "4.8.3", - "@algolia/requester-node-http": "4.8.3", - "@algolia/transporter": "4.8.3" + "version": "4.10.5", + "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.10.5.tgz", + "integrity": "sha512-KmH2XkiN+8FxhND4nWFbQDkIoU6g2OjfeU9kIv4Lb+EiOOs3Gpp7jvd+JnatsCisAZsnWQdjd7zVlW7I/85QvQ==", + "requires": { + "@algolia/cache-browser-local-storage": "4.10.5", + "@algolia/cache-common": "4.10.5", + "@algolia/cache-in-memory": "4.10.5", + "@algolia/client-account": "4.10.5", + "@algolia/client-analytics": "4.10.5", + "@algolia/client-common": "4.10.5", + "@algolia/client-personalization": "4.10.5", + "@algolia/client-search": "4.10.5", + "@algolia/logger-common": "4.10.5", + "@algolia/logger-console": "4.10.5", + "@algolia/requester-browser-xhr": "4.10.5", + "@algolia/requester-common": "4.10.5", + "@algolia/requester-node-http": "4.10.5", + "@algolia/transporter": "4.10.5" } }, "algoliasearch-helper": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.3.4.tgz", - "integrity": "sha512-1Ts2XcgGdjGlDrp3v6zbY8VW+X9+jJ5rBmtPBmXOQLd4b5t/LpJlaBdxoAnlMfVFjywP7KSAdmyFUNNYVHDyRQ==", + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.5.5.tgz", + "integrity": "sha512-JDH14gMpSj8UzEaKwVkrqKOeAOyK0dDWsFlKvWhk0Xl5yw9FyafYf1xZPb4uSXaPBAFQtUouFlR1Zt68BCY0/w==", "requires": { "events": "^1.1.1" }, @@ -2406,6 +2562,14 @@ "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==", + "requires": { + "ansi-regex": "^4.1.0" + } } } }, @@ -2415,17 +2579,17 @@ "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==" }, "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "requires": { - "type-fest": "^0.11.0" + "type-fest": "^0.21.3" }, "dependencies": { "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" } } }, @@ -2448,18 +2612,18 @@ } }, "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" + "arg": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz", + "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==" }, "argparse": { "version": "1.0.10", @@ -2504,58 +2668,11 @@ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=" - }, "asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, - "asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" - } - } - }, - "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "requires": { - "inherits": "2.0.1" - } - } - } - }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -2590,77 +2707,24 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer": { - "version": "9.8.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", - "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", - "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", + "version": "10.3.4", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz", + "integrity": "sha512-EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw==", + "requires": { + "browserslist": "^4.16.8", + "caniuse-lite": "^1.0.30001252", + "colorette": "^1.3.0", + "fraction.js": "^4.1.1", "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.32", "postcss-value-parser": "^4.1.0" } }, "axios": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", - "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", - "requires": { - "follow-redirects": "^1.10.0" - } - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - } + "follow-redirects": "^1.14.0" } }, "babel-loader": { @@ -2691,6 +2755,16 @@ "emojis-list": "^3.0.0", "json5": "^1.0.1" } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } } } }, @@ -2701,6 +2775,13 @@ "requires": { "@babel/helper-plugin-utils": "7.10.4", "@mdx-js/util": "1.6.22" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==" + } } }, "babel-plugin-dynamic-import-node": { @@ -2717,6 +2798,47 @@ "integrity": "sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==", "requires": { "@babel/helper-plugin-utils": "7.10.4" + }, + "dependencies": { + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==" + } + } + }, + "babel-plugin-polyfill-corejs2": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", + "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", + "requires": { + "@babel/compat-data": "^7.13.11", + "@babel/helper-define-polyfill-provider": "^0.2.2", + "semver": "^6.1.1" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "babel-plugin-polyfill-corejs3": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz", + "integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==", + "requires": { + "@babel/helper-define-polyfill-provider": "^0.2.2", + "core-js-compat": "^3.14.0" + } + }, + "babel-plugin-polyfill-regenerator": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", + "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", + "requires": { + "@babel/helper-define-polyfill-provider": "^0.2.2" } }, "bail": { @@ -2725,9 +2847,9 @@ "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==" }, "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==" }, "base": { "version": "0.11.2", @@ -2784,47 +2906,26 @@ "resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz", "integrity": "sha1-4pf2DX7BAUp6lxo568ipjAtoHnA=" }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - }, "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=" }, - "bfj": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz", - "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", - "requires": { - "bluebird": "^3.5.5", - "check-types": "^8.0.3", - "hoopy": "^0.1.4", - "tryer": "^1.0.1" - } - }, "big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, - "bn.js": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", - "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==" - }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -2883,25 +2984,18 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, "boxen": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", - "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz", + "integrity": "sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA==", "requires": { "ansi-align": "^3.0.0", - "camelcase": "^5.3.1", - "chalk": "^3.0.0", - "cli-boxes": "^2.2.0", - "string-width": "^4.1.0", - "term-size": "^2.1.0", - "type-fest": "^0.8.1", - "widest-line": "^3.1.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - } + "camelcase": "^6.2.0", + "chalk": "^4.1.0", + "cli-boxes": "^2.2.1", + "string-width": "^4.2.0", + "type-fest": "^0.20.2", + "widest-line": "^3.1.0", + "wrap-ansi": "^7.0.0" } }, "brace-expansion": { @@ -2921,168 +3015,33 @@ "fill-range": "^7.0.1" } }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "browserify-rsa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", - "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", - "requires": { - "bn.js": "^5.0.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", - "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - } - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "requires": { - "pako": "~1.0.5" - } - }, "browserslist": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.0.tgz", - "integrity": "sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz", + "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==", "requires": { - "caniuse-lite": "^1.0.30001165", - "colorette": "^1.2.1", - "electron-to-chromium": "^1.3.621", + "caniuse-lite": "^1.0.30001254", + "colorette": "^1.3.0", + "electron-to-chromium": "^1.3.830", "escalade": "^3.1.1", - "node-releases": "^1.1.67" - } - }, - "buffer": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "node-releases": "^1.1.75" } }, "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==" }, "buffer-indexof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==" }, - "buffer-json": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz", - "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==" - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" - }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, - "cacache": { - "version": "15.0.5", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz", - "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", - "requires": { - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.0", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - }, - "dependencies": { - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - } - } - }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -3099,39 +3058,6 @@ "unset-value": "^1.0.0" } }, - "cache-loader": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz", - "integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==", - "requires": { - "buffer-json": "^2.0.0", - "find-cache-dir": "^3.0.0", - "loader-utils": "^1.2.3", - "mkdirp": "^0.5.1", - "neo-async": "^2.6.1", - "schema-utils": "^2.0.0" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - } - } - }, "cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", @@ -3160,47 +3086,19 @@ "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" }, "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==" } } }, "call-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", - "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "requires": { "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.0" - } - }, - "call-me-maybe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", - "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=" - }, - "caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "requires": { - "callsites": "^2.0.0" - }, - "dependencies": { - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" - } - } - }, - "caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "requires": { - "caller-callsite": "^2.0.0" + "get-intrinsic": "^1.0.2" } }, "callsites": { @@ -3239,9 +3137,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001171", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001171.tgz", - "integrity": "sha512-5Alrh8TTYPG9IH4UkRqEBZoEToWRLvPbSQokvzSz0lii8/FOWKG4keO1HoYfPWs8IF/NH/dyNPg1cmJGvV3Zlg==" + "version": "1.0.30001256", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001256.tgz", + "integrity": "sha512-QirrvMLmB4txNnxiaG/xbm6FSzv9LqOZ3Jp9VtCYb3oPIfCHpr/oGn38pFq0udwlkctvXQgPthaXqJ76DaYGnA==" }, "ccount": { "version": "1.1.0", @@ -3249,9 +3147,9 @@ "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==" }, "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -3308,16 +3206,6 @@ "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==" }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" - }, - "check-types": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz", - "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==" - }, "cheerio": { "version": "0.22.0", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", @@ -3366,6 +3254,11 @@ "entities": "^1.1.1" } }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, "domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", @@ -3379,57 +3272,41 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + }, + "nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "requires": { + "boolbase": "~1.0.0" + } } } }, "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "requires": { - "anymatch": "~3.1.1", + "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", + "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.5.0" + "readdirp": "~3.6.0" } }, - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" - }, "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==", - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } - } + "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==" }, "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==" - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz", + "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==" }, "class-utils": { "version": "0.3.6", @@ -3452,15 +3329,10 @@ } } }, - "classnames": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", - "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" - }, "clean-css": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", - "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.1.5.tgz", + "integrity": "sha512-9dr/cU/LjMpU57PXlSvDkVRh0rPxJBXiBtD0+SgYt8ahTCsXtfKjCkNYgIoTC6mBg8CFr5EKhW3DKCaGMUbUfQ==", "requires": { "source-map": "~0.6.0" }, @@ -3482,30 +3354,6 @@ "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==" }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==" - }, - "clipboard": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", - "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", - "optional": true, - "requires": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "cliui": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", @@ -3525,9 +3373,37 @@ "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==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "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==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } } } }, + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } + }, "clone-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", @@ -3577,15 +3453,6 @@ "object-visit": "^1.0.0" } }, - "color": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", - "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", - "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.4" - } - }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -3599,19 +3466,20 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, - "color-string": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz", - "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==", - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } + "colord": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.7.0.tgz", + "integrity": "sha512-pZJBqsHz+pYyw3zpX6ZRXWoCHM1/cvFikY9TV8G3zcejCaKE0lhankoj8iScyrrePA8C7yJ5FStfA9zbcOnw7Q==" }, "colorette": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", - "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", + "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==" + }, + "combine-promises": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/combine-promises/-/combine-promises-1.1.0.tgz", + "integrity": "sha512-ZI9jvcLDxqwaXEixOhArm3r7ReIivsXkpbyEWyeOhzz1QS0iSgBPnWvEqvIQtYyamGCYA88gFhmUrs9hrrQ0pg==" }, "comma-separated-tokens": { "version": "1.0.8", @@ -3619,9 +3487,9 @@ "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==" }, "commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" }, "commondir": { "version": "1.0.1", @@ -3680,41 +3548,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "configstore": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", @@ -3734,19 +3567,9 @@ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==" }, "consola": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz", - "integrity": "sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ==" - }, - "console-browserify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==" - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" + "version": "2.15.3", + "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz", + "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==" }, "content-disposition": { "version": "0.5.3", @@ -3762,9 +3585,9 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "requires": { "safe-buffer": "~5.1.1" } @@ -3779,101 +3602,51 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - } - } - }, "copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "copy-text-to-clipboard": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-2.2.0.tgz", - "integrity": "sha512-WRvoIdnTs1rgPMkgA2pUOa/M4Enh2uzCwdKsOMYNAJiz/4ZvEJgmbF4OmninPmlFdAWisfeh0tH+Cpf7ni3RqQ==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz", + "integrity": "sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==" }, "copy-webpack-plugin": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz", - "integrity": "sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz", + "integrity": "sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw==", "requires": { - "cacache": "^15.0.5", - "fast-glob": "^3.2.4", - "find-cache-dir": "^3.3.1", - "glob-parent": "^5.1.1", - "globby": "^11.0.1", - "loader-utils": "^2.0.0", + "fast-glob": "^3.2.5", + "glob-parent": "^6.0.0", + "globby": "^11.0.3", "normalize-path": "^3.0.0", - "p-limit": "^3.0.2", + "p-limit": "^3.1.0", "schema-utils": "^3.0.0", - "serialize-javascript": "^5.0.1", - "webpack-sources": "^1.4.3" + "serialize-javascript": "^6.0.0" }, "dependencies": { - "globby": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", - "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", - "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" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "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==", + "glob-parent": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz", + "integrity": "sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==", "requires": { - "@types/json-schema": "^7.0.6", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "is-glob": "^4.0.1" } } } }, "core-js": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.17.3.tgz", + "integrity": "sha512-lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw==" }, "core-js-compat": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.1.tgz", - "integrity": "sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.3.tgz", + "integrity": "sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==", "requires": { - "browserslist": "^4.15.0", + "browserslist": "^4.17.0", "semver": "7.0.0" }, "dependencies": { @@ -3885,19 +3658,19 @@ } }, "core-js-pure": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.8.1.tgz", - "integrity": "sha512-Se+LaxqXlVXGvmexKGPvnUIYC1jwXu1H6Pkyb3uBM5d8/NELMYCHs/4/roD7721NxrTLyv7e5nXd5/QLBO+10g==" + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.17.3.tgz", + "integrity": "sha512-YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ==" }, "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==" }, "cosmiconfig": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", + "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "requires": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -3906,190 +3679,90 @@ "yaml": "^1.10.0" } }, - "create-ecdh": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", - "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" - } - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "cross-fetch": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.4.tgz", + "integrity": "sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==", "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "node-fetch": "2.6.1" } }, "cross-spawn": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", - "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "requires": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, "crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" }, - "css-blank-pseudo": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz", - "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==", - "requires": { - "postcss": "^7.0.5" - } - }, "css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-1.0.1.tgz", + "integrity": "sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA==" }, "css-declaration-sorter": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz", - "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz", + "integrity": "sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA==", "requires": { - "postcss": "^7.0.1", "timsort": "^0.3.0" } }, - "css-has-pseudo": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz", - "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==", + "css-loader": { + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz", + "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==", "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^5.0.0-rc.4" - }, - "dependencies": { - "cssesc": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz", - "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==" - }, - "postcss-selector-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz", - "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==", - "requires": { - "cssesc": "^2.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } + "icss-utils": "^5.1.0", + "loader-utils": "^2.0.0", + "postcss": "^8.2.15", + "postcss-modules-extract-imports": "^3.0.0", + "postcss-modules-local-by-default": "^4.0.0", + "postcss-modules-scope": "^3.0.0", + "postcss-modules-values": "^4.0.0", + "postcss-value-parser": "^4.1.0", + "schema-utils": "^3.0.0", + "semver": "^7.3.5" } }, - "css-loader": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz", - "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==", + "css-minimizer-webpack-plugin": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.2.tgz", + "integrity": "sha512-B3I5e17RwvKPJwsxjjWcdgpU/zqylzK1bPVghcmpFHRL48DXiBgrtqz1BJsn68+t/zzaLp9kYAaEDvQ7GyanFQ==", "requires": { - "camelcase": "^5.3.1", - "cssesc": "^3.0.0", - "icss-utils": "^4.1.1", - "loader-utils": "^1.2.3", - "normalize-path": "^3.0.0", - "postcss": "^7.0.32", - "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^3.0.2", - "postcss-modules-scope": "^2.2.0", - "postcss-modules-values": "^3.0.0", - "postcss-value-parser": "^4.1.0", - "schema-utils": "^2.7.0", - "semver": "^6.3.0" + "cssnano": "^5.0.6", + "jest-worker": "^27.0.2", + "p-limit": "^3.0.2", + "postcss": "^8.3.5", + "schema-utils": "^3.0.0", + "serialize-javascript": "^6.0.0", + "source-map": "^0.6.1" }, "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, - "css-prefers-color-scheme": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz", - "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==", - "requires": { - "postcss": "^7.0.5" - } - }, "css-select": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", - "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", + "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", "requires": { "boolbase": "^1.0.0", - "css-what": "^3.2.1", - "domutils": "^1.7.0", - "nth-check": "^1.0.2" + "css-what": "^5.0.0", + "domhandler": "^4.2.0", + "domutils": "^2.6.0", + "nth-check": "^2.0.0" } }, "css-select-base-adapter": { @@ -4098,11 +3771,11 @@ "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" }, "css-tree": { - "version": "1.0.0-alpha.37", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", - "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", "requires": { - "mdn-data": "2.0.4", + "mdn-data": "2.0.14", "source-map": "^0.6.1" }, "dependencies": { @@ -4114,14 +3787,9 @@ } }, "css-what": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", - "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==" - }, - "cssdb": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz", - "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz", + "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==" }, "cssesc": { "version": "3.0.0", @@ -4129,124 +3797,69 @@ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" }, "cssnano": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", - "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", - "requires": { - "cosmiconfig": "^5.0.0", - "cssnano-preset-default": "^4.0.7", - "is-resolvable": "^1.0.0", - "postcss": "^7.0.0" - }, - "dependencies": { - "cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - } - }, - "import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" - } + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.0.8.tgz", + "integrity": "sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg==", + "requires": { + "cssnano-preset-default": "^5.1.4", + "is-resolvable": "^1.1.0", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" } }, "cssnano-preset-advanced": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-4.0.7.tgz", - "integrity": "sha512-j1O5/DQnaAqEyFFQfC+Z/vRlLXL3LxJHN+lvsfYqr7KgPH74t69+Rsy2yXkovWNaJjZYBpdz2Fj8ab2nH7pZXw==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/cssnano-preset-advanced/-/cssnano-preset-advanced-5.1.4.tgz", + "integrity": "sha512-pFtIM15OzryDk09RcK+bBBtwSl80+g/POTAf/sVPqPmnOAleK6vBkY5wTmPjqGyV5/UTPjEzWMtbOQ3Z0kCBXA==", "requires": { - "autoprefixer": "^9.4.7", - "cssnano-preset-default": "^4.0.7", - "postcss-discard-unused": "^4.0.1", - "postcss-merge-idents": "^4.0.1", - "postcss-reduce-idents": "^4.0.2", - "postcss-zindex": "^4.0.1" + "autoprefixer": "^10.2.0", + "cssnano-preset-default": "^5.1.4", + "postcss-discard-unused": "^5.0.1", + "postcss-merge-idents": "^5.0.1", + "postcss-reduce-idents": "^5.0.1", + "postcss-zindex": "^5.0.1" } }, "cssnano-preset-default": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz", - "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", - "requires": { - "css-declaration-sorter": "^4.0.1", - "cssnano-util-raw-cache": "^4.0.1", - "postcss": "^7.0.0", - "postcss-calc": "^7.0.1", - "postcss-colormin": "^4.0.3", - "postcss-convert-values": "^4.0.1", - "postcss-discard-comments": "^4.0.2", - "postcss-discard-duplicates": "^4.0.2", - "postcss-discard-empty": "^4.0.1", - "postcss-discard-overridden": "^4.0.1", - "postcss-merge-longhand": "^4.0.11", - "postcss-merge-rules": "^4.0.3", - "postcss-minify-font-values": "^4.0.2", - "postcss-minify-gradients": "^4.0.2", - "postcss-minify-params": "^4.0.2", - "postcss-minify-selectors": "^4.0.2", - "postcss-normalize-charset": "^4.0.1", - "postcss-normalize-display-values": "^4.0.2", - "postcss-normalize-positions": "^4.0.2", - "postcss-normalize-repeat-style": "^4.0.2", - "postcss-normalize-string": "^4.0.2", - "postcss-normalize-timing-functions": "^4.0.2", - "postcss-normalize-unicode": "^4.0.1", - "postcss-normalize-url": "^4.0.1", - "postcss-normalize-whitespace": "^4.0.2", - "postcss-ordered-values": "^4.1.2", - "postcss-reduce-initial": "^4.0.3", - "postcss-reduce-transforms": "^4.0.2", - "postcss-svgo": "^4.0.2", - "postcss-unique-selectors": "^4.0.1" - } - }, - "cssnano-util-get-arguments": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz", - "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=" - }, - "cssnano-util-get-match": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz", - "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=" - }, - "cssnano-util-raw-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz", - "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", - "requires": { - "postcss": "^7.0.0" - } - }, - "cssnano-util-same-parent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz", - "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==" + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz", + "integrity": "sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ==", + "requires": { + "css-declaration-sorter": "^6.0.3", + "cssnano-utils": "^2.0.1", + "postcss-calc": "^8.0.0", + "postcss-colormin": "^5.2.0", + "postcss-convert-values": "^5.0.1", + "postcss-discard-comments": "^5.0.1", + "postcss-discard-duplicates": "^5.0.1", + "postcss-discard-empty": "^5.0.1", + "postcss-discard-overridden": "^5.0.1", + "postcss-merge-longhand": "^5.0.2", + "postcss-merge-rules": "^5.0.2", + "postcss-minify-font-values": "^5.0.1", + "postcss-minify-gradients": "^5.0.2", + "postcss-minify-params": "^5.0.1", + "postcss-minify-selectors": "^5.1.0", + "postcss-normalize-charset": "^5.0.1", + "postcss-normalize-display-values": "^5.0.1", + "postcss-normalize-positions": "^5.0.1", + "postcss-normalize-repeat-style": "^5.0.1", + "postcss-normalize-string": "^5.0.1", + "postcss-normalize-timing-functions": "^5.0.1", + "postcss-normalize-unicode": "^5.0.1", + "postcss-normalize-url": "^5.0.2", + "postcss-normalize-whitespace": "^5.0.1", + "postcss-ordered-values": "^5.0.2", + "postcss-reduce-initial": "^5.0.1", + "postcss-reduce-transforms": "^5.0.1", + "postcss-svgo": "^5.0.2", + "postcss-unique-selectors": "^5.0.1" + } + }, + "cssnano-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-2.0.1.tgz", + "integrity": "sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==" }, "csso": { "version": "4.2.0", @@ -4254,43 +3867,12 @@ "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", "requires": { "css-tree": "^1.1.2" - }, - "dependencies": { - "css-tree": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz", - "integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==", - "requires": { - "mdn-data": "2.0.14", - "source-map": "^0.6.1" - } - }, - "mdn-data": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } } }, - "csstype": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.5.tgz", - "integrity": "sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==" - }, - "cyclist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", - "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=" - }, "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { "ms": "2.1.2" } @@ -4396,50 +3978,25 @@ } }, "del": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/del/-/del-5.1.0.tgz", - "integrity": "sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", "requires": { - "globby": "^10.0.1", - "graceful-fs": "^4.2.2", + "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.1", - "p-map": "^3.0.0", - "rimraf": "^3.0.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", "slash": "^3.0.0" - }, - "dependencies": { - "p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", - "requires": { - "aggregate-error": "^3.0.0" - } - } } }, - "delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", - "optional": true - }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" }, - "des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, "destroy": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", @@ -4454,9 +4011,9 @@ } }, "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==" }, "detect-port": { "version": "1.3.0", @@ -4482,23 +4039,6 @@ } } }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" - } - } - }, "dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -4513,9 +4053,9 @@ "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=" }, "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==", "requires": { "ip": "^1.1.0", "safe-buffer": "^5.0.1" @@ -4538,46 +4078,36 @@ } }, "dom-serializer": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", - "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", "requires": { "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", "entities": "^2.0.0" - }, - "dependencies": { - "domelementtype": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz", - "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==" - } } }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" - }, "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" }, "domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz", + "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==", "requires": { - "domelementtype": "1" + "domelementtype": "^2.2.0" } }, "domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" } }, "dot-case": { @@ -4607,76 +4137,15 @@ "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" }, - "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, - "ejs": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz", - "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==" - }, "electron-to-chromium": { - "version": "1.3.633", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.633.tgz", - "integrity": "sha512-bsVCsONiVX1abkWdH7KtpuDAhsQ3N3bjPYhROSAXE78roJKet0Y5wznA14JE9pzbwSZmSMAW6KiKYf1RvbTJkA==" - }, - "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" - } - } + "version": "1.3.836", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz", + "integrity": "sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg==" }, "emoji-regex": { "version": "7.0.3", @@ -4698,24 +4167,6 @@ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, - "encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "requires": { - "iconv-lite": "^0.6.2" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz", - "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -4725,52 +4176,18 @@ } }, "enhanced-resolve": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", - "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", + "version": "5.8.2", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz", + "integrity": "sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==", "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" - }, - "dependencies": { - "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==", - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" } }, "entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, "errno": { "version": "0.1.8", @@ -4786,34 +4203,38 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { "is-arrayish": "^0.2.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" - } } }, "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "version": "1.18.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz", + "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==", "requires": { + "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", + "has-symbols": "^1.0.2", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.4", + "is-string": "^1.0.7", + "object-inspect": "^1.11.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.1" } }, + "es-module-lexer": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.7.1.tgz", + "integrity": "sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw==" + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -4845,11 +4266,11 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "requires": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, @@ -4884,9 +4305,9 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "eta": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/eta/-/eta-1.12.1.tgz", - "integrity": "sha512-H8npoci2J/7XiPnVcCVulBSPsTNGvGaINyMjQDU8AFqp9LGsEYS88g2CiU+d01Sg44WtX7o4nb8wUJ9vnI+tiA==" + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/eta/-/eta-1.12.3.tgz", + "integrity": "sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg==" }, "etag": { "version": "1.8.1", @@ -4894,9 +4315,9 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "eval": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.4.tgz", - "integrity": "sha512-npGsebJejyjMRnLdFu+T/97dnigqIU0Ov3IGrZ8ygd1v7RL1vGkEKtvyWZobqUH1AQgKlg0Yqqe2BtMA9/QZLw==", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/eval/-/eval-0.1.6.tgz", + "integrity": "sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==", "requires": { "require-like": ">= 0.1.1" } @@ -4907,27 +4328,18 @@ "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" }, "events": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", - "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" }, "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz", + "integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==", "requires": { "original": "^1.0.0" } }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", @@ -5089,16 +4501,6 @@ "is-extendable": "^0.1.0" } }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", @@ -5156,16 +4558,15 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "fast-glob": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", - "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", "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" } }, "fast-json-stable-stringify": { @@ -5179,66 +4580,66 @@ "integrity": "sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0=", "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=" + } } }, "fastq": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz", - "integrity": "sha512-NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "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==", "requires": { "websocket-driver": ">=0.5.1" } }, "fbemitter": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz", - "integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz", + "integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==", "requires": { - "fbjs": "^0.8.4" + "fbjs": "^3.0.0" } }, "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.0.tgz", + "integrity": "sha512-dJd4PiDOFuhe7vk4F80Mba83Vr2QuK86FoxtgPmzBqEJahncp+13YCmfoa53KHCo6OnlXLG7eeMWPfB5CrpVKg==", "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", + "cross-fetch": "^3.0.4", + "fbjs-css-vars": "^1.0.0", "loose-envify": "^1.0.0", "object-assign": "^4.1.0", "promise": "^7.1.1", "setimmediate": "^1.0.5", "ua-parser-js": "^0.7.18" - }, - "dependencies": { - "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" - } } }, + "fbjs-css-vars": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", + "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==" + }, "feed": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/feed/-/feed-4.2.1.tgz", - "integrity": "sha512-l28KKcK1J/u3iq5dRDmmoB2p7dtBfACC2NqJh4dI2kFptxH0asfjmOfcxqh5Sv8suAlVa73gZJ4REY5RrafVvg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/feed/-/feed-4.2.2.tgz", + "integrity": "sha512-u5/sxGfiMfZNtJ3OvQpXcvotFpYkL0n9u9mM2vkui2nGo8b4wvDkJ8gAkYqbA8QpGyFCv3RK0Z+Iv+9veCS9bQ==", "requires": { "xml-js": "^1.6.11" } }, - "figgy-pudding": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", - "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==" - }, "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -5254,24 +4655,12 @@ "requires": { "loader-utils": "^2.0.0", "schema-utils": "^3.0.0" - }, - "dependencies": { - "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==", - "requires": { - "@types/json-schema": "^7.0.6", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } } }, "filesize": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz", - "integrity": "sha512-u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz", + "integrity": "sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==" }, "fill-range": { "version": "7.0.1", @@ -5311,9 +4700,9 @@ } }, "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", "requires": { "commondir": "^1.0.1", "make-dir": "^3.0.2", @@ -5329,57 +4718,19 @@ "path-exists": "^4.0.0" } }, - "flatten": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz", - "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==" - }, - "flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "flux": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/flux/-/flux-3.1.3.tgz", - "integrity": "sha1-0jvtUVp5oi2TOrU6tK2hnQWy8Io=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flux/-/flux-4.0.1.tgz", + "integrity": "sha512-emk4RCvJ8RzNP2lNpphKnG7r18q8elDYNAPx7xn+bDeOIo9FFfxEfIQ2y6YbQNmnsGD3nH1noxtLE64Puz1bRQ==", "requires": { - "fbemitter": "^2.0.0", - "fbjs": "^0.8.0" + "fbemitter": "^3.0.0", + "fbjs": "^3.0.0" } }, "follow-redirects": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz", - "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==" + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz", + "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==" }, "for-in": { "version": "1.0.2", @@ -5387,13 +4738,12 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" }, "fork-ts-checker-webpack-plugin": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz", - "integrity": "sha512-DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz", + "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==", "requires": { - "babel-code-frame": "^6.22.0", + "@babel/code-frame": "^7.5.5", "chalk": "^2.4.1", - "chokidar": "^3.3.0", "micromatch": "^3.1.10", "minimatch": "^3.0.4", "semver": "^5.6.0", @@ -5521,6 +4871,11 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, + "tapable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", + "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" + }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", @@ -5533,9 +4888,14 @@ } }, "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==" + }, + "fraction.js": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz", + "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==" }, "fragment-cache": { "version": "0.2.1", @@ -5550,91 +4910,14 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, "fs-extra": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", - "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", + "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "requires": { - "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", - "universalify": "^1.0.0" - } - }, - "fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "requires": { - "minipass": "^3.0.0" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } + "universalify": "^2.0.0" } }, "fs.realpath": { @@ -5643,9 +4926,9 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "optional": true }, "function-bind": { @@ -5664,9 +4947,9 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.2.tgz", - "integrity": "sha512-aeX0vrFm21ILl3+JpFFRNe9aUvp6VFZb2/CTbgLb8j75kOhvoNYjt9d8KA/tJG4gSo8nzEDedRl0h7vDmBYRVg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", + "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -5686,30 +4969,29 @@ "pump": "^3.0.0" } }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" }, "github-slugger": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.3.0.tgz", - "integrity": "sha512-gwJScWVNhFYSRDvURk/8yhcFBee6aFjye2a7Lhb2bUyRulpIoek9p0I9Kt7PT67d/nUlZbFu8L9RLiA0woQN8Q==", - "requires": { - "emoji-regex": ">=6.0.0 <=6.1.1" - }, - "dependencies": { - "emoji-regex": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.1.tgz", - "integrity": "sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=" - } - } + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-1.4.0.tgz", + "integrity": "sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==" }, "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5720,30 +5002,30 @@ } }, "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==", "requires": { "is-glob": "^4.0.1" } }, "glob-to-regexp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", - "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" }, "global-dirs": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz", - "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz", + "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==", "requires": { - "ini": "1.3.7" + "ini": "2.0.0" }, "dependencies": { "ini": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", - "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", + "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==" } } }, @@ -5781,29 +5063,18 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globby": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.2.tgz", - "integrity": "sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", + "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", "requires": { - "@types/glob": "^7.1.1", "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.0.3", - "glob": "^7.1.3", - "ignore": "^5.1.1", - "merge2": "^1.2.3", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", "slash": "^3.0.0" } }, - "good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", - "optional": true, - "requires": { - "delegate": "^3.1.2" - } - }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -5823,16 +5094,16 @@ } }, "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", + "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" }, "gray-matter": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.2.tgz", - "integrity": "sha512-7hB/+LxrOjq/dd8APlK0r24uL/67w7SkYnfwhNFwg/VDIGWGmduTDYf3WNstLW2fbbmRwrDGCVSJ2isuf2+4Hw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz", + "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==", "requires": { - "js-yaml": "^3.11.0", + "js-yaml": "^3.13.1", "kind-of": "^6.0.2", "section-matter": "^1.0.0", "strip-bom-string": "^1.0.0" @@ -5845,13 +5116,6 @@ "requires": { "duplexer": "^0.1.1", "pify": "^4.0.1" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } } }, "handle-thing": { @@ -5867,20 +5131,10 @@ "function-bind": "^1.1.1" } }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "requires": { - "ansi-regex": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - } - } + "has-bigints": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", + "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==" }, "has-flag": { "version": "3.0.0", @@ -5888,9 +5142,17 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "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==" + }, + "has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "requires": { + "has-symbols": "^1.0.2" + } }, "has-value": { "version": "1.0.0", @@ -5944,32 +5206,6 @@ "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==" }, - "hash-base": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", - "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", - "requires": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - } - } - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, "hast-to-hyperscript": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz", @@ -5985,16 +5221,15 @@ } }, "hast-util-from-parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz", - "integrity": "sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz", + "integrity": "sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA==", "requires": { - "@types/parse5": "^5.0.0", - "hastscript": "^6.0.0", + "ccount": "^1.0.3", + "hastscript": "^5.0.0", "property-information": "^5.0.0", - "vfile": "^4.0.0", - "vfile-location": "^3.2.0", - "web-namespaces": "^1.0.0" + "web-namespaces": "^1.1.2", + "xtend": "^4.0.1" } }, "hast-util-parse-selector": { @@ -6017,6 +5252,38 @@ "web-namespaces": "^1.0.0", "xtend": "^4.0.0", "zwitch": "^1.0.0" + }, + "dependencies": { + "hast-util-from-parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz", + "integrity": "sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==", + "requires": { + "@types/parse5": "^5.0.0", + "hastscript": "^6.0.0", + "property-information": "^5.0.0", + "vfile": "^4.0.0", + "vfile-location": "^3.2.0", + "web-namespaces": "^1.0.0" + } + }, + "hastscript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz", + "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==", + "requires": { + "@types/hast": "^2.0.0", + "comma-separated-tokens": "^1.0.0", + "hast-util-parse-selector": "^2.0.0", + "property-information": "^5.0.0", + "space-separated-tokens": "^1.0.0" + } + }, + "parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + } } }, "hast-util-to-parse5": { @@ -6032,11 +5299,10 @@ } }, "hastscript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz", - "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz", + "integrity": "sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ==", "requires": { - "@types/hast": "^2.0.0", "comma-separated-tokens": "^1.0.0", "hast-util-parse-selector": "^2.0.0", "property-information": "^5.0.0", @@ -6048,11 +5314,6 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, - "hex-color-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", - "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" - }, "history": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", @@ -6066,16 +5327,6 @@ "value-equal": "^1.0.1" } }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, "hoist-non-react-statics": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", @@ -6084,11 +5335,6 @@ "react-is": "^16.7.0" } }, - "hoopy": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", - "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==" - }, "hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -6124,21 +5370,6 @@ } } }, - "hsl-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz", - "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=" - }, - "hsla-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz", - "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=" - }, - "html-comment-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz", - "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==" - }, "html-entities": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz", @@ -6156,6 +5387,43 @@ "param-case": "^3.0.3", "relateurl": "^0.2.7", "terser": "^4.6.3" + }, + "dependencies": { + "clean-css": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", + "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", + "requires": { + "source-map": "~0.6.0" + } + }, + "commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "terser": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", + "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "requires": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + }, + "dependencies": { + "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==" + } + } + } } }, "html-tags": { @@ -6169,48 +5437,15 @@ "integrity": "sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==" }, "html-webpack-plugin": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz", - "integrity": "sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz", + "integrity": "sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ==", "requires": { "@types/html-minifier-terser": "^5.0.0", - "@types/tapable": "^1.0.5", - "@types/webpack": "^4.41.8", "html-minifier-terser": "^5.0.1", - "loader-utils": "^1.2.3", - "lodash": "^4.17.15", - "pretty-error": "^2.1.1", - "tapable": "^1.1.3", - "util.promisify": "1.0.0" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - }, - "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "requires": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" - } - } + "lodash": "^4.17.21", + "pretty-error": "^3.0.4", + "tapable": "^2.0.0" } }, "htmlparser2": { @@ -6226,6 +5461,49 @@ "readable-stream": "^3.1.1" }, "dependencies": { + "dom-serializer": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "requires": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + }, + "dependencies": { + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + }, + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" + } + } + }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, "entities": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", @@ -6263,9 +5541,9 @@ } }, "http-parser-js": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.2.tgz", - "integrity": "sha512-opCO9ASqg5Wy2FNo7A0sxy71yGbbkJJXLdgMK04Tcypw9jr2MgWbyubb0+WdmDmGnFflO7fRbqbaihh/ENDlRQ==" + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz", + "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==" }, "http-proxy": { "version": "1.18.1", @@ -6404,15 +5682,10 @@ } } }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" - }, "human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==" }, "iconv-lite": { "version": "0.4.24", @@ -6423,22 +5696,9 @@ } }, "icss-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz", - "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", - "requires": { - "postcss": "^7.0.14" - } - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==" }, "ignore": { "version": "5.1.8", @@ -6446,17 +5706,9 @@ "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==" }, "immer": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz", - "integrity": "sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg==" - }, - "import-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", - "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", - "requires": { - "import-from": "^2.1.0" - } + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz", + "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA==" }, "import-fresh": { "version": "3.3.0", @@ -6467,21 +5719,6 @@ "resolve-from": "^4.0.0" } }, - "import-from": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", - "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", - "requires": { - "resolve-from": "^3.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" - } - } - }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -6513,6 +5750,14 @@ "path-exists": "^3.0.0" } }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "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", @@ -6546,20 +5791,10 @@ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==" }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=" - }, - "infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" - }, "infima": { - "version": "0.2.0-alpha.18", - "resolved": "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.18.tgz", - "integrity": "sha512-ndSEffXzjgM/eiSm5jpLTX6ON9MmylzxqBnV2bTiC3kCSyDYdvzTs+bSwf+C4TWayuqnRTnBK1JUePo3m6Bnfg==" + "version": "0.2.0-alpha.33", + "resolved": "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.33.tgz", + "integrity": "sha512-iLZI8/vGTbbhbeFhlWv1zwvrqfNDLAayuEdqZqNqCyGuh0IW469dRIRm0FLZ98YyLikt2njzuKfy6xUrBWRXcg==" }, "inflight": { "version": "1.0.6", @@ -6585,84 +5820,6 @@ "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz", "integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==" }, - "inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "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==", - "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==", - "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==" - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.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==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "internal-ip": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", @@ -6672,6 +5829,16 @@ "ipaddr.js": "^1.9.0" } }, + "internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "requires": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + } + }, "interpret": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", @@ -6693,9 +5860,9 @@ "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", + "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==" }, "is-accessor-descriptor": { "version": "0.1.6", @@ -6730,17 +5897,26 @@ } }, "is-arguments": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz", - "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", "requires": { - "call-bind": "^1.0.0" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "requires": { + "has-bigints": "^1.0.1" + } }, "is-binary-path": { "version": "2.1.0", @@ -6750,15 +5926,24 @@ "binary-extensions": "^2.0.0" } }, + "is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "requires": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-callable": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", - "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==" }, "is-ci": { "version": "2.0.0", @@ -6775,23 +5960,10 @@ } } }, - "is-color-stop": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", - "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", - "requires": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.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.6.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz", + "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==", "requires": { "has": "^1.0.3" } @@ -6815,9 +5987,12 @@ } }, "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==", + "requires": { + "has-tostringtag": "^1.0.0" + } }, "is-decimal": { "version": "1.0.4", @@ -6841,15 +6016,10 @@ } } }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=" - }, "is-docker": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", - "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==" }, "is-extendable": { "version": "0.1.1", @@ -6880,12 +6050,12 @@ "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==" }, "is-installed-globally": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", - "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", + "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", "requires": { - "global-dirs": "^2.0.1", - "is-path-inside": "^3.0.1" + "global-dirs": "^3.0.0", + "is-path-inside": "^3.0.2" } }, "is-negative-zero": { @@ -6894,15 +6064,23 @@ "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==" }, "is-npm": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", - "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz", + "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==" }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, + "is-number-object": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz", + "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==", + "requires": { + "has-tostringtag": "^1.0.0" + } + }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -6932,14 +6110,14 @@ } }, "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==" + "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==" }, "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" }, "is-plain-object": { "version": "2.0.4", @@ -6950,11 +6128,12 @@ } }, "is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "requires": { - "has-symbols": "^1.0.1" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, "is-regexp": { @@ -6977,20 +6156,20 @@ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, - "is-svg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", - "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", + "is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "requires": { - "html-comment-regex": "^1.1.0" + "has-tostringtag": "^1.0.0" } }, "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==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "requires": { - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.2" } }, "is-typedarray": { @@ -7041,23 +6220,14 @@ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, - "isomorphic-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", - "requires": { - "node-fetch": "^1.0.1", - "whatwg-fetch": ">=0.10.0" - } - }, "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.1.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz", + "integrity": "sha512-XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA==", "requires": { "@types/node": "*", "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "supports-color": "^8.0.0" }, "dependencies": { "has-flag": { @@ -7066,9 +6236,9 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "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==", "requires": { "has-flag": "^4.0.0" } @@ -7076,9 +6246,9 @@ } }, "joi": { - "version": "17.3.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.3.0.tgz", - "integrity": "sha512-Qh5gdU6niuYbUIUV5ejbsMiiFmBdw8Kcp8Buj2JntszCkCfxJ9Cz76OtHxOZMPXrt5810iDIXs+n1nNVoquHgg==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz", + "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==", "requires": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", @@ -7132,9 +6302,9 @@ "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==" }, "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", "requires": { "minimist": "^1.2.5" } @@ -7146,13 +6316,6 @@ "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" - }, - "dependencies": { - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" - } } }, "keyv": { @@ -7173,14 +6336,15 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, - "last-call-webpack-plugin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", - "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==", - "requires": { - "lodash": "^4.17.5", - "webpack-sources": "^1.1.0" - } + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==" + }, + "klona": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz", + "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==" }, "latest-version": { "version": "5.1.0", @@ -7195,15 +6359,20 @@ "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" }, + "lilconfig": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.3.tgz", + "integrity": "sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg==" + }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, "loader-runner": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", - "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", + "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" }, "loader-utils": { "version": "2.0.0", @@ -7224,14 +6393,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.assignin": { "version": "4.2.0", @@ -7243,21 +6407,16 @@ "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=" }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" - }, - "lodash.chunk": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.chunk/-/lodash.chunk-4.2.0.tgz", - "integrity": "sha1-ZuXOH3btJ7QwPYxlEujRIW6BBrw=" - }, "lodash.curry": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz", "integrity": "sha1-JI42By7ekGUB11lmIAqG2riyMXA=" }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + }, "lodash.defaults": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", @@ -7268,11 +6427,6 @@ "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=" }, - "lodash.flatmap": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz", - "integrity": "sha1-74y/QI9uSCaGYzRTBcaswLd4cC4=" - }, "lodash.flatten": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", @@ -7288,31 +6442,6 @@ "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=" }, - "lodash.groupby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz", - "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=" - }, - "lodash.has": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.has/-/lodash.has-4.5.2.tgz", - "integrity": "sha1-0Z9NwQlQWMzL4rDN9O4P5Ko3yGI=" - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" - }, - "lodash.kebabcase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", - "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=" - }, "lodash.map": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", @@ -7328,21 +6457,11 @@ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, - "lodash.padstart": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz", - "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=" - }, "lodash.pick": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=" }, - "lodash.pickby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", - "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=" - }, "lodash.reduce": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", @@ -7358,33 +6477,6 @@ "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=" }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" - }, - "lodash.template": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", - "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", - "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.templatesettings": "^4.0.0" - } - }, - "lodash.templatesettings": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", - "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", - "requires": { - "lodash._reinterpolate": "^3.0.0" - } - }, - "lodash.toarray": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", - "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=" - }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -7430,6 +6522,13 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "requires": { "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, "map-cache": { @@ -7450,16 +6549,6 @@ "resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz", "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==" }, - "md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, "mdast-squeeze-paragraphs": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mdast-squeeze-paragraphs/-/mdast-squeeze-paragraphs-4.0.0.tgz", @@ -7492,14 +6581,14 @@ } }, "mdast-util-to-string": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz", - "integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", + "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==" }, "mdn-data": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", - "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" }, "mdurl": { "version": "1.0.1", @@ -7570,28 +6659,12 @@ "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==" }, "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==", "requires": { "braces": "^3.0.1", - "picomatch": "^2.0.5" - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" - } + "picomatch": "^2.2.3" } }, "mime": { @@ -7600,16 +6673,16 @@ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==" + "version": "1.49.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz", + "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==" }, "mime-types": { - "version": "2.1.27", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", - "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", + "version": "2.1.32", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz", + "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==", "requires": { - "mime-db": "1.44.0" + "mime-db": "1.49.0" } }, "mimic-fn": { @@ -7632,53 +6705,27 @@ } }, "mini-css-extract-plugin": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz", - "integrity": "sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz", + "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==", "requires": { - "loader-utils": "^1.1.0", - "normalize-url": "1.9.1", - "schema-utils": "^1.0.0", + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0", "webpack-sources": "^1.1.0" }, "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - }, - "normalize-url": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "requires": { - "object-assign": "^4.0.1", - "prepend-http": "^1.0.0", - "query-string": "^4.1.0", - "sort-keys": "^1.0.0" - } + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, - "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==", + "webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" } } } @@ -7688,11 +6735,6 @@ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" - }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -7706,64 +6748,6 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, - "minipass": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz", - "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", - "requires": { - "yallist": "^4.0.0" - } - }, - "minipass-collect": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", - "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-flush": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", - "requires": { - "minipass": "^3.0.0" - } - }, - "minipass-pipeline": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", - "requires": { - "minipass": "^3.0.0" - } - }, - "minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - } - }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -7791,28 +6775,10 @@ "minimist": "^1.2.5" } }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - }, - "dependencies": { - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - } - } + "module-alias": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz", + "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==" }, "ms": { "version": "2.1.2", @@ -7833,10 +6799,10 @@ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + "nanoid": { + "version": "3.1.25", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", + "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==" }, "nanomatch": { "version": "1.2.13", @@ -7900,87 +6866,27 @@ } }, "node-emoji": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz", - "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", + "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", "requires": { - "lodash.toarray": "^4.4.0" + "lodash": "^4.17.21" } }, "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" }, "node-forge": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==" }, - "node-libs-browser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", - "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.1", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "^1.0.1" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - }, - "dependencies": { - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - } - } - }, "node-releases": { - "version": "1.1.67", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz", - "integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==" + "version": "1.1.75", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz", + "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==" }, "normalize-path": { "version": "3.0.0", @@ -7993,9 +6899,9 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=" }, "normalize-url": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", - "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==" }, "npm-run-path": { "version": "2.0.2", @@ -8018,57 +6924,13 @@ "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E=" }, "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "requires": { - "boolbase": "~1.0.0" - } - }, - "null-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-3.0.0.tgz", - "integrity": "sha512-hf5sNLl8xdRho4UPBOOeoIwT3WhjYcMUQm0zj44EhD6UscMAz72o2udpoDFBgykucdEDGIcd6SXbc/G6zssbzw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz", + "integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==", "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - }, - "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==", - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } + "boolbase": "^1.0.0" } }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=" - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -8103,16 +6965,16 @@ } }, "object-inspect": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz", - "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==" + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" }, "object-is": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz", - "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3" } }, @@ -8141,13 +7003,13 @@ } }, "object.getownpropertydescriptors": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz", - "integrity": "sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz", + "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==", "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" + "es-abstract": "^1.18.0-next.2" } }, "object.pick": { @@ -8159,14 +7021,13 @@ } }, "object.values": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz", - "integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz", + "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==", "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1", - "has": "^1.0.3" + "es-abstract": "^1.18.2" } }, "obuf": { @@ -8204,9 +7065,9 @@ } }, "open": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz", - "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==", + "version": "7.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz", + "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==", "requires": { "is-docker": "^2.0.0", "is-wsl": "^2.1.1" @@ -8232,15 +7093,6 @@ } } }, - "optimize-css-assets-webpack-plugin": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz", - "integrity": "sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A==", - "requires": { - "cssnano": "^4.1.10", - "last-call-webpack-plugin": "^3.0.0" - } - }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", @@ -8249,16 +7101,6 @@ "url-parse": "^1.4.3" } }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", @@ -8270,11 +7112,11 @@ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "requires": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" } }, "p-locate": { @@ -8283,6 +7125,16 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "requires": { "p-limit": "^2.2.0" + }, + "dependencies": { + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + } } }, "p-map": { @@ -8315,44 +7167,12 @@ "registry-auth-token": "^4.0.0", "registry-url": "^5.0.0", "semver": "^6.2.0" - } - }, - "pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" - }, - "parallel-transform": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", - "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", - "requires": { - "cyclist": "^1.0.1", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" }, "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, @@ -8373,18 +7193,6 @@ "callsites": "^3.0.0" } }, - "parse-asn1": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", - "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", - "requires": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, "parse-entities": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", @@ -8399,9 +7207,9 @@ } }, "parse-json": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz", - "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "requires": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -8410,14 +7218,14 @@ } }, "parse-numeric-range": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.2.0.tgz", - "integrity": "sha512-1q2tXpAOplPxcl8vrIGPWz1dJxxfmdRkCFcpxxMBerDnGuuHalOWF/xj9L8Nn5XoTUoB/6F0CeQBp2fMgkOYFg==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.3.0.tgz", + "integrity": "sha512-twN+njEipszzlMJd4ONUYgSfZPDxgHhT9Ahed5uTigpQn90FggW4SA/AIPq/6a149fTbE9qBEcSwE3FAEp6wQQ==" }, "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" }, "parseurl": { "version": "1.3.3", @@ -8438,11 +7246,6 @@ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" }, - "path-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", - "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==" - }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -8469,9 +7272,9 @@ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "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==" }, "path-to-regexp": { "version": "0.1.7", @@ -8483,27 +7286,15 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, - "pbkdf2": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", - "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, "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==" }, "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" }, "pinkie": { "version": "2.0.4", @@ -8551,6 +7342,14 @@ "path-exists": "^3.0.0" } }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "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", @@ -8566,14 +7365,6 @@ } } }, - "pnp-webpack-plugin": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz", - "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==", - "requires": { - "ts-pnp": "^1.1.6" - } - }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -8600,4756 +7391,2811 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "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==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss-attribute-case-insensitive": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz", - "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==", + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz", + "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==", "requires": { - "postcss": "^7.0.2", - "postcss-selector-parser": "^6.0.2" + "colorette": "^1.2.2", + "nanoid": "^3.1.23", + "source-map-js": "^0.6.2" } }, "postcss-calc": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz", - "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.0.0.tgz", + "integrity": "sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g==", "requires": { - "postcss": "^7.0.27", "postcss-selector-parser": "^6.0.2", "postcss-value-parser": "^4.0.2" } }, - "postcss-color-functional-notation": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz", - "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==", + "postcss-colormin": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.2.0.tgz", + "integrity": "sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw==", "requires": { - "postcss": "^7.0.2", - "postcss-values-parser": "^2.0.0" + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "colord": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-color-gray": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz", - "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==", + "postcss-convert-values": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz", + "integrity": "sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg==", "requires": { - "@csstools/convert-colors": "^1.4.0", - "postcss": "^7.0.5", - "postcss-values-parser": "^2.0.0" + "postcss-value-parser": "^4.1.0" } }, - "postcss-color-hex-alpha": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz", - "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==", + "postcss-discard-comments": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz", + "integrity": "sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==" + }, + "postcss-discard-duplicates": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz", + "integrity": "sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==" + }, + "postcss-discard-empty": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz", + "integrity": "sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==" + }, + "postcss-discard-overridden": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz", + "integrity": "sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==" + }, + "postcss-discard-unused": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-5.0.1.tgz", + "integrity": "sha512-tD6xR/xyZTwfhKYRw0ylfCY8wbfhrjpKAMnDKRTLMy2fNW5hl0hoV6ap5vo2JdCkuHkP3CHw72beO4Y8pzFdww==", "requires": { - "postcss": "^7.0.14", - "postcss-values-parser": "^2.0.1" + "postcss-selector-parser": "^6.0.5" } }, - "postcss-color-mod-function": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz", - "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==", + "postcss-loader": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz", + "integrity": "sha512-/+Z1RAmssdiSLgIZwnJHwBMnlABPgF7giYzTN2NOfr9D21IJZ4mQC1R2miwp80zno9M4zMD/umGI8cR+2EL5zw==", "requires": { - "@csstools/convert-colors": "^1.4.0", - "postcss": "^7.0.2", - "postcss-values-parser": "^2.0.0" + "cosmiconfig": "^7.0.0", + "klona": "^2.0.4", + "semver": "^7.3.4" } }, - "postcss-color-rebeccapurple": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz", - "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==", + "postcss-merge-idents": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-5.0.1.tgz", + "integrity": "sha512-xu8ueVU0RszbI2gKkxR6mluupsOSSLvt8q4gA2fcKFkA+x6SlH3cb4cFHpDvcRCNFbUmCR/VUub+Y6zPOjPx+Q==", "requires": { - "postcss": "^7.0.2", - "postcss-values-parser": "^2.0.0" + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-colormin": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz", - "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", + "postcss-merge-longhand": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz", + "integrity": "sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw==", "requires": { - "browserslist": "^4.0.0", - "color": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } + "css-color-names": "^1.0.1", + "postcss-value-parser": "^4.1.0", + "stylehacks": "^5.0.1" } }, - "postcss-combine-duplicated-selectors": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/postcss-combine-duplicated-selectors/-/postcss-combine-duplicated-selectors-9.4.0.tgz", - "integrity": "sha512-rMnO1H3wgR1T6QSlK3i8Slz9p3xD+0yOi4J7qwh/5PGR3z8jbgYvRlNKAIvXDtGBQbJKoWs4df5skL3a/fdUEA==", + "postcss-merge-rules": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz", + "integrity": "sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==", "requires": { - "postcss": "^7.0.0", - "postcss-selector-parser": "^6.0.0" + "browserslist": "^4.16.6", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^2.0.1", + "postcss-selector-parser": "^6.0.5", + "vendors": "^1.0.3" } }, - "postcss-convert-values": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz", - "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", + "postcss-minify-font-values": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz", + "integrity": "sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==", "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } + "postcss-value-parser": "^4.1.0" } }, - "postcss-custom-media": { - "version": "7.0.8", - "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz", - "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==", + "postcss-minify-gradients": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz", + "integrity": "sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ==", "requires": { - "postcss": "^7.0.14" + "colord": "^2.6", + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-custom-properties": { - "version": "8.0.11", - "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz", - "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==", + "postcss-minify-params": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz", + "integrity": "sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==", "requires": { - "postcss": "^7.0.17", - "postcss-values-parser": "^2.0.1" + "alphanum-sort": "^1.0.2", + "browserslist": "^4.16.0", + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0", + "uniqs": "^2.0.0" } }, - "postcss-custom-selectors": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz", - "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==", + "postcss-minify-selectors": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz", + "integrity": "sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==", "requires": { - "postcss": "^7.0.2", - "postcss-selector-parser": "^5.0.0-rc.3" - }, - "dependencies": { - "cssesc": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz", - "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==" - }, - "postcss-selector-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz", - "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==", - "requires": { - "cssesc": "^2.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5" } }, - "postcss-dir-pseudo-class": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz", - "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==", + "postcss-modules-extract-imports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==" + }, + "postcss-modules-local-by-default": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", + "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", "requires": { - "postcss": "^7.0.2", - "postcss-selector-parser": "^5.0.0-rc.3" - }, - "dependencies": { - "cssesc": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz", - "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==" - }, - "postcss-selector-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz", - "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==", - "requires": { - "cssesc": "^2.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } + "icss-utils": "^5.0.0", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" } }, - "postcss-discard-comments": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz", - "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", + "postcss-modules-scope": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", + "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", "requires": { - "postcss": "^7.0.0" + "postcss-selector-parser": "^6.0.4" } }, - "postcss-discard-duplicates": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz", - "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", + "postcss-modules-values": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", "requires": { - "postcss": "^7.0.0" + "icss-utils": "^5.0.0" } }, - "postcss-discard-empty": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz", - "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", + "postcss-normalize-charset": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz", + "integrity": "sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==" + }, + "postcss-normalize-display-values": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz", + "integrity": "sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==", "requires": { - "postcss": "^7.0.0" + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-discard-overridden": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz", - "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", + "postcss-normalize-positions": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz", + "integrity": "sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==", "requires": { - "postcss": "^7.0.0" + "postcss-value-parser": "^4.1.0" } }, - "postcss-discard-unused": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-4.0.1.tgz", - "integrity": "sha512-/3vq4LU0bLH2Lj4NYN7BTf2caly0flUB7Xtrk9a5K3yLuXMkHMqMO/x3sDq8W2b1eQFSCyY0IVz2L+0HP8kUUA==", + "postcss-normalize-repeat-style": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz", + "integrity": "sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==", "requires": { - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0", - "uniqs": "^2.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-double-position-gradients": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz", - "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==", + "postcss-normalize-string": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz", + "integrity": "sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==", "requires": { - "postcss": "^7.0.5", - "postcss-values-parser": "^2.0.0" + "postcss-value-parser": "^4.1.0" } }, - "postcss-env-function": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz", - "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==", + "postcss-normalize-timing-functions": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz", + "integrity": "sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==", "requires": { - "postcss": "^7.0.2", - "postcss-values-parser": "^2.0.0" + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-focus-visible": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz", - "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==", + "postcss-normalize-unicode": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz", + "integrity": "sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==", "requires": { - "postcss": "^7.0.2" + "browserslist": "^4.16.0", + "postcss-value-parser": "^4.1.0" } }, - "postcss-focus-within": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz", - "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==", + "postcss-normalize-url": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz", + "integrity": "sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==", "requires": { - "postcss": "^7.0.2" + "is-absolute-url": "^3.0.3", + "normalize-url": "^6.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-font-variant": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz", - "integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==", + "postcss-normalize-whitespace": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz", + "integrity": "sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==", "requires": { - "postcss": "^7.0.2" + "postcss-value-parser": "^4.1.0" } }, - "postcss-gap-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz", - "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==", + "postcss-ordered-values": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz", + "integrity": "sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==", "requires": { - "postcss": "^7.0.2" + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-image-set-function": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz", - "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==", + "postcss-reduce-idents": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-5.0.1.tgz", + "integrity": "sha512-6Rw8iIVFbqtaZExgWK1rpVgP7DPFRPh0DDFZxJ/ADNqPiH10sPCoq5tgo6kLiTyfh9sxjKYjXdc8udLEcPOezg==", "requires": { - "postcss": "^7.0.2", - "postcss-values-parser": "^2.0.0" + "postcss-value-parser": "^4.1.0" } }, - "postcss-initial": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz", - "integrity": "sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==", + "postcss-reduce-initial": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz", + "integrity": "sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw==", "requires": { - "lodash.template": "^4.5.0", - "postcss": "^7.0.2" + "browserslist": "^4.16.0", + "caniuse-api": "^3.0.0" } }, - "postcss-lab-function": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz", - "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==", + "postcss-reduce-transforms": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz", + "integrity": "sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==", "requires": { - "@csstools/convert-colors": "^1.4.0", - "postcss": "^7.0.2", - "postcss-values-parser": "^2.0.0" + "cssnano-utils": "^2.0.1", + "postcss-value-parser": "^4.1.0" } }, - "postcss-load-config": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", - "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", + "postcss-selector-parser": { + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", + "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", "requires": { - "cosmiconfig": "^5.0.0", - "import-cwd": "^2.0.0" - }, - "dependencies": { - "cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - } - }, - "import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" - } + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" } }, - "postcss-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", - "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", + "postcss-sort-media-queries": { + "version": "3.11.12", + "resolved": "https://registry.npmjs.org/postcss-sort-media-queries/-/postcss-sort-media-queries-3.11.12.tgz", + "integrity": "sha512-PNhEOWR/btZ0bNNRqqdW4TWxBPQ1mu2I6/Zpco80vBUDSyEjtduUAorY0Vm68rvDlGea3+sgEnQ36iQ1A/gG8Q==", "requires": { - "loader-utils": "^1.1.0", - "postcss": "^7.0.0", - "postcss-load-config": "^2.0.0", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - }, - "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==", - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } + "sort-css-media-queries": "1.5.4" } }, - "postcss-logical": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz", - "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==", + "postcss-svgo": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.0.2.tgz", + "integrity": "sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A==", "requires": { - "postcss": "^7.0.2" + "postcss-value-parser": "^4.1.0", + "svgo": "^2.3.0" } }, - "postcss-media-minmax": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz", - "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==", + "postcss-unique-selectors": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz", + "integrity": "sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==", "requires": { - "postcss": "^7.0.2" + "alphanum-sort": "^1.0.2", + "postcss-selector-parser": "^6.0.5", + "uniqs": "^2.0.0" } }, - "postcss-merge-idents": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-4.0.1.tgz", - "integrity": "sha512-43S/VNdF6II0NZ31YxcvNYq4gfURlPAAsJW/z84avBXQCaP4I4qRHUH18slW/SOlJbcxxCobflPNUApYDddS7A==", - "requires": { - "cssnano-util-same-parent": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "postcss-value-parser": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" }, - "postcss-merge-longhand": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz", - "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==", - "requires": { - "css-color-names": "0.0.4", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "stylehacks": "^4.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "postcss-zindex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-5.0.1.tgz", + "integrity": "sha512-nwgtJJys+XmmSGoYCcgkf/VczP8Mp/0OfSv3v0+fw0uABY4yxw+eFs0Xp9nAZHIKnS5j+e9ywQ+RD+ONyvl5pA==" }, - "postcss-merge-rules": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz", - "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", - "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "cssnano-util-same-parent": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0", - "vendors": "^1.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } + "prepend-http": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, - "postcss-minify-font-values": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz", - "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", + "pretty-error": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-3.0.4.tgz", + "integrity": "sha512-ytLFLfv1So4AO1UkoBF6GXQgJRaKbiSiGFICaOPNwQ3CMvBvXpLRubeQWyPGnsbV/t9ml9qto6IeCsho0aEvwQ==", "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } + "lodash": "^4.17.20", + "renderkid": "^2.0.6" } }, - "postcss-minify-gradients": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz", - "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "is-color-stop": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "pretty-time": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz", + "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==" }, - "postcss-minify-params": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz", - "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", + "prism-react-renderer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.2.1.tgz", + "integrity": "sha512-w23ch4f75V1Tnz8DajsYKvY5lF7H1+WvzvLUcF0paFxkTHSp42RS0H5CttdN2Q8RR3DRGZ9v5xD/h3n8C8kGmg==" + }, + "prismjs": { + "version": "1.24.1", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.1.tgz", + "integrity": "sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow==" + }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "requires": { - "alphanum-sort": "^1.0.0", - "browserslist": "^4.0.0", - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "uniqs": "^2.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } + "asap": "~2.0.3" } }, - "postcss-minify-selectors": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz", - "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", + "prompts": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz", + "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==", "requires": { - "alphanum-sort": "^1.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" } }, - "postcss-modules-extract-imports": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", - "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", "requires": { - "postcss": "^7.0.5" + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" } }, - "postcss-modules-local-by-default": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz", - "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==", + "property-information": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz", + "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==", "requires": { - "icss-utils": "^4.1.1", - "postcss": "^7.0.32", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" + "xtend": "^4.0.0" } }, - "postcss-modules-scope": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz", - "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==", + "proxy-addr": { + "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==", "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" } }, - "postcss-modules-values": { + "prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" + }, + "pump": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz", - "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "requires": { - "icss-utils": "^4.0.0", - "postcss": "^7.0.6" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, - "postcss-nesting": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz", - "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==", - "requires": { - "postcss": "^7.0.2" - } + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, - "postcss-normalize-charset": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz", - "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", + "pupa": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", + "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", "requires": { - "postcss": "^7.0.0" + "escape-goat": "^2.0.0" } }, - "postcss-normalize-display-values": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz", - "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", - "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "pure-color": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz", + "integrity": "sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=" }, - "postcss-normalize-positions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz", - "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, - "postcss-normalize-repeat-style": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz", - "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" }, - "postcss-normalize-string": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz", - "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", - "requires": { - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" }, - "postcss-normalize-timing-functions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz", - "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", - "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, - "postcss-normalize-unicode": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz", - "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", - "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" }, - "postcss-normalize-url": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz", - "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "requires": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } + "safe-buffer": "^5.1.0" } }, - "postcss-normalize-whitespace": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz", - "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", - "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, - "postcss-ordered-values": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz", - "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", + "raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" } }, - "postcss-overflow-shorthand": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz", - "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==", + "rc": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "requires": { - "postcss": "^7.0.2" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" } }, - "postcss-page-break": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz", - "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==", + "react": { + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", + "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", "requires": { - "postcss": "^7.0.2" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2" } }, - "postcss-place": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz", - "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==", - "requires": { - "postcss": "^7.0.2", - "postcss-values-parser": "^2.0.0" - } + "react-base16-styling": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz", + "integrity": "sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=", + "requires": { + "base16": "^1.0.0", + "lodash.curry": "^4.0.1", + "lodash.flow": "^3.3.0", + "pure-color": "^1.2.0" + } }, - "postcss-preset-env": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz", - "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==", - "requires": { - "autoprefixer": "^9.6.1", - "browserslist": "^4.6.4", - "caniuse-lite": "^1.0.30000981", - "css-blank-pseudo": "^0.1.4", - "css-has-pseudo": "^0.10.0", - "css-prefers-color-scheme": "^3.1.1", - "cssdb": "^4.4.0", - "postcss": "^7.0.17", - "postcss-attribute-case-insensitive": "^4.0.1", - "postcss-color-functional-notation": "^2.0.1", - "postcss-color-gray": "^5.0.0", - "postcss-color-hex-alpha": "^5.0.3", - "postcss-color-mod-function": "^3.0.3", - "postcss-color-rebeccapurple": "^4.0.1", - "postcss-custom-media": "^7.0.8", - "postcss-custom-properties": "^8.0.11", - "postcss-custom-selectors": "^5.1.2", - "postcss-dir-pseudo-class": "^5.0.0", - "postcss-double-position-gradients": "^1.0.0", - "postcss-env-function": "^2.0.2", - "postcss-focus-visible": "^4.0.0", - "postcss-focus-within": "^3.0.0", - "postcss-font-variant": "^4.0.0", - "postcss-gap-properties": "^2.0.0", - "postcss-image-set-function": "^3.0.1", - "postcss-initial": "^3.0.0", - "postcss-lab-function": "^2.0.1", - "postcss-logical": "^3.0.0", - "postcss-media-minmax": "^4.0.0", - "postcss-nesting": "^7.0.0", - "postcss-overflow-shorthand": "^2.0.0", - "postcss-page-break": "^2.0.0", - "postcss-place": "^4.0.1", - "postcss-pseudo-class-any-link": "^6.0.0", - "postcss-replace-overflow-wrap": "^3.0.0", - "postcss-selector-matches": "^4.0.0", - "postcss-selector-not": "^4.0.0" - } - }, - "postcss-pseudo-class-any-link": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz", - "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==", + "react-dev-utils": { + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz", + "integrity": "sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A==", "requires": { - "postcss": "^7.0.2", - "postcss-selector-parser": "^5.0.0-rc.3" + "@babel/code-frame": "7.10.4", + "address": "1.1.2", + "browserslist": "4.14.2", + "chalk": "2.4.2", + "cross-spawn": "7.0.3", + "detect-port-alt": "1.1.6", + "escape-string-regexp": "2.0.0", + "filesize": "6.1.0", + "find-up": "4.1.0", + "fork-ts-checker-webpack-plugin": "4.1.6", + "global-modules": "2.0.0", + "globby": "11.0.1", + "gzip-size": "5.1.1", + "immer": "8.0.1", + "is-root": "2.1.0", + "loader-utils": "2.0.0", + "open": "^7.0.2", + "pkg-up": "3.1.0", + "prompts": "2.4.0", + "react-error-overlay": "^6.0.9", + "recursive-readdir": "2.2.2", + "shell-quote": "1.7.2", + "strip-ansi": "6.0.0", + "text-table": "0.2.0" }, "dependencies": { - "cssesc": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "browserslist": { + "version": "4.14.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz", + "integrity": "sha512-HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==", + "requires": { + "caniuse-lite": "^1.0.30001125", + "electron-to-chromium": "^1.3.564", + "escalade": "^3.0.2", + "node-releases": "^1.1.61" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "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=" + } + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "detect-port-alt": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz", + "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==", + "requires": { + "address": "^1.0.1", + "debug": "^2.6.0" + } + }, + "escape-string-regexp": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz", - "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==" + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" }, - "postcss-selector-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz", - "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==", + "globby": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", + "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", + "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" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "prompts": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz", + "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==", "requires": { - "cssesc": "^2.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" } } } }, - "postcss-reduce-idents": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-4.0.2.tgz", - "integrity": "sha512-Tz70Ri10TclPoCtFfftjFVddx3fZGUkr0dEDbIEfbYhFUOFQZZ77TEqRrU0e6TvAvF+Wa5VVzYTpFpq0uwFFzw==", + "react-dom": { + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", + "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" } }, - "postcss-reduce-initial": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz", - "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", - "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0" - } + "react-error-overlay": { + "version": "6.0.9", + "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz", + "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==" }, - "postcss-reduce-transforms": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz", - "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", - "requires": { - "cssnano-util-get-match": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" - } - } + "react-fast-compare": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz", + "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==" }, - "postcss-replace-overflow-wrap": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz", - "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==", + "react-helmet": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz", + "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==", "requires": { - "postcss": "^7.0.2" + "object-assign": "^4.1.1", + "prop-types": "^15.7.2", + "react-fast-compare": "^3.1.1", + "react-side-effect": "^2.1.0" } }, - "postcss-selector-matches": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz", - "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==", - "requires": { - "balanced-match": "^1.0.0", - "postcss": "^7.0.2" - } + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, - "postcss-selector-not": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz", - "integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==", + "react-json-view": { + "version": "1.21.3", + "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.3.tgz", + "integrity": "sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw==", "requires": { - "balanced-match": "^1.0.0", - "postcss": "^7.0.2" + "flux": "^4.0.1", + "react-base16-styling": "^0.6.0", + "react-lifecycles-compat": "^3.0.4", + "react-textarea-autosize": "^8.3.2" } }, - "postcss-selector-parser": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", - "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", + "react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, + "react-loadable": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz", + "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==", "requires": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1", - "util-deprecate": "^1.0.2" + "prop-types": "^15.5.0" } }, - "postcss-sort-media-queries": { - "version": "1.31.21", - "resolved": "https://registry.npmjs.org/postcss-sort-media-queries/-/postcss-sort-media-queries-1.31.21.tgz", - "integrity": "sha512-h+HbXXfOVFeLvCJOzl/Z9SqQ25MNpG/73k71756ftisaaJy75h06/Dn6KOwC4OCMN10ewT2PXMzHV03JNKwBbg==", + "react-loadable-ssr-addon-v5-slorber": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/react-loadable-ssr-addon-v5-slorber/-/react-loadable-ssr-addon-v5-slorber-1.0.1.tgz", + "integrity": "sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==", "requires": { - "postcss": "^7.0.27", - "sort-css-media-queries": "1.5.0" + "@babel/runtime": "^7.10.3" } }, - "postcss-svgo": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz", - "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", + "react-router": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.1.tgz", + "integrity": "sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ==", "requires": { - "is-svg": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "svgo": "^1.0.0" + "@babel/runtime": "^7.12.13", + "history": "^4.9.0", + "hoist-non-react-statics": "^3.1.0", + "loose-envify": "^1.3.1", + "mini-create-react-context": "^0.4.0", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.6.2", + "react-is": "^16.6.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" }, "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==" + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "requires": { + "isarray": "0.0.1" + } } } }, - "postcss-unique-selectors": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz", - "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", + "react-router-config": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz", + "integrity": "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==", "requires": { - "alphanum-sort": "^1.0.0", - "postcss": "^7.0.0", - "uniqs": "^2.0.0" + "@babel/runtime": "^7.1.2" } }, - "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" - }, - "postcss-values-parser": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz", - "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==", + "react-router-dom": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.0.tgz", + "integrity": "sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ==", "requires": { - "flatten": "^1.0.2", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "@babel/runtime": "^7.12.13", + "history": "^4.9.0", + "loose-envify": "^1.3.1", + "prop-types": "^15.6.2", + "react-router": "5.2.1", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" } }, - "postcss-zindex": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-4.0.1.tgz", - "integrity": "sha512-d/8BlQcUdEugZNRM9AdCA2V4fqREUtn/wcixLN3L6ITgc2P/FMcVVYz8QZkhItWT9NB5qr8wuN2dJCE4/+dlrA==", + "react-side-effect": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz", + "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" + }, + "react-textarea-autosize": { + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz", + "integrity": "sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==", "requires": { - "has": "^1.0.0", - "postcss": "^7.0.0", - "uniqs": "^2.0.0" + "@babel/runtime": "^7.10.2", + "use-composed-ref": "^1.0.0", + "use-latest": "^1.0.0" } }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" - }, - "pretty-error": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz", - "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==", + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { - "lodash": "^4.17.20", - "renderkid": "^2.0.4" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } }, - "pretty-time": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz", - "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==" + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "requires": { + "picomatch": "^2.2.1" + } }, - "prism-react-renderer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/prism-react-renderer/-/prism-react-renderer-1.1.1.tgz", - "integrity": "sha512-MgMhSdHuHymNRqD6KM3eGS0PNqgK9q4QF5P0yoQQvpB6jNjeSAi3jcSAz0Sua/t9fa4xDOMar9HJbLa08gl9ug==" + "reading-time": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/reading-time/-/reading-time-1.5.0.tgz", + "integrity": "sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==" }, - "prismjs": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", - "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "requires": { - "clipboard": "^2.0.0" + "resolve": "^1.1.6" } }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + "recursive-readdir": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", + "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "requires": { + "minimatch": "3.0.4" + } }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "requires": { - "asap": "~2.0.3" - } - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" - }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - }, - "property-information": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz", - "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==", - "requires": { - "xtend": "^4.0.0" - } + "regenerate": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" }, - "proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", + "regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.1" + "regenerate": "^1.4.0" } }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" - }, - "public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" - } - } + "regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "regenerator-transform": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", + "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "@babel/runtime": "^7.8.4" } }, - "pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" }, "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + } + }, + "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==", "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "is-plain-object": "^2.0.4" } } } }, - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - }, - "pupa": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz", - "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==", + "regexp.prototype.flags": { + "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==", "requires": { - "escape-goat": "^2.0.0" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, - "pure-color": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz", - "integrity": "sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=" - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" - }, - "query-string": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "regexpu-core": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", + "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", "requires": { - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" } }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" - }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "registry-auth-token": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", + "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", "requires": { - "safe-buffer": "^5.1.0" + "rc": "^1.2.8" } }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "registry-url": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", + "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" + "rc": "^1.2.8" } }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + "regjsgen": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", + "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==" }, - "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "regjsparser": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz", + "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==", "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" + "jsesc": "~0.5.0" + }, + "dependencies": { + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + } } }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", + "rehype-parse": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz", + "integrity": "sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug==", "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" + "hast-util-from-parse5": "^5.0.0", + "parse5": "^5.0.0", + "xtend": "^4.0.0" } }, - "react": { - "version": "16.14.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", - "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", + "relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" + }, + "remark-admonitions": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/remark-admonitions/-/remark-admonitions-1.2.1.tgz", + "integrity": "sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow==", "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2" + "rehype-parse": "^6.0.2", + "unified": "^8.4.2", + "unist-util-visit": "^2.0.1" } }, - "react-base16-styling": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz", - "integrity": "sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=", + "remark-emoji": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-2.2.0.tgz", + "integrity": "sha512-P3cj9s5ggsUvWw5fS2uzCHJMGuXYRb0NnZqYlNecewXt8QBU9n5vW3DUUKOhepS8F9CwdMx9B8a3i7pqFWAI5w==", "requires": { - "base16": "^1.0.0", - "lodash.curry": "^4.0.1", - "lodash.flow": "^3.3.0", - "pure-color": "^1.2.0" + "emoticon": "^3.2.0", + "node-emoji": "^1.10.0", + "unist-util-visit": "^2.0.3" } }, - "react-dev-utils": { - "version": "10.2.1", - "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz", - "integrity": "sha512-XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ==", + "remark-footnotes": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz", + "integrity": "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==" + }, + "remark-mdx": { + "version": "1.6.22", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz", + "integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==", "requires": { - "@babel/code-frame": "7.8.3", - "address": "1.1.2", - "browserslist": "4.10.0", - "chalk": "2.4.2", - "cross-spawn": "7.0.1", - "detect-port-alt": "1.1.6", - "escape-string-regexp": "2.0.0", - "filesize": "6.0.1", - "find-up": "4.1.0", - "fork-ts-checker-webpack-plugin": "3.1.1", - "global-modules": "2.0.0", - "globby": "8.0.2", - "gzip-size": "5.1.1", - "immer": "1.10.0", - "inquirer": "7.0.4", - "is-root": "2.1.0", - "loader-utils": "1.2.3", - "open": "^7.0.2", - "pkg-up": "3.1.0", - "react-error-overlay": "^6.0.7", - "recursive-readdir": "2.2.2", - "shell-quote": "1.7.2", - "strip-ansi": "6.0.0", - "text-table": "0.2.0" + "@babel/core": "7.12.9", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-proposal-object-rest-spread": "7.12.1", + "@babel/plugin-syntax-jsx": "7.12.1", + "@mdx-js/util": "1.6.22", + "is-alphabetical": "1.0.4", + "remark-parse": "8.0.3", + "unified": "9.2.0" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "@babel/core": { + "version": "7.12.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz", + "integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==", "requires": { - "@babel/highlight": "^7.8.3" + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.5", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helpers": "^7.12.5", + "@babel/parser": "^7.12.7", + "@babel/template": "^7.12.7", + "@babel/traverse": "^7.12.9", + "@babel/types": "^7.12.7", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" } }, - "@nodelib/fs.stat": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", - "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==" + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==" }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz", + "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==", "requires": { - "array-uniq": "^1.0.1" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.12.1" } }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "@babel/plugin-syntax-jsx": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz", + "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==", "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=", - "requires": { - "is-extendable": "^0.1.0" - } - } + "@babel/helper-plugin-utils": "^7.10.4" } }, - "browserslist": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz", - "integrity": "sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==", + "is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "unified": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz", + "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==", "requires": { - "caniuse-lite": "^1.0.30001035", - "electron-to-chromium": "^1.3.378", - "node-releases": "^1.1.52", - "pkg-up": "^3.1.0" + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" } + } + } + }, + "remark-parse": { + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz", + "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==", + "requires": { + "ccount": "^1.0.0", + "collapse-white-space": "^1.0.2", + "is-alphabetical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-whitespace-character": "^1.0.0", + "is-word-character": "^1.0.0", + "markdown-escapes": "^1.0.0", + "parse-entities": "^2.0.0", + "repeat-string": "^1.5.4", + "state-toggle": "^1.0.0", + "trim": "0.0.1", + "trim-trailing-lines": "^1.0.0", + "unherit": "^1.0.4", + "unist-util-remove-position": "^2.0.0", + "vfile-location": "^3.0.0", + "xtend": "^4.0.1" + } + }, + "remark-squeeze-paragraphs": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz", + "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==", + "requires": { + "mdast-squeeze-paragraphs": "^4.0.0" + } + }, + "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=" + }, + "renderkid": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz", + "integrity": "sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==", + "requires": { + "css-select": "^4.1.3", + "dom-converter": "^0.2.0", + "htmlparser2": "^6.1.0", + "lodash": "^4.17.21", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "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=" - } + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" } }, - "cli-width": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", - "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==" - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "requires": { - "ms": "2.0.0" + "ansi-regex": "^2.0.0" } - }, - "detect-port-alt": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz", - "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==", + } + } + }, + "repeat-element": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", + "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==" + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-like": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", + "integrity": "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o=" + }, + "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==" + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" + }, + "resolve": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", + "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "requires": { + "is-core-module": "^2.2.0", + "path-parse": "^1.0.6" + } + }, + "resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "requires": { + "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + } + } + }, + "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==" + }, + "resolve-pathname": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", + "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" + }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + }, + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "requires": { + "lowercase-keys": "^1.0.0" + } + }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" + }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, + "rtl-detect": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.0.4.tgz", + "integrity": "sha512-EBR4I2VDSSYr7PkBmFy04uhycIpDKp+21p/jARYXlCSjQksTBQcJ0HFUPOO79EPPH5JS6VAhiIQbycf0O3JAxQ==" + }, + "rtlcss": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-3.3.0.tgz", + "integrity": "sha512-XZ2KEatH2nU5yPlts1Wu8SGIuZ3ndN025HQX5MqtUCUiOn5WkCDbcpJ2VJWjpuFmM2cUTQ1xtH21fhMCSseI5A==", + "requires": { + "chalk": "^4.1.0", + "find-up": "^5.0.0", + "mkdirp": "^1.0.4", + "postcss": "^8.2.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "requires": { - "address": "^1.0.1", - "debug": "^2.6.0" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" } }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "requires": { - "arrify": "^1.0.1", - "path-type": "^3.0.0" - } - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" - }, - "escape-string-regexp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "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==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "fast-glob": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", - "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", - "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.1.2", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.3", - "micromatch": "^3.1.10" - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "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=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "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=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "globby": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz", - "integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==", - "requires": { - "array-union": "^1.0.1", - "dir-glob": "2.0.0", - "fast-glob": "^2.0.2", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" - } - }, - "ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==" - }, - "inquirer": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz", - "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==", - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^2.4.2", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.2.0", - "rxjs": "^6.5.3", - "string-width": "^4.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "dependencies": { - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "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=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", - "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^2.0.0", - "json5": "^1.0.1" - } - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "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" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "requires": { - "pify": "^3.0.0" + "p-locate": "^5.0.0" } }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "requires": { - "ansi-regex": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - } + "p-limit": "^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=", - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } + "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==" } } }, - "react-dom": { - "version": "16.14.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", - "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", + "run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.19.1" + "queue-microtask": "^1.2.2" } }, - "react-error-overlay": { - "version": "6.0.8", - "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz", - "integrity": "sha512-HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw==" - }, - "react-fast-compare": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.0.tgz", - "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==" - }, - "react-helmet": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz", - "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==", + "rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "requires": { - "object-assign": "^4.1.1", - "prop-types": "^15.7.2", - "react-fast-compare": "^3.1.1", - "react-side-effect": "^2.1.0" + "tslib": "^1.9.0" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } } }, - "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, - "react-json-view": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.19.1.tgz", - "integrity": "sha512-u5e0XDLIs9Rj43vWkKvwL8G3JzvXSl6etuS5G42a8klMohZuYFQzSN6ri+/GiBptDqlrXPTdExJVU7x9rrlXhg==", + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { - "flux": "^3.1.3", - "react-base16-styling": "^0.6.0", - "react-lifecycles-compat": "^3.0.4", - "react-textarea-autosize": "^6.1.0" + "ret": "~0.1.10" } }, - "react-lifecycles-compat": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, - "react-loadable": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz", - "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==", + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "requires": { - "prop-types": "^15.5.0" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" } }, - "react-loadable-ssr-addon": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/react-loadable-ssr-addon/-/react-loadable-ssr-addon-0.3.0.tgz", - "integrity": "sha512-E+lnmDakV0k6ut6R2J77vurwCOwTKEwKlHs9S62G8ez+ujecLPcqjt3YAU8M58kIGjp2QjFlZ7F9QWkq/mr6Iw==", + "schema-utils": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", + "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "requires": { - "@babel/runtime": "^7.10.3" + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" } }, - "react-router": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz", - "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==", + "section-matter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", + "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==", "requires": { - "@babel/runtime": "^7.1.2", - "history": "^4.9.0", - "hoist-non-react-statics": "^3.1.0", - "loose-envify": "^1.3.1", - "mini-create-react-context": "^0.4.0", - "path-to-regexp": "^1.7.0", - "prop-types": "^15.6.2", - "react-is": "^16.6.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "path-to-regexp": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", - "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", - "requires": { - "isarray": "0.0.1" - } - } - } - }, - "react-router-config": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/react-router-config/-/react-router-config-5.1.1.tgz", - "integrity": "sha512-DuanZjaD8mQp1ppHjgnnUnyOlqYXZVjnov/JzFhjLEwd3Z4dYjMSnqrEzzGThH47vpCOqPPwJM2FtthLeJ8Pbg==", - "requires": { - "@babel/runtime": "^7.1.2" - } - }, - "react-router-dom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz", - "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==", - "requires": { - "@babel/runtime": "^7.1.2", - "history": "^4.9.0", - "loose-envify": "^1.3.1", - "prop-types": "^15.6.2", - "react-router": "5.2.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0" - } - }, - "react-side-effect": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz", - "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==" - }, - "react-textarea-autosize": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz", - "integrity": "sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==", - "requires": { - "prop-types": "^15.6.0" + "extend-shallow": "^2.0.1", + "kind-of": "^6.0.0" } }, - "react-toggle": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/react-toggle/-/react-toggle-4.1.1.tgz", - "integrity": "sha512-+wXlMcSpg8SmnIXauMaZiKpR+r2wp2gMUteroejp2UTSqGTVvZLN+m9EhMzFARBKEw7KpQOwzCyfzeHeAndQGw==", - "requires": { - "classnames": "^2.2.5" - } + "select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "selfsigned": { + "version": "1.10.11", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz", + "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==", "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "node-forge": "^0.10.0" } }, - "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "requires": { - "picomatch": "^2.2.1" + "lru-cache": "^6.0.0" } }, - "reading-time": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/reading-time/-/reading-time-1.2.1.tgz", - "integrity": "sha512-a27kU9sCJzx4JklmKFMXgMoCWlhBi75DFTbU7+M3rjh5SXRWyacYt02il3muYaA+SUQ7tg5gMQn7GC8zOxTt/g==" - }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "semver-diff": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", + "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", "requires": { - "resolve": "^1.1.6" + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, - "recursive-readdir": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz", - "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==", + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", "requires": { - "minimatch": "3.0.4" + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "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==", + "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=" + } + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + } } }, - "regenerate": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" - }, - "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "requires": { - "regenerate": "^1.4.0" + "randombytes": "^2.1.0" } }, - "regenerator-runtime": { - "version": "0.13.7", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" - }, - "regenerator-transform": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", - "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", + "serve-handler": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz", + "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==", "requires": { - "@babel/runtime": "^7.8.4" + "bytes": "3.0.0", + "content-disposition": "0.5.2", + "fast-url-parser": "1.1.3", + "mime-types": "2.1.18", + "minimatch": "3.0.4", + "path-is-inside": "1.0.2", + "path-to-regexp": "2.2.1", + "range-parser": "1.2.0" + }, + "dependencies": { + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + }, + "content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + }, + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" + }, + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "requires": { + "mime-db": "~1.33.0" + } + }, + "path-to-regexp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz", + "integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==" + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + } } }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "accepts": "~1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" }, "dependencies": { - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "ms": "2.0.0" } }, - "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==", + "http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "requires": { - "is-plain-object": "^2.0.4" + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" } } }, - "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==", + "serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" } }, - "regexpu-core": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", - "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "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==", "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" } }, - "registry-auth-token": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", - "integrity": "sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==", + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "requires": { - "rc": "^1.2.8" + "kind-of": "^6.0.2" } }, - "registry-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", - "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", + "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==", "requires": { - "rc": "^1.2.8" + "shebang-regex": "^3.0.0" } }, - "regjsgen": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", - "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==" + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" }, - "regjsparser": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", - "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", + "shell-quote": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", + "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==" + }, + "shelljs": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", + "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", "requires": { - "jsesc": "~0.5.0" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, + "signal-exit": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "sirv": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.17.tgz", + "integrity": "sha512-qx9go5yraB7ekT7bCMqUHJ5jEaOC/GXBxUWv+jeWnb7WzHUFdcQPGWk7YmAwFBaQBrogpuSqd/azbC2lZRqqmw==", + "requires": { + "@polka/url": "^1.0.0-next.20", + "mime": "^2.3.1", + "totalist": "^1.0.0" }, "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + "mime": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==" } } }, - "rehype-parse": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz", - "integrity": "sha512-0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug==", + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" + }, + "sitemap": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.0.0.tgz", + "integrity": "sha512-Ud0jrRQO2k7fEtPAM+cQkBKoMvxQyPKNXKDLn8tRVHxRCsdDQ2JZvw+aZ5IRYYQVAV9iGxEar6boTwZzev+x3g==", "requires": { - "hast-util-from-parse5": "^5.0.0", - "parse5": "^5.0.0", - "xtend": "^4.0.0" + "@types/node": "^15.0.1", + "@types/sax": "^1.2.1", + "arg": "^5.0.0", + "sax": "^1.2.4" }, "dependencies": { - "hast-util-from-parse5": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz", - "integrity": "sha512-gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA==", + "@types/node": { + "version": "15.14.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.9.tgz", + "integrity": "sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A==" + } + } + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "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": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { - "ccount": "^1.0.3", - "hastscript": "^5.0.0", - "property-information": "^5.0.0", - "web-namespaces": "^1.1.2", - "xtend": "^4.0.1" + "ms": "2.0.0" } }, - "hastscript": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz", - "integrity": "sha512-WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ==", + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "requires": { - "comma-separated-tokens": "^1.0.0", - "hast-util-parse-selector": "^2.0.0", - "property-information": "^5.0.0", - "space-separated-tokens": "^1.0.0" + "is-descriptor": "^0.1.0" } }, - "parse5": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", - "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" - }, - "remark-admonitions": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/remark-admonitions/-/remark-admonitions-1.2.1.tgz", - "integrity": "sha512-Ji6p68VDvD+H1oS95Fdx9Ar5WA2wcDA4kwrrhVU7fGctC6+d3uiMICu7w7/2Xld+lnU7/gi+432+rRbup5S8ow==", + "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==", "requires": { - "rehype-parse": "^6.0.2", - "unified": "^8.4.2", - "unist-util-visit": "^2.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "^1.0.0" + } }, - "unified": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz", - "integrity": "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==", + "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==", "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" + "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==", + "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==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } }, - "remark-emoji": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-2.1.0.tgz", - "integrity": "sha512-lDddGsxXURV01WS9WAiS9rO/cedO1pvr9tahtLhr6qCGFhHG4yZSJW3Ha4Nw9Uk1hLNmUBtPC0+m45Ms+xEitg==", + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "requires": { - "emoticon": "^3.2.0", - "node-emoji": "^1.10.0", - "unist-util-visit": "^2.0.2" + "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=", + "requires": { + "is-buffer": "^1.1.5" + } + } } }, - "remark-footnotes": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/remark-footnotes/-/remark-footnotes-2.0.0.tgz", - "integrity": "sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==" + "sockjs": { + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz", + "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==", + "requires": { + "faye-websocket": "^0.11.3", + "uuid": "^3.4.0", + "websocket-driver": "^0.7.4" + } }, - "remark-mdx": { - "version": "1.6.22", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.22.tgz", - "integrity": "sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==", + "sockjs-client": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.2.tgz", + "integrity": "sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==", "requires": { - "@babel/core": "7.12.9", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-proposal-object-rest-spread": "7.12.1", - "@babel/plugin-syntax-jsx": "7.12.1", - "@mdx-js/util": "1.6.22", - "is-alphabetical": "1.0.4", - "remark-parse": "8.0.3", - "unified": "9.2.0" + "debug": "^3.2.6", + "eventsource": "^1.0.7", + "faye-websocket": "^0.11.3", + "inherits": "^2.0.4", + "json3": "^3.3.3", + "url-parse": "^1.5.3" }, "dependencies": { - "@babel/core": { - "version": "7.12.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz", - "integrity": "sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==", + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.5", - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helpers": "^7.12.5", - "@babel/parser": "^7.12.7", - "@babel/template": "^7.12.7", - "@babel/traverse": "^7.12.9", - "@babel/types": "^7.12.7", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.19", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" + "ms": "^2.1.1" } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, - "remark-parse": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz", - "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==", + "sort-css-media-queries": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-1.5.4.tgz", + "integrity": "sha512-YP5W/h4Sid/YP7Lp87ejJ5jP13/Mtqt2vx33XyhO+IAugKlufRPbOrPlIiEUuxmpNBSBd3EeeQpFhdu3RfI2Ag==" + }, + "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==" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "source-map-js": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz", + "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==" + }, + "source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "requires": { - "ccount": "^1.0.0", - "collapse-white-space": "^1.0.2", - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-whitespace-character": "^1.0.0", - "is-word-character": "^1.0.0", - "markdown-escapes": "^1.0.0", - "parse-entities": "^2.0.0", - "repeat-string": "^1.5.4", - "state-toggle": "^1.0.0", - "trim": "0.0.1", - "trim-trailing-lines": "^1.0.0", - "unherit": "^1.0.4", - "unist-util-remove-position": "^2.0.0", - "vfile-location": "^3.0.0", - "xtend": "^4.0.1" + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, - "remark-squeeze-paragraphs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/remark-squeeze-paragraphs/-/remark-squeeze-paragraphs-4.0.0.tgz", - "integrity": "sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==", + "source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", "requires": { - "mdast-squeeze-paragraphs": "^4.0.0" + "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==" + } } }, - "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=" + "source-map-url": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==" }, - "renderkid": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz", - "integrity": "sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==", + "space-separated-tokens": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz", + "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==" + }, + "spdy": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "requires": { - "css-select": "^1.1.0", - "dom-converter": "^0.2", - "htmlparser2": "^3.3.0", - "lodash": "^4.17.20", - "strip-ansi": "^3.0.0" + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" + } + }, + "spdy-transport": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", + "requires": { + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" + } + }, + "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==", + "requires": { + "extend-shallow": "^3.0.0" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" - } - }, - "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "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==", "requires": { - "ansi-regex": "^2.0.0" + "is-plain-object": "^2.0.4" } } } }, - "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "stable": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "state-toggle": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz", + "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==" }, - "require-like": { + "static-extend": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/require-like/-/require-like-0.1.2.tgz", - "integrity": "sha1-rW8wwTvs15cBDEaK+ndcDAprR/o=" - }, - "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==" - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" - }, - "resolve": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", - "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", - "requires": { - "is-core-module": "^2.1.0", - "path-parse": "^1.0.6" - } - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "requires": { - "resolve-from": "^3.0.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } } } }, - "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==" - }, - "resolve-pathname": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", - "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" - }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "std-env": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-2.3.0.tgz", + "integrity": "sha512-4qT5B45+Kjef2Z6pE0BkskzsH0GO7GrND0wGlTM1ioUe3v0dGYx9ZJH0Aro/YyA8fqQ5EyIKDRjZojJYMFTflw==", "requires": { - "lowercase-keys": "^1.0.0" + "ci-info": "^3.0.0" } }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "string-width": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", + "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==", "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "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==" + }, + "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==" + } } }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" - }, - "reusify": { + "string.prototype.trimend": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" - }, - "rgb-regex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", - "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=" - }, - "rgba-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", - "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", "requires": { - "glob": "^7.1.3" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" } }, - "run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==" - }, - "run-parallel": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz", - "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==" - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "requires": { - "aproba": "^1.1.1" + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } } }, - "rxjs": { - "version": "6.6.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", - "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", + "stringify-object": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", + "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", "requires": { - "tslib": "^1.9.0" + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" }, "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" } } }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "requires": { - "ret": "~0.1.10" + "ansi-regex": "^5.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + } } }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "strip-bom-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", + "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=" }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, - "scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + }, + "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=" + }, + "style-to-object": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", + "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==", "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" + "inline-style-parser": "0.1.1" } }, - "schema-utils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "stylehacks": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.0.1.tgz", + "integrity": "sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==", "requires": { - "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", - "ajv-keywords": "^3.5.2" + "browserslist": "^4.16.0", + "postcss-selector-parser": "^6.0.4" } }, - "section-matter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", - "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==", + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "requires": { - "extend-shallow": "^2.0.1", - "kind-of": "^6.0.0" + "has-flag": "^3.0.0" } }, - "select": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", - "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", - "optional": true - }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" + "svg-parser": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", + "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" }, - "selfsigned": { - "version": "1.10.8", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", - "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", + "svgo": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.5.0.tgz", + "integrity": "sha512-FSdBOOo271VyF/qZnOn1PgwCdt1v4Dx0Sey+U1jgqm1vqRYjPGdip0RGrFW6ItwtkBB8rHgHk26dlVr0uCs82Q==", "requires": { - "node-forge": "^0.10.0" + "@trysound/sax": "0.1.1", + "colorette": "^1.3.0", + "commander": "^7.2.0", + "css-select": "^4.1.3", + "css-tree": "^1.1.3", + "csso": "^4.2.0", + "stable": "^0.1.8" + }, + "dependencies": { + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" + } } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "tapable": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz", + "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==" }, - "semver-diff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", - "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", + "terser": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz", + "integrity": "sha512-0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw==", "requires": { - "semver": "^6.3.0" + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.19" + }, + "dependencies": { + "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==" + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + } } }, - "send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "terser-webpack-plugin": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.2.4.tgz", + "integrity": "sha512-E2CkNMN+1cho04YpdANyRrn8CyN4yMy+WdFKZIySFZrGXZxJwJP6PMNGGc/Mcr6qygQHUUqRxnAPmi0M9f00XA==", + "requires": { + "jest-worker": "^27.0.6", + "p-limit": "^3.1.0", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.0", + "source-map": "^0.6.1", + "terser": "^5.7.2" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "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=" - } - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, - "serialize-javascript": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", - "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", - "requires": { - "randombytes": "^2.1.0" - } + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, - "serve-handler": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz", - "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==", + "thunky": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" + }, + "timsort": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", + "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" + }, + "tiny-invariant": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz", + "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==" + }, + "tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + }, + "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=", "requires": { - "bytes": "3.0.0", - "content-disposition": "0.5.2", - "fast-url-parser": "1.1.3", - "mime-types": "2.1.18", - "minimatch": "3.0.4", - "path-is-inside": "1.0.2", - "path-to-regexp": "2.2.1", - "range-parser": "1.2.0" + "kind-of": "^3.0.2" }, "dependencies": { - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" - }, - "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" - }, - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==" - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "mime-db": "~1.33.0" + "is-buffer": "^1.1.5" } - }, - "path-to-regexp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz", - "integrity": "sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==" - }, - "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" } } }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "to-readable-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" + }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "requires": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "requires": { - "ms": "2.0.0" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" } }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "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==", "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "is-plain-object": "^2.0.4" } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" } } }, - "serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" + "is-number": "^7.0.0" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, - "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==", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - } + "totalist": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz", + "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==" }, - "setimmediate": { + "trim": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", + "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" + }, + "trim-trailing-lines": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz", + "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==" + }, + "trough": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", + "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==" }, - "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + "ts-essentials": { + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/ts-essentials/-/ts-essentials-2.0.12.tgz", + "integrity": "sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==" + }, + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "type-fest": { + "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==" + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "media-typer": "0.3.0", + "mime-types": "~2.1.24" } }, - "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==", + "typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", "requires": { - "shebang-regex": "^3.0.0" + "is-typedarray": "^1.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==" - }, - "shell-quote": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", - "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==" + "ua-parser-js": { + "version": "0.7.28", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.28.tgz", + "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==" }, - "shelljs": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", - "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", + "unbox-primitive": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", + "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" + "function-bind": "^1.1.1", + "has-bigints": "^1.0.1", + "has-symbols": "^1.0.2", + "which-boxed-primitive": "^1.0.2" } }, - "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" - }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", + "unherit": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz", + "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==", "requires": { - "is-arrayish": "^0.3.1" + "inherits": "^2.0.0", + "xtend": "^4.0.0" } }, - "sitemap": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-3.2.2.tgz", - "integrity": "sha512-TModL/WU4m2q/mQcrDgNANn0P4LwprM9MMvG4hu5zP4c6IIKs2YLTu6nXXnNr8ODW/WFtxKggiJ1EGn2W0GNmg==", + "unicode-canonical-property-names-ecmascript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", + "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==" + }, + "unicode-match-property-ecmascript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", + "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", "requires": { - "lodash.chunk": "^4.2.0", - "lodash.padstart": "^4.6.1", - "whatwg-url": "^7.0.0", - "xmlbuilder": "^13.0.0" + "unicode-canonical-property-names-ecmascript": "^1.0.4", + "unicode-property-aliases-ecmascript": "^1.0.4" } }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + "unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "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": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } + "unicode-property-aliases-ecmascript": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz", + "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==" }, - "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==", + "unified": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz", + "integrity": "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==", "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=", - "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==", - "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==", - "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==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" } }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "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==", "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=", - "requires": { - "is-buffer": "^1.1.5" - } - } + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" } }, - "sockjs": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz", - "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==", - "requires": { - "faye-websocket": "^0.11.3", - "uuid": "^3.4.0", - "websocket-driver": "^0.7.4" - } + "uniqs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" }, - "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==", + "unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", "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==", - "requires": { - "ms": "^2.1.1" - } - } + "crypto-random-string": "^2.0.0" } }, - "sort-css-media-queries": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/sort-css-media-queries/-/sort-css-media-queries-1.5.0.tgz", - "integrity": "sha512-QofNE7CEVH1AKdhS7L9IPbV9UtyQYNXyw++8lC+xG6iOLlpzsmncZRiKbihTAESvZ8wOhwnPoesHbMrehrQyyw==" + "unist-builder": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz", + "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==" }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "unist-util-generated": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz", + "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==" + }, + "unist-util-is": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz", + "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==" + }, + "unist-util-position": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz", + "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==" + }, + "unist-util-remove": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz", + "integrity": "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==", "requires": { - "is-plain-obj": "^1.0.0" + "unist-util-is": "^4.0.0" } }, - "source-list-map": { + "unist-util-remove-position": { "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==" + "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz", + "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==", + "requires": { + "unist-util-visit": "^2.0.0" + } }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "unist-util-stringify-position": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", + "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "requires": { + "@types/unist": "^2.0.2" + } }, - "source-map-resolve": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", - "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "unist-util-visit": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", + "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", "requires": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0", + "unist-util-visit-parents": "^3.0.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==", + "unist-util-visit-parents": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", + "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", "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==" - } + "@types/unist": "^2.0.0", + "unist-util-is": "^4.0.0" } }, - "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=" + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" }, - "space-separated-tokens": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz", - "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==" + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, - "spdy": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", - "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", - "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - } - }, - "spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", - "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" - } + "unquote": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", + "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=" }, - "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==", + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "requires": { - "extend-shallow": "^3.0.0" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "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=", + "requires": { + "isarray": "1.0.0" + } + } } }, - "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==", - "requires": { - "is-plain-object": "^2.0.4" - } + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" } } }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" }, - "ssri": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", - "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", + "update-notifier": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz", + "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==", "requires": { - "minipass": "^3.1.1" + "boxen": "^5.0.0", + "chalk": "^4.1.0", + "configstore": "^5.0.1", + "has-yarn": "^2.1.0", + "import-lazy": "^2.1.0", + "is-ci": "^2.0.0", + "is-installed-globally": "^0.4.0", + "is-npm": "^5.0.0", + "is-yarn-global": "^0.3.0", + "latest-version": "^5.1.0", + "pupa": "^2.1.1", + "semver": "^7.3.4", + "semver-diff": "^3.1.1", + "xdg-basedir": "^4.0.0" } }, - "stable": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==" - }, - "state-toggle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz", - "integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==" - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "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=", - "requires": { - "is-descriptor": "^0.1.0" - } - } + "punycode": "^2.1.0" } }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" - }, - "std-env": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-2.2.1.tgz", - "integrity": "sha512-IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ==", - "requires": { - "ci-info": "^1.6.0" - } + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, - "stream-browserify": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", - "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" + "punycode": "1.3.2", + "querystring": "0.2.0" }, "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" } } }, - "stream-each": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", - "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", + "url-loader": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", + "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" + "loader-utils": "^2.0.0", + "mime-types": "^2.1.27", + "schema-utils": "^3.0.0" } }, - "stream-http": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", - "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", + "url-parse": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", + "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, - "stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==" - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "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==" - }, - "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==" - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - } + "prepend-http": "^2.0.0" } }, - "string.prototype.trimend": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz", - "integrity": "sha512-ayH0pB+uf0U28CtjlLvL7NaohvR1amUvVZk+y3DYb0Ey2PUV5zPkkKy9+U1ndVEIXO8hNg18eIv9Jntbii+dKw==", - "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3" - } + "use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" }, - "string.prototype.trimstart": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz", - "integrity": "sha512-oBIBUy5lea5tt0ovtOFiEQaBkoBBkyJhZXzJYrSmDo5IUUqbOPvVezuRs/agBIdZ2p2Eo1FD6bD9USyBLfl3xg==", + "use-composed-ref": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.1.0.tgz", + "integrity": "sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg==", "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3" + "ts-essentials": "^2.0.3" } }, - "string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "use-isomorphic-layout-effect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz", + "integrity": "sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ==" + }, + "use-latest": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.0.tgz", + "integrity": "sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw==", "requires": { - "safe-buffer": "~5.2.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - } - } - }, - "stringify-object": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", - "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", - "requires": { - "get-own-enumerable-property-symbols": "^3.0.0", - "is-obj": "^1.0.1", - "is-regexp": "^1.0.0" - }, - "dependencies": { - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" - } - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "strip-bom-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", - "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=" - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" - }, - "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=" - }, - "style-to-object": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz", - "integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==", - "requires": { - "inline-style-parser": "0.1.1" - } - }, - "stylehacks": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", - "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", - "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - }, - "svg-parser": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", - "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" - }, - "svgo": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", - "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", - "requires": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", - "css-tree": "1.0.0-alpha.37", - "csso": "^4.0.2", - "js-yaml": "^3.13.1", - "mkdirp": "~0.5.1", - "object.values": "^1.1.0", - "sax": "~1.2.4", - "stable": "^0.1.8", - "unquote": "~1.1.1", - "util.promisify": "~1.0.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - } - } - }, - "tapable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" - }, - "tar": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz", - "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==", - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "dependencies": { - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - } - } - }, - "term-size": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz", - "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==" - }, - "terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", - "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" - }, - "dependencies": { - "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==" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "terser-webpack-plugin": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz", - "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==", - "requires": { - "cacache": "^15.0.5", - "find-cache-dir": "^3.3.1", - "jest-worker": "^26.5.0", - "p-limit": "^3.0.2", - "schema-utils": "^3.0.0", - "serialize-javascript": "^5.0.1", - "source-map": "^0.6.1", - "terser": "^5.3.4", - "webpack-sources": "^1.4.3" - }, - "dependencies": { - "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==" - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "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==", - "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==" - }, - "terser": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz", - "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==", - "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==" - } - } - } - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - }, - "dependencies": { - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - } - } - }, - "thunky": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", - "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" - }, - "timers-browserify": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", - "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", - "requires": { - "setimmediate": "^1.0.4" - } - }, - "timsort": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" - }, - "tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", - "optional": true - }, - "tiny-invariant": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz", - "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==" - }, - "tiny-warning": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", - "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" - }, - "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=", - "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=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" - }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "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==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" - }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "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==" - } - } - }, - "trim": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", - "integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=" - }, - "trim-trailing-lines": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz", - "integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==" - }, - "trough": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz", - "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==" - }, - "tryer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", - "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" - }, - "ts-pnp": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", - "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==" - }, - "tslib": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz", - "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==" - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } - }, - "ua-parser-js": { - "version": "0.7.23", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.23.tgz", - "integrity": "sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA==" - }, - "unherit": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz", - "integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==", - "requires": { - "inherits": "^2.0.0", - "xtend": "^4.0.0" - } - }, - "unicode-canonical-property-names-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", - "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==" - }, - "unicode-match-property-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", - "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", - "requires": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" - } - }, - "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==" - }, - "unicode-property-aliases-ecmascript": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz", - "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==" - }, - "unified": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz", - "integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==", - "requires": { - "bail": "^1.0.0", - "extend": "^3.0.0", - "is-buffer": "^2.0.0", - "is-plain-obj": "^2.0.0", - "trough": "^1.0.0", - "vfile": "^4.0.0" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" - }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" - } - } - }, - "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==", - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - } - }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=" - }, - "uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=" - }, - "unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "requires": { - "unique-slug": "^2.0.0" - } - }, - "unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "requires": { - "crypto-random-string": "^2.0.0" - } - }, - "unist-builder": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz", - "integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==" - }, - "unist-util-generated": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz", - "integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==" - }, - "unist-util-is": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.4.tgz", - "integrity": "sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA==" - }, - "unist-util-position": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz", - "integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==" - }, - "unist-util-remove": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.0.1.tgz", - "integrity": "sha512-YtuetK6o16CMfG+0u4nndsWpujgsHDHHLyE0yGpJLLn5xSjKeyGyzEBOI2XbmoUHCYabmNgX52uxlWoQhcvR7Q==", - "requires": { - "unist-util-is": "^4.0.0" - } - }, - "unist-util-remove-position": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz", - "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==", - "requires": { - "unist-util-visit": "^2.0.0" - } - }, - "unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", - "requires": { - "@types/unist": "^2.0.2" - } - }, - "unist-util-visit": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz", - "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==", - "requires": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0", - "unist-util-visit-parents": "^3.0.0" - } - }, - "unist-util-visit-parents": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz", - "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==", - "requires": { - "@types/unist": "^2.0.0", - "unist-util-is": "^4.0.0" - } - }, - "universalify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", - "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==" - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" - }, - "unquote": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=" - }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "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=", - "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=", - "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=" - } - } - }, - "upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==" - }, - "update-notifier": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", - "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==", - "requires": { - "boxen": "^4.2.0", - "chalk": "^3.0.0", - "configstore": "^5.0.1", - "has-yarn": "^2.1.0", - "import-lazy": "^2.1.0", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.3.1", - "is-npm": "^4.0.0", - "is-yarn-global": "^0.3.0", - "latest-version": "^5.0.0", - "pupa": "^2.0.1", - "semver-diff": "^3.1.1", - "xdg-basedir": "^4.0.0" - } - }, - "uri-js": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", - "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", - "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==" - } - } - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "url-loader": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", - "requires": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.27", - "schema-utils": "^3.0.0" - }, - "dependencies": { - "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==", - "requires": { - "@types/json-schema": "^7.0.6", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - } - } - }, - "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "requires": { - "prepend-http": "^2.0.0" - }, - "dependencies": { - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" - } - } - }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" - }, - "util": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", - "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "requires": { - "inherits": "2.0.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "util.promisify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", - "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.2", - "has-symbols": "^1.0.1", - "object.getownpropertydescriptors": "^2.1.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=" - }, - "utility-types": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz", - "integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==" - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" - }, - "value-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz", - "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" - }, - "vendors": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", - "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==" - }, - "vfile": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", - "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", - "requires": { - "@types/unist": "^2.0.0", - "is-buffer": "^2.0.0", - "unist-util-stringify-position": "^2.0.0", - "vfile-message": "^2.0.0" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", - "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" - } - } - }, - "vfile-location": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz", - "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==" - }, - "vfile-message": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", - "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", - "requires": { - "@types/unist": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" - } - }, - "vm-browserify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", - "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" - }, - "wait-on": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz", - "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==", - "requires": { - "axios": "^0.21.1", - "joi": "^17.3.0", - "lodash": "^4.17.20", - "minimist": "^1.2.5", - "rxjs": "^6.6.3" - } - }, - "watchpack": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", - "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", - "requires": { - "chokidar": "^3.4.1", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.1" - } - }, - "watchpack-chokidar2": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz", - "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==", - "optional": true, - "requires": { - "chokidar": "^2.1.8" - }, - "dependencies": { - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "optional": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, - "dependencies": { - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "optional": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - } - } - }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "optional": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "optional": 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=", - "optional": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "optional": 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" - } - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "optional": 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==", - "optional": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "optional": 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=", - "optional": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "optional": true - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "optional": 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=", - "optional": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "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=", - "optional": true, - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "optional": 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=", - "optional": 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==", - "optional": 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" - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "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" - } - }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "optional": true, - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "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=", - "optional": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - } - } - }, - "wbuf": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "requires": { - "minimalistic-assert": "^1.0.0" - } - }, - "web-namespaces": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz", - "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" - }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" - }, - "webpack": { - "version": "4.44.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", - "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==", - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.3.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" - }, - "dependencies": { - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "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=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "cacache": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", - "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } - }, - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "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==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "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=", - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "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=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" - }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "requires": { - "yallist": "^3.0.2" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "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" - } - }, - "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==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - }, - "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==", - "requires": { - "find-up": "^3.0.0" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } - }, - "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==", - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - }, - "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", - "requires": { - "randombytes": "^2.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "requires": { - "figgy-pudding": "^3.5.1" - } - }, - "terser-webpack-plugin": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", - "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", - "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - } - }, - "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=", - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + "use-isomorphic-layout-effect": "^1.0.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "util.promisify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", + "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.2", + "has-symbols": "^1.0.1", + "object.getownpropertydescriptors": "^2.1.0" + } + }, + "utila": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", + "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=" + }, + "utility-types": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz", + "integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + }, + "value-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz", + "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" + }, + "vendors": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", + "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==" + }, + "vfile": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz", + "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==", + "requires": { + "@types/unist": "^2.0.0", + "is-buffer": "^2.0.0", + "unist-util-stringify-position": "^2.0.0", + "vfile-message": "^2.0.0" + }, + "dependencies": { + "is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==" } } }, + "vfile-location": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz", + "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==" + }, + "vfile-message": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz", + "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==", + "requires": { + "@types/unist": "^2.0.0", + "unist-util-stringify-position": "^2.0.0" + } + }, + "wait-on": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz", + "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==", + "requires": { + "axios": "^0.21.1", + "joi": "^17.3.0", + "lodash": "^4.17.21", + "minimist": "^1.2.5", + "rxjs": "^6.6.3" + } + }, + "watchpack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz", + "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==", + "requires": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + } + }, + "wbuf": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", + "requires": { + "minimalistic-assert": "^1.0.0" + } + }, + "web-namespaces": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz", + "integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==" + }, + "webpack": { + "version": "5.52.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.52.1.tgz", + "integrity": "sha512-wkGb0hLfrS7ML3n2xIKfUIwHbjB6gxwQHyLmVHoAqEQBw+nWo+G6LoHL098FEXqahqximsntjBLuewStrnJk0g==", + "requires": { + "@types/eslint-scope": "^3.7.0", + "@types/estree": "^0.0.50", + "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/wasm-edit": "1.11.1", + "@webassemblyjs/wasm-parser": "1.11.1", + "acorn": "^8.4.1", + "acorn-import-assertions": "^1.7.6", + "browserslist": "^4.14.5", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.8.0", + "es-module-lexer": "^0.7.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.4", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.1.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.1.3", + "watchpack": "^2.2.0", + "webpack-sources": "^3.2.0" + } + }, "webpack-bundle-analyzer": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz", - "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz", + "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==", "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1", - "bfj": "^6.1.1", - "chalk": "^2.4.1", - "commander": "^2.18.0", - "ejs": "^2.6.1", - "express": "^4.16.3", - "filesize": "^3.6.1", - "gzip-size": "^5.0.0", - "lodash": "^4.17.19", - "mkdirp": "^0.5.1", - "opener": "^1.5.1", - "ws": "^6.0.0" + "acorn": "^8.0.4", + "acorn-walk": "^8.0.0", + "chalk": "^4.1.0", + "commander": "^6.2.0", + "gzip-size": "^6.0.0", + "lodash": "^4.17.20", + "opener": "^1.5.2", + "sirv": "^1.0.7", + "ws": "^7.3.1" }, "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" + "commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "gzip-size": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", + "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "duplexer": "^0.1.2" } - }, - "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==" - }, - "filesize": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", - "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==" } } }, @@ -13366,16 +10212,16 @@ }, "dependencies": { "mime": { - "version": "2.4.7", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.7.tgz", - "integrity": "sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==" + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz", + "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==" } } }, "webpack-dev-server": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz", - "integrity": "sha512-u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ==", + "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==", "requires": { "ansi-html": "0.0.7", "bonjour": "^3.5.0", @@ -13593,11 +10439,6 @@ } } }, - "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==" - }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", @@ -13649,11 +10490,6 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==" }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -13696,6 +10532,11 @@ "ajv-keywords": "^3.1.0" } }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -13728,6 +10569,14 @@ "is-number": "^3.0.0", "repeat-string": "^1.6.1" } + }, + "ws": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "requires": { + "async-limiter": "~1.0.0" + } } } }, @@ -13741,100 +10590,32 @@ } }, "webpack-merge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", - "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", + "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "requires": { - "lodash": "^4.17.15" + "clone-deep": "^4.0.1", + "wildcard": "^2.0.0" } }, "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "requires": { - "source-list-map": "^2.0.0", - "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==" - } - } + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz", + "integrity": "sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==" }, "webpackbar": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-4.0.0.tgz", - "integrity": "sha512-k1qRoSL/3BVuINzngj09nIwreD8wxV4grcuhHTD8VJgUbGcy8lQSPqv+bM00B7F+PffwIsQ8ISd4mIwRbr23eQ==", + "version": "5.0.0-3", + "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-5.0.0-3.tgz", + "integrity": "sha512-viW6KCYjMb0NPoDrw2jAmLXU2dEOhRrtku28KmOfeE1vxbfwCYuTbTaMhnkrCZLFAFyY9Q49Z/jzYO80Dw5b8g==", "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^2.4.2", - "consola": "^2.10.0", - "figures": "^3.0.0", + "ansi-escapes": "^4.3.1", + "chalk": "^4.1.0", + "consola": "^2.15.0", + "figures": "^3.2.0", "pretty-time": "^1.1.0", "std-env": "^2.2.1", "text-table": "^0.2.0", - "wrap-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.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==", - "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==" - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.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==", - "requires": { - "color-convert": "^2.0.1" - } - } - } - } + "wrap-ansi": "^7.0.0" } }, "websocket-driver": { @@ -13852,21 +10633,6 @@ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, - "whatwg-fetch": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz", - "integrity": "sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==" - }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", - "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -13875,6 +10641,18 @@ "isexe": "^2.0.0" } }, + "which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "requires": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + } + }, "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", @@ -13888,13 +10666,10 @@ "string-width": "^4.0.0" } }, - "worker-farm": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", - "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", - "requires": { - "errno": "~0.1.7" - } + "wildcard": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", + "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" }, "worker-rpc": { "version": "0.1.1", @@ -13905,24 +10680,35 @@ } }, "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==", "requires": { - "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" }, "dependencies": { - "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==", + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "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==", + "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==" } } }, @@ -13943,12 +10729,9 @@ } }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", - "requires": { - "async-limiter": "~1.0.0" - } + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==" }, "xdg-basedir": { "version": "4.0.0", @@ -13963,20 +10746,15 @@ "sax": "^1.2.4" } }, - "xmlbuilder": { - "version": "13.0.2", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz", - "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==" - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", - "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" }, "yallist": { "version": "4.0.0", @@ -13984,9 +10762,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yaml": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", - "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==" + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" }, "yargs": { "version": "13.3.2", @@ -14022,6 +10800,14 @@ "path-exists": "^3.0.0" } }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "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", @@ -14044,6 +10830,14 @@ "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==", + "requires": { + "ansi-regex": "^4.1.0" + } } } }, diff --git a/website/package.json b/website/package.json index cb5274b3..4c93fb4f 100644 --- a/website/package.json +++ b/website/package.json @@ -8,12 +8,14 @@ "build": "docusaurus build", "swizzle": "docusaurus swizzle", "deploy": "docusaurus deploy", + "clear": "docusaurus clear", "serve": "docusaurus serve", - "clear": "docusaurus clear" + "write-translations": "docusaurus write-translations", + "write-heading-ids": "docusaurus write-heading-ids" }, "dependencies": { - "@docusaurus/core": "2.0.0-alpha.70", - "@docusaurus/preset-classic": "2.0.0-alpha.70", + "@docusaurus/core": "^2.0.0-beta.6", + "@docusaurus/preset-classic": "^2.0.0-beta.6", "@mdx-js/react": "^1.6.21", "clsx": "^1.1.1", "react": "^16.8.4", diff --git a/website/sidebars.js b/website/sidebars.js index 5829066d..8c2661ab 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -1,18 +1,29 @@ module.exports = { - someSidebar: { - Component: [ - 'Component/Geometry', - 'Component/IO', - 'Component/NameTag', - 'Component/SectionTag', - 'Component/StbBuilder' - ], - Usage: [ - 'Usage/HowToInstall', - 'Usage/ShowSTBModel', - 'Usage/ConvertToKaramba', - 'Usage/ExportSTB', - 'Usage/BakeGeometry' - ], - }, + Sidebar: [ + 'License', + { + type: 'category', + label: 'Getting Start', + collapsed: false, + items: [ + 'Usage/HowToInstall', + 'Usage/ShowSTBModel', + 'Usage/ConvertToKaramba', + 'Usage/ExportSTB', + 'Usage/BakeGeometry', + ] + }, + { + type: 'category', + label: 'Component Info', + items: [ + 'Component/Geometry', + 'Component/IO', + 'Component/NameTag', + 'Component/SectionTag', + 'Component/StbBuilder', + ] + }, + 'Changelog', + ], }; diff --git a/website/src/css/custom.css b/website/src/css/custom.css index 74ba0f27..e1d2e031 100644 --- a/website/src/css/custom.css +++ b/website/src/css/custom.css @@ -7,7 +7,7 @@ /* You can override the default Infima variables here. */ :root { - --ifm-color-primary: #25c2a0; + --ifm-color-primary: #ffae00; --ifm-color-primary-dark: rgb(33, 175, 144); --ifm-color-primary-darker: rgb(31, 165, 136); --ifm-color-primary-darkest: rgb(26, 136, 112); diff --git a/website/src/pages/index.js b/website/src/pages/index.js index e82db099..a27e46c0 100644 --- a/website/src/pages/index.js +++ b/website/src/pages/index.js @@ -5,33 +5,34 @@ import Link from '@docusaurus/Link'; import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import useBaseUrl from '@docusaurus/useBaseUrl'; import styles from './styles.module.css'; +import Translate, {translate} from '@docusaurus/Translate'; const features = [ { title: 'Easy to use', imageUrl: 'img/undraw_docusaurus_mountain.svg', description: ( - <> + HoaryFox は簡単に建築構造向け BIM データ "ST-Bridge" を Grasshopper で扱えるように設計しています。 - + ), }, { title: 'Focus on improvement of efficiency', imageUrl: 'img/undraw_docusaurus_tree.svg', description: ( - <> + Grasshopper の可視化や形状最適化機能を使った構造設計の効率化を目指しています。 - + ), }, { title: 'Enhance Karamba3D', imageUrl: 'img/undraw_docusaurus_react.svg', description: ( - <> + Grasshopper の構造解析ツール Karamba3D への ST-Bridge データの入出力をサポートします。 - + ), }, ]; @@ -68,7 +69,7 @@ function Home() { 'button button--outline button--secondary button--lg', styles.getStarted, )} - to={useBaseUrl('docs/Usage/HowToInstall')}> + to={useBaseUrl('docs/License')}> Get Started