diff --git a/.vscode/launch.json b/.vscode/launch.json
index bd78d78e..b5389f7c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,24 +6,22 @@
"configurations": [
{
"name": "index.html",
- "type": "chrome",
+ "type": "pwa-msedge",
"request": "launch",
"url": "http://localhost:8000/index.html",
- "runtimeArgs": [
- "--disable-web-security"
- ],
+ "runtimeArgs": [],
"webRoot": "${workspaceRoot}"
},
{
"name": "helloworld.html",
- "type": "chrome",
+ "type": "pwa-msedge",
"request": "launch",
"url": "file://${workspaceRoot}/helloworld.html",
"webRoot": "${workspaceRoot}"
},
{
- "name": "test-chrome",
- "type": "chrome",
+ "name": "test-browser",
+ "type": "pwa-msedge",
"request": "launch",
"url": "http://localhost:8000/test.html",
"webRoot": "${workspaceRoot}",
diff --git a/README.md b/README.md
index 3d670ef3..8b9a3e4a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This repository contains a collection of useful c++ libraries compiled to WASM f
* [expat](https://libexpat.github.io/) - v2.4.1
Built with:
-* [emsdk](https://github.com/emscripten-core/emsdk) - v2.0.24
+* [emsdk](https://github.com/emscripten-core/emsdk) - v2.0.25
## Quick GraphViz Demos
* https://raw.githack.com/hpcc-systems/hpcc-js-wasm/trunk/index.html
@@ -130,6 +130,10 @@ The _GraphViz_ library comes in **two** flavours
#### GraphViz API
+# **graphvizVersion**() · [<>](https://github.com/hpcc-systems/hpcc-js-wasm/blob/trunk/src/graphviz.ts "Source")
+
+Returns the Graphviz Version.
+
# **layout**(_dotSource_[, _outputFormat_][, _layoutEngine_][, _ext_]) · [<>](https://github.com/hpcc-systems/hpcc-js-wasm/blob/trunk/src/graphviz.ts "Source")
Performs layout for the supplied _dotSource_, see [The DOT Language](https://graphviz.gitlab.io/_pages/doc/info/lang.html) for specification.
@@ -268,6 +272,10 @@ Expat WASM library, provides a simplified wrapper around the Expat XML Parser li
#### Expat API
+# **expatVersion**() · [<>](https://github.com/hpcc-systems/hpcc-js-wasm/blob/trunk/src/expat.ts "Source")
+
+Returns the Expat Version.
+
# **parse**(_xml_, _callback_) · [<>](https://github.com/hpcc-systems/hpcc-js-wasm/blob/trunk/src/expat.ts "Source")
* **_xml_**: XML String.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 2d06c2b9..21183982 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -4,8 +4,9 @@ PROJECT(cpp)
SET(CMAKE_INSTALL_PREFIX "..")
-SET(EXPATSRC_DIRS "${CMAKE_SOURCE_DIR}/../src-expat")
-SET(GRAPHVIZSRC_DIRS "${CMAKE_SOURCE_DIR}/../src-graphviz")
+SET(EMSDK_DIR "${CMAKE_SOURCE_DIR}/../emsdk")
+SET(EXPAT_DIR "${CMAKE_SOURCE_DIR}/../src-expat/expat")
+SET(GRAPHVIZ_DIR "${CMAKE_SOURCE_DIR}/../src-graphviz")
ADD_SUBDIRECTORY(expat)
ADD_SUBDIRECTORY(graphviz)
diff --git a/cpp/expat/CMakeLists.txt b/cpp/expat/CMakeLists.txt
index d3ba303f..944b415b 100644
--- a/cpp/expat/CMakeLists.txt
+++ b/cpp/expat/CMakeLists.txt
@@ -1,6 +1,6 @@
set(CMAKE_CXX_STANDARD 17)
-SET(EXPAT_LIB_DIR "${EXPATSRC_DIRS}/expat/lib")
+SET(EXPAT_LIB_DIR "${EXPAT_DIR}/lib")
ADD_DEFINITIONS(-DXML_POOR_ENTROPY)
diff --git a/cpp/expat/config.h b/cpp/expat/config.h
new file mode 100644
index 00000000..3a00a2f8
--- /dev/null
+++ b/cpp/expat/config.h
@@ -0,0 +1 @@
+#include "../../src-expat/expat/expat_config.h"
diff --git a/cpp/expat/expatlib/CMakeLists.txt b/cpp/expat/expatlib/CMakeLists.txt
index dada55b2..c25a31a6 100644
--- a/cpp/expat/expatlib/CMakeLists.txt
+++ b/cpp/expat/expatlib/CMakeLists.txt
@@ -1,6 +1,6 @@
PROJECT(expatlib)
-SET(EM_FLAGS "-s WASM=1 -s INVOKE_RUN=0 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s EXPORT_NAME='${CMAKE_PROJECT_NAME}' -s EXPORTED_FUNCTIONS=\"['_malloc']\" --post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js")
+SET(EM_FLAGS "-s WASM=1 -s INVOKE_RUN=0 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=2 -s EXPORT_NAME='${CMAKE_PROJECT_NAME}' -s EXPORTED_FUNCTIONS=\"['_malloc']\" --post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js")
# Generate Glue from IDL file ---
ADD_CUSTOM_COMMAND(
diff --git a/cpp/expat/expatlib/main.cpp b/cpp/expat/expatlib/main.cpp
index 39be9c12..5e4079e1 100644
--- a/cpp/expat/expatlib/main.cpp
+++ b/cpp/expat/expatlib/main.cpp
@@ -1,3 +1,4 @@
+#include "../config.h"
#include "stack_parser.h"
#include
@@ -13,6 +14,11 @@ class CExpat : public CExpatImpl
std::string m_content;
public:
+ static const char *version()
+ {
+ return PACKAGE_VERSION;
+ }
+
CExpat()
{
}
diff --git a/cpp/expat/expatlib/main.idl b/cpp/expat/expatlib/main.idl
index 33044193..7498ad8c 100644
--- a/cpp/expat/expatlib/main.idl
+++ b/cpp/expat/expatlib/main.idl
@@ -1,6 +1,7 @@
interface CExpat
{
void CExpat();
+ [Const] static DOMString version();
boolean create();
void destroy();
boolean parse([Const] DOMString xml);
@@ -12,8 +13,8 @@ interface CExpat
void characterData();
};
-[JSImplementation = "CExpat"]
-interface CExpatJS {
+[JSImplementation = "CExpat"] interface CExpatJS
+{
void CExpatJS();
void startElement();
void endElement();
diff --git a/cpp/graphviz/CMakeLists.txt b/cpp/graphviz/CMakeLists.txt
index df37251f..f18bf3b7 100644
--- a/cpp/graphviz/CMakeLists.txt
+++ b/cpp/graphviz/CMakeLists.txt
@@ -1,8 +1,8 @@
PROJECT(graphlayout)
-set(TOP_SOURCE_DIR "${GRAPHVIZSRC_DIRS}")
-SET(GRAPHVIZ_LIB_DIR "${GRAPHVIZSRC_DIRS}/lib")
-SET(GRAPHVIZ_BIN_DIR "${GRAPHVIZSRC_DIRS}/build/lib")
+SET(GRAPHVIZ_LIB_DIR "${GRAPHVIZ_DIR}/lib")
+SET(GRAPHVIZ_PLUGIN_DIR "${GRAPHVIZ_DIR}/plugin")
+SET(GRAPHVIZ_BUILD_DIR "${GRAPHVIZ_DIR}/build")
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/cpp/graphviz/config.h b/cpp/graphviz/config.h
index 1ae5cbc3..cedef17b 100644
--- a/cpp/graphviz/config.h
+++ b/cpp/graphviz/config.h
@@ -1,4 +1,4 @@
-#include <../../src-graphviz/config.h>
+#include "../../src-graphviz/config.h"
#undef ENABLE_LTDL
#undef HAVE_LIBZ
#undef HAVE_GTS
diff --git a/cpp/graphviz/graphvizlib/CMakeLists.txt b/cpp/graphviz/graphvizlib/CMakeLists.txt
index e3a5de37..970ed030 100644
--- a/cpp/graphviz/graphvizlib/CMakeLists.txt
+++ b/cpp/graphviz/graphvizlib/CMakeLists.txt
@@ -1,6 +1,6 @@
PROJECT(graphvizlib)
-SET(EM_FLAGS "-s WASM=1 -s INVOKE_RUN=0 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s EXPORT_NAME='${CMAKE_PROJECT_NAME}' --post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js")
+SET(EM_FLAGS "-s WASM=1 -s INVOKE_RUN=0 -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=2 -s EXPORT_NAME='${CMAKE_PROJECT_NAME}' --post-js ${CMAKE_CURRENT_BINARY_DIR}/main_glue.js")
# Generate Glue from IDL file ---
ADD_CUSTOM_COMMAND(
@@ -13,7 +13,6 @@ SET_PROPERTY(SOURCE main.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINA
SET(SRCS
main.cpp
- fs.cpp
)
INCLUDE_DIRECTORIES(
diff --git a/cpp/graphviz/graphvizlib/fs.cpp b/cpp/graphviz/graphvizlib/fs.cpp
deleted file mode 100644
index 8af0f240..00000000
--- a/cpp/graphviz/graphvizlib/fs.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "main.hpp"
-
-#include
-
-void Main::createFile(const char *path, const char *data)
-{
- EM_ASM_({
- var path = UTF8ToString($0);
- var data = UTF8ToString($1);
-
- FS.createPath("/", PATH.dirname(path));
- FS.writeFile(PATH.join("/", path), data);
- },
- path, data);
-}
diff --git a/cpp/graphviz/graphvizlib/main.cpp b/cpp/graphviz/graphvizlib/main.cpp
index c69811ce..0dedaa32 100644
--- a/cpp/graphviz/graphvizlib/main.cpp
+++ b/cpp/graphviz/graphvizlib/main.cpp
@@ -1,30 +1,51 @@
#include "main.hpp"
+#include "../config.h"
#include
#include
-#include
+
+#include
extern gvplugin_library_t gvplugin_core_LTX_library;
extern gvplugin_library_t gvplugin_dot_layout_LTX_library;
extern gvplugin_library_t gvplugin_neato_layout_LTX_library;
-std::string errorMessage = "";
+char lastErrorStr[1024];
int vizErrorf(char *buf)
{
- errorMessage = buf;
+ strncpy(lastErrorStr, buf, sizeof(lastErrorStr) - 1);
return 0;
}
-const char *Main::layout(const char *src, const char *format, const char *engine)
+const char *Graphviz::version()
{
- errorMessage = "";
- char *result = NULL;
- GVC_t *context;
- Agraph_t *graph;
- unsigned int length;
+ return PACKAGE_VERSION;
+}
+
+const char *Graphviz::lastError()
+{
+ return lastErrorStr;
+}
+
+int origYInvert = Y_invert;
+int origNop = Nop;
+
+Graphviz::Graphviz(bool yInvert, int nop)
+{
+ Y_invert = yInvert == true ? 1 : origYInvert;
+ Nop = nop > 0 ? nop : origNop;
+}
+
+Graphviz::~Graphviz()
+{
+}
+
+const char *Graphviz::layout(const char *src, const char *format, const char *engine)
+{
+ lastErrorStr[0] = '\0';
- context = gvContext();
+ GVC_t *context = gvContext();
gvAddLibrary(context, &gvplugin_core_LTX_library);
gvAddLibrary(context, &gvplugin_dot_layout_LTX_library);
gvAddLibrary(context, &gvplugin_neato_layout_LTX_library);
@@ -34,6 +55,9 @@ const char *Main::layout(const char *src, const char *format, const char *engine
agreadline(1);
+ Agraph_t *graph;
+ char *result = NULL;
+ unsigned int length;
while ((graph = agmemread(src)))
{
if (result == NULL)
@@ -51,38 +75,17 @@ const char *Main::layout(const char *src, const char *format, const char *engine
return result;
}
-const char *Main::lastError()
-{
- return errorMessage.c_str();
-}
-
-void Main::setYInvert(int yInvert)
-{
- Y_invert = yInvert;
-}
-
-void Main::setNop(int nop)
+void Graphviz::createFile(const char *path, const char *data)
{
- if (nop != 0)
- Nop = nop;
-}
-
-// Patch for invalid osage function ---
-// https://gitlab.com/graphviz/graphviz/issues/1544
-#include "types.h"
-#include "SparseMatrix.h"
-extern "C"
-{
- void remove_overlap(int dim, SparseMatrix A, double *x, double *label_sizes, int ntry, double initial_scaling, int edge_labeling_scheme, int n_constr_nodes, int *constr_nodes, SparseMatrix A_constr, int do_shrinking, int *flag)
- {
- static int once;
-
- if (once == 0)
+ EM_ASM(
{
- once = 1;
- agerr(AGERR, "remove_overlap: Graphviz not built with triangulation library\n");
- }
- }
+ var path = UTF8ToString($0);
+ var data = UTF8ToString($1);
+
+ FS.createPath("/", PATH.dirname(path));
+ FS.writeFile(PATH.join("/", path), data);
+ },
+ path, data);
}
// Include JS Glue ---
diff --git a/cpp/graphviz/graphvizlib/main.hpp b/cpp/graphviz/graphvizlib/main.hpp
index 14004e53..638bdba0 100644
--- a/cpp/graphviz/graphvizlib/main.hpp
+++ b/cpp/graphviz/graphvizlib/main.hpp
@@ -1,9 +1,12 @@
-class Main
+class Graphviz
{
+protected:
public:
- static const char *layout(const char *dot, const char *format, const char *engine);
+ static const char *version();
static const char *lastError();
- static void createFile(const char *path, const char *data);
- static void setYInvert(int yInvert);
- static void setNop(int nop);
+
+ Graphviz(bool yInvert = false, int nop = 0);
+ ~Graphviz();
+ const char *layout(const char *dot, const char *format, const char *engine);
+ void createFile(const char *path, const char *data);
};
diff --git a/cpp/graphviz/graphvizlib/main.idl b/cpp/graphviz/graphvizlib/main.idl
index e697fabe..4bc9821b 100644
--- a/cpp/graphviz/graphvizlib/main.idl
+++ b/cpp/graphviz/graphvizlib/main.idl
@@ -1,8 +1,8 @@
-interface Main {
- [Const] static DOMString layout([Const] DOMString dot, [Const] DOMString format, [Const] DOMString engine);
+interface Graphviz
+{
+ void Graphviz(long yInvert, long nop);
+ [Const] static DOMString version();
[Const] static DOMString lastError();
+ [Const] DOMString layout([Const] DOMString dot, [Const] DOMString format, [Const] DOMString engine);
void createFile([Const] DOMString file, [Const] DOMString data);
- void setYInvert(long yInvert);
- void setNop(long nop);
};
-
diff --git a/cpp/graphviz/lib/cgraph/CMakeLists.txt b/cpp/graphviz/lib/cgraph/CMakeLists.txt
index 75bb29be..f1938950 100644
--- a/cpp/graphviz/lib/cgraph/CMakeLists.txt
+++ b/cpp/graphviz/lib/cgraph/CMakeLists.txt
@@ -30,15 +30,15 @@ add_library(cgraph STATIC
${GRAPHVIZ_LIB_DIR}/cgraph/write.c
# Generated files
- ${GRAPHVIZSRC_DIRS}/build/lib/cgraph/grammar.c
- ${GRAPHVIZSRC_DIRS}/build/lib/cgraph/scan.c
+ ${GRAPHVIZ_BUILD_DIR}/lib/cgraph/grammar.c
+ ${GRAPHVIZ_BUILD_DIR}/lib/cgraph/scan.c
)
target_include_directories(cgraph PRIVATE
${GRAPHVIZ_LIB_DIR}
${GRAPHVIZ_LIB_DIR}/cdt
${GRAPHVIZ_LIB_DIR}/cgraph
- ${GRAPHVIZSRC_DIRS}/build/lib/cgraph
+ ${GRAPHVIZ_BUILD_DIR}/lib/cgraph
)
target_link_libraries(cgraph cdt)
diff --git a/cpp/graphviz/lib/common/CMakeLists.txt b/cpp/graphviz/lib/common/CMakeLists.txt
index db6fa0d4..2c849d6f 100644
--- a/cpp/graphviz/lib/common/CMakeLists.txt
+++ b/cpp/graphviz/lib/common/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(common STATIC
${GRAPHVIZ_LIB_DIR}/common/arith.h
${GRAPHVIZ_LIB_DIR}/common/color.h
${GRAPHVIZ_LIB_DIR}/common/colorprocs.h
- ${GRAPHVIZSRC_DIRS}/build/lib/common/common/colortbl.h
+ ${GRAPHVIZ_BUILD_DIR}/lib/common/common/colortbl.h
${GRAPHVIZ_LIB_DIR}/common/const.h
${GRAPHVIZ_LIB_DIR}/common/entities.h
${GRAPHVIZ_LIB_DIR}/common/geom.h
@@ -53,19 +53,19 @@ add_library(common STATIC
${GRAPHVIZ_LIB_DIR}/common/utils.c
# Generated files
- ${GRAPHVIZSRC_DIRS}/build/lib/common/htmlparse.c
+ ${GRAPHVIZ_BUILD_DIR}/lib/common/htmlparse.c
)
target_include_directories(common PRIVATE
${GRAPHVIZ_LIB_DIR}
${GRAPHVIZ_LIB_DIR}/common
- ${GRAPHVIZ_BIN_DIR}/common
+ ${GRAPHVIZ_BUILD_DIR}/lib/common
${GRAPHVIZ_LIB_DIR}/cdt
${GRAPHVIZ_LIB_DIR}/cgraph
${GRAPHVIZ_LIB_DIR}/gvc
${GRAPHVIZ_LIB_DIR}/pack
${GRAPHVIZ_LIB_DIR}/pathplan
${GRAPHVIZ_LIB_DIR}/xdot
- ${EXPATSRC_DIRS}/expat/lib
+ ${EXPAT_DIR}/lib
)
diff --git a/cpp/graphviz/lib/gvc/CMakeLists.txt b/cpp/graphviz/lib/gvc/CMakeLists.txt
index bdfd86e8..e84815ff 100644
--- a/cpp/graphviz/lib/gvc/CMakeLists.txt
+++ b/cpp/graphviz/lib/gvc/CMakeLists.txt
@@ -34,7 +34,7 @@ add_library(gvc STATIC
target_include_directories(gvc PRIVATE
${GRAPHVIZ_LIB_DIR}
${GRAPHVIZ_LIB_DIR}/gvc
- ${TOP_SOURCE_DIR}
+ ${GRAPHVIZ_DIR}
${GRAPHVIZ_LIB_DIR}/ast
${GRAPHVIZ_LIB_DIR}/cdt
${GRAPHVIZ_LIB_DIR}/cgraph
@@ -46,6 +46,7 @@ target_link_libraries(gvc
cdt
cgraph
label
+ pack
pathplan
xdot
expat
diff --git a/cpp/graphviz/plugin/core/CMakeLists.txt b/cpp/graphviz/plugin/core/CMakeLists.txt
index 94ce82f7..896bc076 100644
--- a/cpp/graphviz/plugin/core/CMakeLists.txt
+++ b/cpp/graphviz/plugin/core/CMakeLists.txt
@@ -1,27 +1,27 @@
add_library(gvplugin_core STATIC
# Header files
- ${GRAPHVIZSRC_DIRS}/build/plugin/core/ps.h
+ ${GRAPHVIZ_BUILD_DIR}/plugin/core/ps.h
# Source files
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvloadimage_core.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvplugin_core.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_dot.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_json.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_fig.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_map.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_mp.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_pic.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_pov.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_ps.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_svg.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_tk.c
- ${GRAPHVIZSRC_DIRS}/plugin/core/gvrender_core_vml.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvloadimage_core.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvplugin_core.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_dot.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_json.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_fig.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_map.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_mp.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_pic.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_pov.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_ps.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_svg.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_tk.c
+ ${GRAPHVIZ_PLUGIN_DIR}/core/gvrender_core_vml.c
)
target_include_directories(gvplugin_core PRIVATE
${GRAPHVIZ_LIB_DIR}
- ${GRAPHVIZSRC_DIRS}/plugin/core
- ${GRAPHVIZSRC_DIRS}/build/plugin/core
+ ${GRAPHVIZ_PLUGIN_DIR}/core
+ ${GRAPHVIZ_BUILD_DIR}/plugin/core
${GRAPHVIZ_LIB_DIR}/cdt
${GRAPHVIZ_LIB_DIR}/cgraph
${GRAPHVIZ_LIB_DIR}/common
diff --git a/cpp/graphviz/plugin/dot_layout/CMakeLists.txt b/cpp/graphviz/plugin/dot_layout/CMakeLists.txt
index 307c0f1d..795708ff 100644
--- a/cpp/graphviz/plugin/dot_layout/CMakeLists.txt
+++ b/cpp/graphviz/plugin/dot_layout/CMakeLists.txt
@@ -1,12 +1,12 @@
add_library(gvplugin_dot_layout STATIC
# Source files
- ${GRAPHVIZSRC_DIRS}/plugin/dot_layout/gvplugin_dot_layout.c
- ${GRAPHVIZSRC_DIRS}/plugin/dot_layout/gvlayout_dot_layout.c
+ ${GRAPHVIZ_PLUGIN_DIR}/dot_layout/gvplugin_dot_layout.c
+ ${GRAPHVIZ_PLUGIN_DIR}/dot_layout/gvlayout_dot_layout.c
)
target_include_directories(gvplugin_dot_layout PRIVATE
${GRAPHVIZ_LIB_DIR}
- ${GRAPHVIZSRC_DIRS}/plugin/dot_layout
+ ${GRAPHVIZ_PLUGIN_DIR}/dot_layout
${GRAPHVIZ_LIB_DIR}/cdt
${GRAPHVIZ_LIB_DIR}/cgraph
${GRAPHVIZ_LIB_DIR}/common
diff --git a/cpp/graphviz/plugin/neato_layout/CMakeLists.txt b/cpp/graphviz/plugin/neato_layout/CMakeLists.txt
index 32f9fbec..326caa13 100644
--- a/cpp/graphviz/plugin/neato_layout/CMakeLists.txt
+++ b/cpp/graphviz/plugin/neato_layout/CMakeLists.txt
@@ -1,12 +1,12 @@
add_library(gvplugin_neato_layout STATIC
# Source files
- ${GRAPHVIZSRC_DIRS}/plugin/neato_layout/gvplugin_neato_layout.c
- ${GRAPHVIZSRC_DIRS}/plugin/neato_layout/gvlayout_neato_layout.c
+ ${GRAPHVIZ_PLUGIN_DIR}/neato_layout/gvplugin_neato_layout.c
+ ${GRAPHVIZ_PLUGIN_DIR}/neato_layout/gvlayout_neato_layout.c
)
target_include_directories(gvplugin_neato_layout PRIVATE
${GRAPHVIZ_LIB_DIR}
- ${GRAPHVIZSRC_DIRS}/plugin/neato_layout
+ ${GRAPHVIZ_PLUGIN_DIR}/neato_layout
${GRAPHVIZ_LIB_DIR}/cdt
${GRAPHVIZ_LIB_DIR}/cgraph
${GRAPHVIZ_LIB_DIR}/common
diff --git a/package-lock.json b/package-lock.json
index 37528e77..9d369bf1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,16 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@75lb/deep-merge": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@75lb/deep-merge/-/deep-merge-1.0.0.tgz",
+ "integrity": "sha512-L5b+j4Kwezqz8JeROaEkEj5navyVIdeR+LS9XTbCem7W5C4DdJedWCTQKnkuQIXvOEdk4q7g0vCrN+FEUzbpaw==",
+ "dev": true,
+ "requires": {
+ "lodash.assignwith": "^4.2.0",
+ "typical": "^7.0.0"
+ }
+ },
"@babel/code-frame": {
"version": "7.12.11",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
@@ -48,9 +58,37 @@
},
"dependencies": {
"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==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "@humanwhocodes/config-array": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+ "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+ "dev": true,
+ "requires": {
+ "@humanwhocodes/object-schema": "^1.2.0",
+ "debug": "^4.1.1",
+ "minimatch": "^3.0.4"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+ "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -64,6 +102,18 @@
}
}
},
+ "@humanwhocodes/object-schema": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+ "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+ "dev": true
+ },
+ "@hutson/parse-repository-url": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz",
+ "integrity": "sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==",
+ "dev": true
+ },
"@koa/cors": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@koa/cors/-/cors-3.1.0.tgz",
@@ -73,6 +123,32 @@
"vary": "^1.1.2"
}
},
+ "@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+ "dev": true,
+ "requires": {
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
+ }
+ },
+ "@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "dev": true
+ },
+ "@nodelib/fs.walk": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+ "dev": true,
+ "requires": {
+ "@nodelib/fs.scandir": "2.1.5",
+ "fastq": "^1.6.0"
+ }
+ },
"@rollup/plugin-alias": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-3.1.2.tgz",
@@ -83,9 +159,9 @@
}
},
"@rollup/plugin-commonjs": {
- "version": "17.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz",
- "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==",
+ "version": "19.0.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-19.0.0.tgz",
+ "integrity": "sha512-adTpD6ATGbehdaQoZQ6ipDFhdjqsTgpOAhFiPwl+dzre4pPshsecptDPyEFb61JMJ1+mGljktaC4jI8ARMSNyw==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.1.0",
@@ -110,9 +186,9 @@
}
},
"@rollup/plugin-node-resolve": {
- "version": "11.2.1",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
- "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
+ "version": "13.0.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.0.tgz",
+ "integrity": "sha512-41X411HJ3oikIDivT5OKe9EZ6ud6DXudtfNrGbC4nniaxx2esiWjkLOzgnZsWq1IM8YIeL2rzRGLZLBjlhnZtQ==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.1.0",
@@ -171,15 +247,9 @@
"dev": true
},
"@types/chai": {
- "version": "4.2.19",
- "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.19.tgz",
- "integrity": "sha512-jRJgpRBuY+7izT7/WNXP/LsMO9YonsstuL+xuvycDyESpoDoIAsMd7suwpB4h9oEWB+ZlPTqJJ8EHomzNhwTPQ==",
- "dev": true
- },
- "@types/eslint-visitor-keys": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
- "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
+ "version": "4.2.21",
+ "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.21.tgz",
+ "integrity": "sha512-yd+9qKmJxm496BOV9CMNaey8TWsikaZOwMRwPHQIjcOJM9oV+fi9ZMNw3JsVnbEEbo2gRTDnGEBv8pjyn67hNg==",
"dev": true
},
"@types/estree": {
@@ -189,9 +259,9 @@
"dev": true
},
"@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.8",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz",
+ "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==",
"dev": true
},
"@types/minimist": {
@@ -201,9 +271,9 @@
"dev": true
},
"@types/mocha": {
- "version": "8.2.2",
- "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz",
- "integrity": "sha512-Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw==",
+ "version": "8.2.3",
+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.3.tgz",
+ "integrity": "sha512-ekGvFhFgrc2zYQoX4JeZPmVzZxw6Dtllga7iGHzfbYIYkAMUx/sAFP2GdFpLff+vdHXu5fl7WX9AT+TtqYcsyw==",
"dev": true
},
"@types/node": {
@@ -228,23 +298,24 @@
}
},
"@typescript-eslint/eslint-plugin": {
- "version": "3.10.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz",
- "integrity": "sha512-PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ==",
+ "version": "4.28.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.2.tgz",
+ "integrity": "sha512-PGqpLLzHSxq956rzNGasO3GsAPf2lY9lDUBXhS++SKonglUmJypaUtcKzRtUte8CV7nruwnDxtLUKpVxs0wQBw==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "3.10.1",
- "debug": "^4.1.1",
+ "@typescript-eslint/experimental-utils": "4.28.2",
+ "@typescript-eslint/scope-manager": "4.28.2",
+ "debug": "^4.3.1",
"functional-red-black-tree": "^1.0.1",
- "regexpp": "^3.0.0",
- "semver": "^7.3.2",
- "tsutils": "^3.17.1"
+ "regexpp": "^3.1.0",
+ "semver": "^7.3.5",
+ "tsutils": "^3.21.0"
},
"dependencies": {
"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==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -257,83 +328,111 @@
"dev": true
},
"semver": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
- "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
}
- },
- "tslib": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
- "dev": true
- },
- "tsutils": {
- "version": "3.19.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.19.0.tgz",
- "integrity": "sha512-A7BaLUPvcQ1cxVu72YfD+UMI3SQPTDv/w4ol6TOwLyI0hwfG9EC+cYlhdflJTmtYTgZ3KqdPSe/otxU4K3kArg==",
+ }
+ }
+ },
+ "@typescript-eslint/experimental-utils": {
+ "version": "4.28.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.2.tgz",
+ "integrity": "sha512-MwHPsL6qo98RC55IoWWP8/opTykjTp4JzfPu1VfO2Z0MshNP0UZ1GEV5rYSSnZSUI8VD7iHvtIPVGW5Nfh7klQ==",
+ "dev": true,
+ "requires": {
+ "@types/json-schema": "^7.0.7",
+ "@typescript-eslint/scope-manager": "4.28.2",
+ "@typescript-eslint/types": "4.28.2",
+ "@typescript-eslint/typescript-estree": "4.28.2",
+ "eslint-scope": "^5.1.1",
+ "eslint-utils": "^3.0.0"
+ },
+ "dependencies": {
+ "eslint-utils": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+ "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
"dev": true,
"requires": {
- "tslib": "^1.8.1"
+ "eslint-visitor-keys": "^2.0.0"
}
+ },
+ "eslint-visitor-keys": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+ "dev": true
}
}
},
- "@typescript-eslint/experimental-utils": {
- "version": "3.10.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz",
- "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==",
+ "@typescript-eslint/parser": {
+ "version": "4.28.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.2.tgz",
+ "integrity": "sha512-Q0gSCN51eikAgFGY+gnd5p9bhhCUAl0ERMiDKrTzpSoMYRubdB8MJrTTR/BBii8z+iFwz8oihxd0RAdP4l8w8w==",
"dev": true,
"requires": {
- "@types/json-schema": "^7.0.3",
- "@typescript-eslint/types": "3.10.1",
- "@typescript-eslint/typescript-estree": "3.10.1",
- "eslint-scope": "^5.0.0",
- "eslint-utils": "^2.0.0"
+ "@typescript-eslint/scope-manager": "4.28.2",
+ "@typescript-eslint/types": "4.28.2",
+ "@typescript-eslint/typescript-estree": "4.28.2",
+ "debug": "^4.3.1"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+ "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
}
},
- "@typescript-eslint/parser": {
- "version": "3.10.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz",
- "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==",
+ "@typescript-eslint/scope-manager": {
+ "version": "4.28.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.2.tgz",
+ "integrity": "sha512-MqbypNjIkJFEFuOwPWNDjq0nqXAKZvDNNs9yNseoGBB1wYfz1G0WHC2AVOy4XD7di3KCcW3+nhZyN6zruqmp2A==",
"dev": true,
"requires": {
- "@types/eslint-visitor-keys": "^1.0.0",
- "@typescript-eslint/experimental-utils": "3.10.1",
- "@typescript-eslint/types": "3.10.1",
- "@typescript-eslint/typescript-estree": "3.10.1",
- "eslint-visitor-keys": "^1.1.0"
+ "@typescript-eslint/types": "4.28.2",
+ "@typescript-eslint/visitor-keys": "4.28.2"
}
},
"@typescript-eslint/types": {
- "version": "3.10.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz",
- "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==",
+ "version": "4.28.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.2.tgz",
+ "integrity": "sha512-Gr15fuQVd93uD9zzxbApz3wf7ua3yk4ZujABZlZhaxxKY8ojo448u7XTm/+ETpy0V0dlMtj6t4VdDvdc0JmUhA==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "3.10.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz",
- "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==",
+ "version": "4.28.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.2.tgz",
+ "integrity": "sha512-86lLstLvK6QjNZjMoYUBMMsULFw0hPHJlk1fzhAVoNjDBuPVxiwvGuPQq3fsBMCxuDJwmX87tM/AXoadhHRljg==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "3.10.1",
- "@typescript-eslint/visitor-keys": "3.10.1",
- "debug": "^4.1.1",
- "glob": "^7.1.6",
+ "@typescript-eslint/types": "4.28.2",
+ "@typescript-eslint/visitor-keys": "4.28.2",
+ "debug": "^4.3.1",
+ "globby": "^11.0.3",
"is-glob": "^4.0.1",
- "lodash": "^4.17.15",
- "semver": "^7.3.2",
- "tsutils": "^3.17.1"
+ "semver": "^7.3.5",
+ "tsutils": "^3.21.0"
},
"dependencies": {
"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==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -346,38 +445,32 @@
"dev": true
},
"semver": {
- "version": "7.3.4",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
- "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
"dev": true,
"requires": {
"lru-cache": "^6.0.0"
}
- },
- "tslib": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
- "dev": true
- },
- "tsutils": {
- "version": "3.19.0",
- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.19.0.tgz",
- "integrity": "sha512-A7BaLUPvcQ1cxVu72YfD+UMI3SQPTDv/w4ol6TOwLyI0hwfG9EC+cYlhdflJTmtYTgZ3KqdPSe/otxU4K3kArg==",
- "dev": true,
- "requires": {
- "tslib": "^1.8.1"
- }
}
}
},
"@typescript-eslint/visitor-keys": {
- "version": "3.10.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz",
- "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==",
+ "version": "4.28.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.2.tgz",
+ "integrity": "sha512-aT2B4PLyyRDUVUafXzpZFoc0C9t0za4BJAKP5sgWIhG+jHECQZUEjuQSCIwZdiJJ4w4cgu5r3Kh20SOdtEBl0w==",
"dev": true,
"requires": {
- "eslint-visitor-keys": "^1.1.0"
+ "@typescript-eslint/types": "4.28.2",
+ "eslint-visitor-keys": "^2.0.0"
+ },
+ "dependencies": {
+ "eslint-visitor-keys": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+ "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+ "dev": true
+ }
}
},
"@ungap/promise-all-settled": {
@@ -413,9 +506,9 @@
"dev": true
},
"acorn-jsx": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
- "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+ "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
"dev": true
},
"add-stream": {
@@ -434,9 +527,9 @@
},
"dependencies": {
"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==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -469,12 +562,12 @@
"dev": true
},
"ansi-escape-sequences": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz",
- "integrity": "sha512-JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw==",
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-6.1.1.tgz",
+ "integrity": "sha512-CvFGwFGLSDnQc4l30zWbGXN0w3TnfRe4MTGm1T7AmuX7wSbQKYfLgwBCLMoSJldiZ22zHzqY/Wv4DADfzOzElw==",
"dev": true,
"requires": {
- "array-back": "^4.0.0"
+ "array-back": "^6.1.2"
}
},
"ansi-regex": {
@@ -518,9 +611,9 @@
}
},
"array-back": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz",
- "integrity": "sha512-Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg==",
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/array-back/-/array-back-6.1.2.tgz",
+ "integrity": "sha512-V/+UG3q3273RgjbayqQrWbdCEFJqGXa5gnvaBnDtmrFlMXQoTypYpu1DVSSrHytX1U72LzL8CkoQS9N86LV9Cw==",
"dev": true
},
"array-filter": {
@@ -553,6 +646,12 @@
"integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
"dev": true
},
+ "array-union": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+ "dev": true
+ },
"arrify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
@@ -642,9 +741,9 @@
"dev": true
},
"byte-size": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-6.2.0.tgz",
- "integrity": "sha512-6EspYUCAPMc7E2rltBgKwhG+Cmk0pDm9zDtF1Awe2dczNUL3YpZ8mTs/dueOTS1hqGWBOatqef4jYMGjln7WmA==",
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-8.0.0.tgz",
+ "integrity": "sha512-W9nozFNCma06nuwM+s/r3gP3sX3++QQm8qNQf3Gch2In1vZpDNpT3lEg73i18H1E9d0750/HXP52n/gbg8DNZw==",
"dev": true
},
"bytes": {
@@ -663,6 +762,16 @@
"ylru": "^1.2.0"
}
},
+ "call-bind": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ }
+ },
"callsites": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -718,19 +827,19 @@
"dev": true
},
"chokidar": {
- "version": "3.5.1",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
- "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+ "version": "3.5.2",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+ "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
"dev": true,
"requires": {
- "anymatch": "~3.1.1",
+ "anymatch": "~3.1.2",
"braces": "~3.0.2",
- "fsevents": "~2.3.1",
- "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"
}
},
"chrome-launcher": {
@@ -826,12 +935,12 @@
"dev": true
},
"command-line-args": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
- "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.3.tgz",
+ "integrity": "sha512-a5tF6mjqRSOBswBwdMkKY47JQ464Dkg9Pcwbxwo9wxRhKWZjtBktmBASllk3AMJ7qBuWgsAGtVa7b2/+EsymOQ==",
"dev": true,
"requires": {
- "array-back": "^3.0.1",
+ "array-back": "^3.1.0",
"find-replace": "^3.0.0",
"lodash.camelcase": "^4.3.0",
"typical": "^4.0.0"
@@ -863,6 +972,12 @@
"typical": "^5.2.0"
},
"dependencies": {
+ "array-back": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+ "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+ "dev": true
+ },
"typical": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
@@ -1019,16 +1134,16 @@
}
},
"conventional-changelog-core": {
- "version": "4.2.2",
- "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.2.tgz",
- "integrity": "sha512-7pDpRUiobQDNkwHyJG7k9f6maPo9tfPzkSWbRq97GGiZqisElhnvUZSvyQH20ogfOjntB5aadvv6NNcKL1sReg==",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-4.2.3.tgz",
+ "integrity": "sha512-MwnZjIoMRL3jtPH5GywVNqetGILC7g6RQFvdb8LRU/fA/338JbeWAku3PZ8yQ+mtVRViiISqJlb0sOz0htBZig==",
"dev": true,
"requires": {
"add-stream": "^1.0.0",
- "conventional-changelog-writer": "^4.0.18",
+ "conventional-changelog-writer": "^5.0.0",
"conventional-commits-parser": "^3.2.0",
"dateformat": "^3.0.0",
- "get-pkg-repo": "^1.0.0",
+ "get-pkg-repo": "^4.0.0",
"git-raw-commits": "^2.0.8",
"git-remote-origin-url": "^2.0.0",
"git-semver-tags": "^4.1.1",
@@ -1037,7 +1152,6 @@
"q": "^1.5.1",
"read-pkg": "^3.0.0",
"read-pkg-up": "^3.0.0",
- "shelljs": "^0.8.3",
"through2": "^4.0.0"
},
"dependencies": {
@@ -1136,12 +1250,11 @@
"dev": true
},
"conventional-changelog-writer": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz",
- "integrity": "sha512-WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-5.0.0.tgz",
+ "integrity": "sha512-HnDh9QHLNWfL6E1uHz6krZEQOgm8hN7z/m7tT16xwd802fwgMN0Wqd7AQYVkhpsjDUx/99oo+nGgvKF657XP5g==",
"dev": true,
"requires": {
- "compare-func": "^2.0.0",
"conventional-commits-filter": "^2.0.7",
"dateformat": "^3.0.0",
"handlebars": "^4.7.6",
@@ -1996,14 +2109,6 @@
"requires": {
"depd": "~2.0.0",
"keygrip": "~1.1.0"
- },
- "dependencies": {
- "depd": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
- "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
- "dev": true
- }
}
},
"copy-to": {
@@ -2037,6 +2142,12 @@
"which": "^1.2.9"
}
},
+ "current-module-paths": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/current-module-paths/-/current-module-paths-1.0.0.tgz",
+ "integrity": "sha512-pSaP6R1extujDm/VdVty4aPaZiAVXGfHi4YpRQwjzZTLlt4A2501Dj+i5ZK/nTNozHyD7pvlVyL7J5zJqVO9qQ==",
+ "dev": true
+ },
"currently-unhandled": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -2139,6 +2250,12 @@
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
"dev": true
},
+ "define-lazy-prop": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+ "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+ "dev": true
+ },
"define-properties": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -2155,9 +2272,9 @@
"dev": true
},
"depd": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
- "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
"dev": true
},
"destroy": {
@@ -2184,6 +2301,23 @@
"integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
"dev": true
},
+ "dir-glob": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+ "dev": true,
+ "requires": {
+ "path-type": "^4.0.0"
+ },
+ "dependencies": {
+ "path-type": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+ "dev": true
+ }
+ }
+ },
"doctrine": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -2300,13 +2434,14 @@
"dev": true
},
"eslint": {
- "version": "7.29.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.29.0.tgz",
- "integrity": "sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA==",
+ "version": "7.30.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.30.0.tgz",
+ "integrity": "sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==",
"dev": true,
"requires": {
"@babel/code-frame": "7.12.11",
"@eslint/eslintrc": "^0.4.2",
+ "@humanwhocodes/config-array": "^0.5.0",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
@@ -2392,9 +2527,9 @@
}
},
"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==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -2580,6 +2715,19 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
"dev": true
},
+ "fast-glob": {
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+ "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+ "dev": true,
+ "requires": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.4"
+ }
+ },
"fast-json-stable-stringify": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -2592,6 +2740,15 @@
"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
"dev": true
},
+ "fastq": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.1.tgz",
+ "integrity": "sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==",
+ "dev": true,
+ "requires": {
+ "reusify": "^1.0.4"
+ }
+ },
"figures": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
@@ -2698,9 +2855,9 @@
}
},
"flatted": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
- "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.1.tgz",
+ "integrity": "sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==",
"dev": true
},
"fresh": {
@@ -2755,179 +2912,228 @@
"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
"dev": true
},
+ "get-intrinsic": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+ "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-symbols": "^1.0.1"
+ },
+ "dependencies": {
+ "has-symbols": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+ "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+ "dev": true
+ }
+ }
+ },
"get-pkg-repo": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz",
- "integrity": "sha1-xztInAbYDMVTbCyFP54FIyBWly0=",
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/get-pkg-repo/-/get-pkg-repo-4.1.2.tgz",
+ "integrity": "sha512-/FjamZL9cBYllEbReZkxF2IMh80d8TJoC4e3bmLNif8ibHw95aj0N/tzqK0kZz9eU/3w3dL6lF4fnnX/sDdW3A==",
"dev": true,
"requires": {
- "hosted-git-info": "^2.1.4",
- "meow": "^3.3.0",
- "normalize-package-data": "^2.3.0",
- "parse-github-repo-url": "^1.3.0",
+ "@hutson/parse-repository-url": "^3.0.0",
+ "hosted-git-info": "^4.0.0",
+ "meow": "^7.0.0",
"through2": "^2.0.0"
},
"dependencies": {
"camelcase": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
- "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
},
"camelcase-keys": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
- "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+ "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
"dev": true,
"requires": {
- "camelcase": "^2.0.0",
- "map-obj": "^1.0.0"
+ "camelcase": "^5.3.1",
+ "map-obj": "^4.0.0",
+ "quick-lru": "^4.0.1"
}
},
"find-up": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
- "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
"dev": true,
"requires": {
- "path-exists": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
}
},
- "indent-string": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
- "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+ "hosted-git-info": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+ "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
"dev": true,
"requires": {
- "repeating": "^2.0.0"
+ "lru-cache": "^6.0.0"
}
},
- "load-json-file": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
- "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+ "indent-string": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+ "dev": true
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "parse-json": "^2.2.0",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0",
- "strip-bom": "^2.0.0"
+ "p-locate": "^4.1.0"
}
},
"map-obj": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
- "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
+ "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
"dev": true
},
"meow": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
- "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz",
+ "integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==",
"dev": true,
"requires": {
- "camelcase-keys": "^2.0.0",
- "decamelize": "^1.1.2",
- "loud-rejection": "^1.0.0",
- "map-obj": "^1.0.1",
- "minimist": "^1.1.3",
- "normalize-package-data": "^2.3.4",
- "object-assign": "^4.0.1",
- "read-pkg-up": "^1.0.1",
- "redent": "^1.0.0",
- "trim-newlines": "^1.0.0"
+ "@types/minimist": "^1.2.0",
+ "camelcase-keys": "^6.2.2",
+ "decamelize-keys": "^1.1.0",
+ "hard-rejection": "^2.1.0",
+ "minimist-options": "4.1.0",
+ "normalize-package-data": "^2.5.0",
+ "read-pkg-up": "^7.0.1",
+ "redent": "^3.0.0",
+ "trim-newlines": "^3.0.0",
+ "type-fest": "^0.13.1",
+ "yargs-parser": "^18.1.3"
}
},
- "minimist": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
- "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
- "dev": true
+ "minimist-options": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+ "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+ "dev": true,
+ "requires": {
+ "arrify": "^1.0.1",
+ "is-plain-obj": "^1.1.0",
+ "kind-of": "^6.0.3"
+ }
},
- "parse-json": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
- "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
"dev": true,
"requires": {
- "error-ex": "^1.2.0"
+ "p-try": "^2.0.0"
}
},
- "path-exists": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
- "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
"dev": true,
"requires": {
- "pinkie-promise": "^2.0.0"
+ "p-limit": "^2.2.0"
}
},
- "path-type": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
- "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
+ "parse-json": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
"dev": true,
"requires": {
- "graceful-fs": "^4.1.2",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
+ "@babel/code-frame": "^7.0.0",
+ "error-ex": "^1.3.1",
+ "json-parse-even-better-errors": "^2.3.0",
+ "lines-and-columns": "^1.1.6"
}
},
- "pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ },
+ "quick-lru": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
"dev": true
},
"read-pkg": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
- "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+ "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
"dev": true,
"requires": {
- "load-json-file": "^1.0.0",
- "normalize-package-data": "^2.3.2",
- "path-type": "^1.0.0"
+ "@types/normalize-package-data": "^2.4.0",
+ "normalize-package-data": "^2.5.0",
+ "parse-json": "^5.0.0",
+ "type-fest": "^0.6.0"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+ "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+ "dev": true
+ }
}
},
"read-pkg-up": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
- "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+ "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
"dev": true,
"requires": {
- "find-up": "^1.0.0",
- "read-pkg": "^1.0.0"
+ "find-up": "^4.1.0",
+ "read-pkg": "^5.2.0",
+ "type-fest": "^0.8.1"
+ },
+ "dependencies": {
+ "type-fest": {
+ "version": "0.8.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+ "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+ "dev": true
+ }
}
},
"redent": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
- "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
- "dev": true,
- "requires": {
- "indent-string": "^2.1.0",
- "strip-indent": "^1.0.1"
- }
- },
- "strip-bom": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
- "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+ "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
"dev": true,
"requires": {
- "is-utf8": "^0.2.0"
+ "indent-string": "^4.0.0",
+ "strip-indent": "^3.0.0"
}
},
"strip-indent": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
- "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+ "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
"dev": true,
"requires": {
- "get-stdin": "^4.0.1"
+ "min-indent": "^1.0.0"
}
},
"through2": {
@@ -2941,19 +3147,29 @@
}
},
"trim-newlines": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
- "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+ "dev": true
+ },
+ "type-fest": {
+ "version": "0.13.1",
+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+ "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
"dev": true
+ },
+ "yargs-parser": {
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
}
}
},
- "get-stdin": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
- "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
- "dev": true
- },
"git-raw-commits": {
"version": "2.0.10",
"resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-2.0.10.tgz",
@@ -3560,14 +3776,36 @@
}
},
"globals": {
- "version": "13.9.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.9.0.tgz",
- "integrity": "sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==",
+ "version": "13.10.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.10.0.tgz",
+ "integrity": "sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==",
"dev": true,
"requires": {
"type-fest": "^0.20.2"
}
},
+ "globby": {
+ "version": "11.0.4",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+ "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+ "dev": true,
+ "requires": {
+ "array-union": "^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"
+ },
+ "dependencies": {
+ "ignore": {
+ "version": "5.1.8",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+ "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+ "dev": true
+ }
+ }
+ },
"graceful-fs": {
"version": "4.1.15",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
@@ -3650,6 +3888,12 @@
"http-errors": "~1.7.2"
},
"dependencies": {
+ "depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "dev": true
+ },
"http-errors": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -3678,6 +3922,12 @@
"toidentifier": "1.0.0"
},
"dependencies": {
+ "depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "dev": true
+ },
"setprototypeof": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -3698,9 +3948,9 @@
},
"dependencies": {
"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==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -3725,9 +3975,9 @@
},
"dependencies": {
"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==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -3824,12 +4074,6 @@
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
"dev": true
},
- "interpret": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
- "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
- "dev": true
- },
"is-arrayish": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -3867,9 +4111,9 @@
"dev": true
},
"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==",
"dev": true
},
"is-extglob": {
@@ -3878,12 +4122,6 @@
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
"dev": true
},
- "is-finite": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
- "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
- "dev": true
- },
"is-fullwidth-code-point": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -3891,9 +4129,9 @@
"dev": true
},
"is-generator-function": {
- "version": "1.0.8",
- "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz",
- "integrity": "sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.9.tgz",
+ "integrity": "sha512-ZJ34p1uvIfptHCN7sFTjGibB9/oBg17sHqzDLfuwhvmN/qLVvIQXRQ8licZQ35WJ8KuEQt/etnnzQFI9C9Ue/A==",
"dev": true
},
"is-glob": {
@@ -3965,10 +4203,10 @@
"text-extensions": "^1.0.0"
}
},
- "is-utf8": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
- "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+ "is-unicode-supported": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+ "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
"dev": true
},
"is-wsl": {
@@ -4063,9 +4301,9 @@
"dev": true
},
"koa": {
- "version": "2.13.0",
- "resolved": "https://registry.npmjs.org/koa/-/koa-2.13.0.tgz",
- "integrity": "sha512-i/XJVOfPw7npbMv67+bOeXr3gPqOAw6uh5wFyNs3QvJ47tUx3M3V9rIE0//WytY42MKz4l/MXKyGkQ2LQTfLUQ==",
+ "version": "2.13.1",
+ "resolved": "https://registry.npmjs.org/koa/-/koa-2.13.1.tgz",
+ "integrity": "sha512-Lb2Dloc72auj5vK4X4qqL7B5jyDPQaZucc9sR/71byg7ryoD1NCaCm63CShk9ID9quQvDEi1bGR/iGjCG7As3w==",
"dev": true,
"requires": {
"accepts": "^1.3.5",
@@ -4075,7 +4313,7 @@
"cookies": "~0.8.0",
"debug": "~3.1.0",
"delegates": "^1.0.0",
- "depd": "^1.1.2",
+ "depd": "^2.0.0",
"destroy": "^1.0.4",
"encodeurl": "^1.0.2",
"escape-html": "^1.0.3",
@@ -4121,15 +4359,24 @@
"dev": true
},
"koa-compress": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/koa-compress/-/koa-compress-3.1.0.tgz",
- "integrity": "sha512-0m24/yS/GbhWI+g9FqtvStY+yJwTObwoxOvPok6itVjRen7PBWkjsJ8pre76m+99YybXLKhOJ62mJ268qyBFMQ==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/koa-compress/-/koa-compress-5.0.1.tgz",
+ "integrity": "sha512-uTo7Hcyyt6e9o2X3htRS/SNEKy9vDOUc/r1qs/F0YI2Frv9IEbkjz/9dC6IdJWBQAG34lRuU7jBXeq3DRur9Ng==",
"dev": true,
"requires": {
"bytes": "^3.0.0",
"compressible": "^2.0.0",
+ "http-errors": "^1.7.3",
"koa-is-json": "^1.0.0",
- "statuses": "^1.0.0"
+ "statuses": "^2.0.0"
+ },
+ "dependencies": {
+ "statuses": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+ "dev": true
+ }
}
},
"koa-conditional-get": {
@@ -4243,9 +4490,9 @@
},
"dependencies": {
"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==",
"dev": true,
"requires": {
"ms": "2.1.2"
@@ -4325,25 +4572,26 @@
}
},
"load-module": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/load-module/-/load-module-3.0.0.tgz",
- "integrity": "sha512-ZqprfrTx4vfH5+1mgpspPh5JYsNyA193NkMUdb3GwpmVqMczOh8cUDJgZBmEZVlSR42JBGYTUxlBAX9LHIBtIA==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/load-module/-/load-module-4.0.1.tgz",
+ "integrity": "sha512-n7RB9jx1nYxeQzItFKRPnE+6n5Dyf1nUFB0SWWQuO+YLQ5tpn0N11yonYXyQ0eeODybYOQqRziUmldrKjwqLZQ==",
"dev": true,
"requires": {
- "array-back": "^4.0.1"
+ "array-back": "^6.0.0"
}
},
"local-web-server": {
- "version": "4.2.1",
- "resolved": "https://registry.npmjs.org/local-web-server/-/local-web-server-4.2.1.tgz",
- "integrity": "sha512-v71LZool2w7uYA+tDP5HhfjzUxz5SFfcrPPB/zC98yFFawt7A6fcmAr2MR4Q9AHk/A8oyd/wrhEJBJLndwHxNQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/local-web-server/-/local-web-server-5.0.0.tgz",
+ "integrity": "sha512-JTxGPR8WhfOSWTb8Ti3qaSJ/Qfc7jt9TtxHk6tiLNZtyqIH4aoGPn/o9FoZx724s1/460VnuVuoD0R+FDJbeSQ==",
"dev": true,
"requires": {
- "lws": "^3.1.0",
+ "current-module-paths": "^1.0.0",
+ "lws": "^4.0.1",
"lws-basic-auth": "^2.0.0",
"lws-blacklist": "^3.0.0",
"lws-body-parser": "^2.0.0",
- "lws-compress": "^2.0.0",
+ "lws-compress": "^3.0.0",
"lws-conditional-get": "^2.0.0",
"lws-cors": "^3.0.0",
"lws-index": "^2.0.0",
@@ -4354,8 +4602,7 @@
"lws-request-monitor": "^2.0.0",
"lws-rewrite": "^3.1.1",
"lws-spa": "^3.0.0",
- "lws-static": "^2.0.0",
- "node-version-matches": "^2.0.1"
+ "lws-static": "^2.0.0"
}
},
"locate-path": {
@@ -4417,12 +4664,13 @@
"dev": true
},
"log-symbols": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
- "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+ "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
"dev": true,
"requires": {
- "chalk": "^4.0.0"
+ "chalk": "^4.1.0",
+ "is-unicode-supported": "^0.1.0"
},
"dependencies": {
"ansi-styles": {
@@ -4502,26 +4750,25 @@
}
},
"lws": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/lws/-/lws-3.1.0.tgz",
- "integrity": "sha512-I8rTgZxz8OJL0hjdlDxs6WpcVG7WSyalVHPQXXK+WPNVjm3KhkT5gV0Qmsgm2FRLbRUp15tso80xmDxMsyt7zA==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/lws/-/lws-4.0.1.tgz",
+ "integrity": "sha512-J0aoqbO93zXC0U2PlEgCz2YrYPdgLbZs1UwxqFfL8GA3nJORwALul2SsjGDO6wMs+bqz06QtF0dCEw/wZyToFw==",
"dev": true,
"requires": {
- "ansi-escape-sequences": "^5.1.2",
- "array-back": "^4.0.1",
- "byte-size": "^6.2.0",
+ "@75lb/deep-merge": "^1.0.0",
+ "ansi-escape-sequences": "^6.1.0",
+ "array-back": "^6.1.2",
+ "byte-size": "^8.0.0",
"command-line-args": "^5.1.1",
- "command-line-usage": "^6.1.0",
+ "command-line-usage": "^6.1.1",
"create-mixin": "^3.0.0",
- "koa": "^2.11.0",
- "load-module": "^3.0.0",
- "lodash.assignwith": "^4.2.0",
- "node-version-matches": "^2.0.1",
- "open": "^7.0.4",
+ "current-module-paths": "^1.0.0",
+ "koa": "^2.13.1",
+ "load-module": "^4.0.1",
+ "open": "^8.2.1",
"qrcode-terminal": "^0.12.0",
- "reduce-flatten": "^3.0.0",
- "typical": "^6.0.0",
- "walk-back": "^4.0.0"
+ "typical": "^7.0.0",
+ "walk-back": "^5.0.0"
}
},
"lws-basic-auth": {
@@ -4541,6 +4788,14 @@
"requires": {
"array-back": "^4.0.1",
"path-to-regexp": "^6.1.0"
+ },
+ "dependencies": {
+ "array-back": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+ "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+ "dev": true
+ }
}
},
"lws-body-parser": {
@@ -4553,12 +4808,12 @@
}
},
"lws-compress": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/lws-compress/-/lws-compress-2.0.0.tgz",
- "integrity": "sha512-5qDXI9pukVYWm07WjAOfpItLXKtL8lCHvjmW4RiXULhTRJj1qqBjNcmqReyk8L7NLUKhc+8eqoDDJFKURQEp0w==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/lws-compress/-/lws-compress-3.0.0.tgz",
+ "integrity": "sha512-0t8SUq912AdxtZ6n1Ugkl0rvk7D35MvWNV+IhW3MgJj4F90YSBurspBcFrkcw/qTz+NrishWW+7UKr/KcNq+Ww==",
"dev": true,
"requires": {
- "koa-compress": "^3.0.0"
+ "koa-compress": "^5.0.1"
}
},
"lws-conditional-get": {
@@ -4630,6 +4885,14 @@
"dev": true,
"requires": {
"byte-size": "^6.2.0"
+ },
+ "dependencies": {
+ "byte-size": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-6.2.0.tgz",
+ "integrity": "sha512-6EspYUCAPMc7E2rltBgKwhG+Cmk0pDm9zDtF1Awe2dczNUL3YpZ8mTs/dueOTS1hqGWBOatqef4jYMGjln7WmA==",
+ "dev": true
+ }
}
},
"lws-rewrite": {
@@ -4643,6 +4906,14 @@
"https-proxy-agent": "^5.0.0",
"koa-route": "^3.2.0",
"path-to-regexp": "^6.1.0"
+ },
+ "dependencies": {
+ "array-back": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+ "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+ "dev": true
+ }
}
},
"lws-spa": {
@@ -4724,25 +4995,49 @@
}
}
},
+ "merge2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+ "dev": true
+ },
"methods": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
"integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
"dev": true
},
+ "micromatch": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+ "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+ "dev": true,
+ "requires": {
+ "braces": "^3.0.1",
+ "picomatch": "^2.2.3"
+ },
+ "dependencies": {
+ "picomatch": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+ "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+ "dev": true
+ }
+ }
+ },
"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.48.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz",
+ "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==",
"dev": true
},
"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.31",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz",
+ "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==",
"dev": true,
"requires": {
- "mime-db": "1.44.0"
+ "mime-db": "1.48.0"
}
},
"min-indent": {
@@ -4786,33 +5081,33 @@
}
},
"mocha": {
- "version": "8.4.0",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz",
- "integrity": "sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ==",
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.0.2.tgz",
+ "integrity": "sha512-FpspiWU+UT9Sixx/wKimvnpkeW0mh6ROAKkIaPokj3xZgxeRhcna/k5X57jJghEr8X+Cgu/Vegf8zCX5ugSuTA==",
"dev": true,
"requires": {
"@ungap/promise-all-settled": "1.1.2",
"ansi-colors": "4.1.1",
"browser-stdout": "1.3.1",
- "chokidar": "3.5.1",
+ "chokidar": "3.5.2",
"debug": "4.3.1",
"diff": "5.0.0",
"escape-string-regexp": "4.0.0",
"find-up": "5.0.0",
- "glob": "7.1.6",
+ "glob": "7.1.7",
"growl": "1.10.5",
"he": "1.2.0",
- "js-yaml": "4.0.0",
- "log-symbols": "4.0.0",
+ "js-yaml": "4.1.0",
+ "log-symbols": "4.1.0",
"minimatch": "3.0.4",
"ms": "2.1.3",
- "nanoid": "3.1.20",
- "serialize-javascript": "5.0.1",
+ "nanoid": "3.1.23",
+ "serialize-javascript": "6.0.0",
"strip-json-comments": "3.1.1",
"supports-color": "8.1.1",
"which": "2.0.2",
"wide-align": "1.1.3",
- "workerpool": "6.1.0",
+ "workerpool": "6.1.5",
"yargs": "16.2.0",
"yargs-parser": "20.2.4",
"yargs-unparser": "2.0.0"
@@ -4857,6 +5152,20 @@
"path-exists": "^4.0.0"
}
},
+ "glob": {
+ "version": "7.1.7",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+ "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ }
+ },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -4864,9 +5173,9 @@
"dev": true
},
"js-yaml": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.0.0.tgz",
- "integrity": "sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+ "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
"dev": true,
"requires": {
"argparse": "^2.0.1"
@@ -4983,14 +5292,6 @@
"depd": "~2.0.0",
"on-finished": "~2.3.0",
"on-headers": "~1.0.2"
- },
- "dependencies": {
- "depd": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
- "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
- "dev": true
- }
}
},
"ms": {
@@ -5028,9 +5329,9 @@
}
},
"nanoid": {
- "version": "3.1.20",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
- "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+ "version": "3.1.23",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.23.tgz",
+ "integrity": "sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==",
"dev": true
},
"nanoscheduler": {
@@ -5076,23 +5377,6 @@
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
- "node-version-matches": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/node-version-matches/-/node-version-matches-2.0.1.tgz",
- "integrity": "sha512-oqk6+05FC0dNVY5NuXuhPEMq+m1b9ZjS9SIhVE9EjwCHZspnmjSO8npbKAEieinR8GeEgbecoQcYIvI/Kwcf6Q==",
- "dev": true,
- "requires": {
- "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==",
- "dev": true
- }
- }
- },
"normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -5140,6 +5424,12 @@
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
"dev": true
},
+ "object-inspect": {
+ "version": "1.10.3",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
+ "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+ "dev": true
+ },
"object-keys": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -5177,13 +5467,25 @@
"dev": true
},
"open": {
- "version": "7.3.0",
- "resolved": "https://registry.npmjs.org/open/-/open-7.3.0.tgz",
- "integrity": "sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==",
+ "version": "8.2.1",
+ "resolved": "https://registry.npmjs.org/open/-/open-8.2.1.tgz",
+ "integrity": "sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==",
"dev": true,
"requires": {
- "is-docker": "^2.0.0",
- "is-wsl": "^2.1.1"
+ "define-lazy-prop": "^2.0.0",
+ "is-docker": "^2.1.1",
+ "is-wsl": "^2.2.0"
+ },
+ "dependencies": {
+ "is-wsl": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+ "dev": true,
+ "requires": {
+ "is-docker": "^2.0.0"
+ }
+ }
}
},
"optionator": {
@@ -5233,12 +5535,6 @@
"callsites": "^3.0.0"
}
},
- "parse-github-repo-url": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz",
- "integrity": "sha1-nn2LslKmy2ukJZUGC3v23z28H1A=",
- "dev": true
- },
"parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
@@ -5318,21 +5614,6 @@
"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"dev": true
},
- "pinkie": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
- "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
- "dev": true
- },
- "pinkie-promise": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
- "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
- "dev": true,
- "requires": {
- "pinkie": "^2.0.0"
- }
- },
"pkg-dir": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
@@ -5379,9 +5660,18 @@
"dev": true
},
"qs": {
- "version": "6.9.4",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
- "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==",
+ "version": "6.10.1",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz",
+ "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==",
+ "dev": true,
+ "requires": {
+ "side-channel": "^1.0.4"
+ }
+ },
+ "queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
"dev": true
},
"quick-lru": {
@@ -5411,6 +5701,12 @@
"unpipe": "1.0.0"
},
"dependencies": {
+ "depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "dev": true
+ },
"http-errors": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -5474,23 +5770,14 @@
}
},
"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==",
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
"dev": true,
"requires": {
"picomatch": "^2.2.1"
}
},
- "rechoir": {
- "version": "0.6.2",
- "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
- "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
- "dev": true,
- "requires": {
- "resolve": "^1.1.6"
- }
- },
"redent": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
@@ -5502,9 +5789,9 @@
}
},
"reduce-flatten": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.0.tgz",
- "integrity": "sha512-eczl8wAYBxJ6Egl6I1ECIF+8z6sHu+KE7BzaEDZTpPXKXfy9SUDQlVYwkRcNTjJLC3Iakxbhss50KuT/R6SYfg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz",
+ "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==",
"dev": true
},
"regexpp": {
@@ -5519,15 +5806,6 @@
"integrity": "sha512-MXW/jtHyl5F1PZI7NbpS8SOtympdLuF20aoWJT5lELR1p/HJDd5nqW8Eu9uLh/hCRY3FgvrIT5AwDCgBODklcA==",
"dev": true
},
- "repeating": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
- "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
- "dev": true,
- "requires": {
- "is-finite": "^1.0.0"
- }
- },
"require-directory": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -5574,6 +5852,12 @@
"path-is-absolute": "1.0.1"
},
"dependencies": {
+ "depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "dev": true
+ },
"http-errors": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -5600,6 +5884,12 @@
}
}
},
+ "reusify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+ "dev": true
+ },
"rimraf": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -5610,9 +5900,9 @@
}
},
"rollup": {
- "version": "2.52.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.52.1.tgz",
- "integrity": "sha512-/SPqz8UGnp4P1hq6wc9gdTqA2bXQXGx13TtoL03GBm6qGRI6Hm3p4Io7GeiHNLl0BsQAne1JNYY+q/apcY933w==",
+ "version": "2.53.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.53.1.tgz",
+ "integrity": "sha512-yiTCvcYXZEulNWNlEONOQVlhXA/hgxjelFSjNcrwAAIfYx/xqjSHwqg/cCaWOyFRKr+IQBaXwt723m8tCaIUiw==",
"dev": true,
"requires": {
"fsevents": "~2.3.2"
@@ -5628,6 +5918,15 @@
"source-map-resolve": "^0.6.0"
}
},
+ "run-parallel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "dev": true,
+ "requires": {
+ "queue-microtask": "^1.2.2"
+ }
+ },
"run-script-os": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/run-script-os/-/run-script-os-1.1.6.tgz",
@@ -5653,9 +5952,9 @@
"dev": true
},
"serialize-javascript": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
- "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+ "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
"dev": true,
"requires": {
"randombytes": "^2.1.0"
@@ -5676,6 +5975,12 @@
"parseurl": "~1.3.2"
},
"dependencies": {
+ "depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "dev": true
+ },
"http-errors": {
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
@@ -5735,15 +6040,15 @@
"jsonify": "~0.0.0"
}
},
- "shelljs": {
- "version": "0.8.4",
- "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
- "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
+ "side-channel": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+ "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
"dev": true,
"requires": {
- "glob": "^7.0.0",
- "interpret": "^1.0.0",
- "rechoir": "^0.6.2"
+ "call-bind": "^1.0.0",
+ "get-intrinsic": "^1.0.2",
+ "object-inspect": "^1.9.0"
}
},
"signal-exit": {
@@ -5992,6 +6297,29 @@
"lodash.throttle": "^4.1.1",
"stream-via": "^1.0.4",
"table-layout": "~1.0.0"
+ },
+ "dependencies": {
+ "ansi-escape-sequences": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz",
+ "integrity": "sha512-JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw==",
+ "dev": true,
+ "requires": {
+ "array-back": "^4.0.0"
+ }
+ },
+ "array-back": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+ "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+ "dev": true
+ },
+ "byte-size": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-6.2.0.tgz",
+ "integrity": "sha512-6EspYUCAPMc7E2rltBgKwhG+Cmk0pDm9zDtF1Awe2dczNUL3YpZ8mTs/dueOTS1hqGWBOatqef4jYMGjln7WmA==",
+ "dev": true
+ }
}
},
"stream-slice": {
@@ -6104,9 +6432,9 @@
},
"dependencies": {
"ajv": {
- "version": "8.6.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz",
- "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==",
+ "version": "8.6.1",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.1.tgz",
+ "integrity": "sha512-42VLtQUOLefAvKFAQIxIZDaThq6om/PrfP0CYk3/vn+y4BMNkKnbli8ON2QCiHov4KkzOSJ/xSoBJdayiiYvVQ==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
@@ -6124,9 +6452,9 @@
}
},
"table-layout": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz",
- "integrity": "sha512-dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz",
+ "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==",
"dev": true,
"requires": {
"array-back": "^4.0.1",
@@ -6135,6 +6463,12 @@
"wordwrapjs": "^4.0.0"
},
"dependencies": {
+ "array-back": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz",
+ "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==",
+ "dev": true
+ },
"typical": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
@@ -6144,9 +6478,9 @@
}
},
"terser": {
- "version": "5.7.0",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.0.tgz",
- "integrity": "sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==",
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.7.1.tgz",
+ "integrity": "sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==",
"dev": true,
"requires": {
"commander": "^2.20.0",
@@ -6259,6 +6593,23 @@
"integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==",
"dev": true
},
+ "tsutils": {
+ "version": "3.21.0",
+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+ "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+ "dev": true,
+ "requires": {
+ "tslib": "^1.8.1"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+ "dev": true
+ }
+ }
+ },
"type-check": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -6297,21 +6648,21 @@
"dev": true
},
"typescript": {
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz",
- "integrity": "sha512-uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew==",
+ "version": "4.3.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+ "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
"dev": true
},
"typical": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/typical/-/typical-6.0.1.tgz",
- "integrity": "sha512-+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/typical/-/typical-7.0.0.tgz",
+ "integrity": "sha512-hg2fdZBVRRsDXOFYnDPdtjqejtfiMFwpjghKuz2Ow3Ii8H8F2rjEW7qphnleBNMak7k3oOZKOFHJwJ2SH7R04g==",
"dev": true
},
"uglify-js": {
- "version": "3.13.5",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.5.tgz",
- "integrity": "sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==",
+ "version": "3.13.10",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.10.tgz",
+ "integrity": "sha512-57H3ACYFXeo1IaZ1w02sfA71wI60MGco/IQFjOqK+WtKoprh7Go2/yvd2HPtoJILO2Or84ncLccI4xoHMTSbGg==",
"dev": true,
"optional": true
},
@@ -6359,9 +6710,9 @@
"dev": true
},
"walk-back": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-4.0.0.tgz",
- "integrity": "sha512-kudCA8PXVQfrqv2mFTG72vDBRi8BKWxGgFLwPpzHcpZnSwZk93WMwUDVcLHWNsnm+Y0AC4Vb6MUNRgaHfyV2DQ==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-5.0.0.tgz",
+ "integrity": "sha512-ASerU3aOj9ok+uMNiW0A6/SEwNOxhPmiprbHmPFw1faz7Qmoy9wD3sbmL5HYG+IBxT5c/4cX9O2kSpNv8OAM9A==",
"dev": true
},
"which": {
@@ -6428,21 +6779,15 @@
"dev": true
},
"wordwrapjs": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz",
- "integrity": "sha512-Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz",
+ "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==",
"dev": true,
"requires": {
"reduce-flatten": "^2.0.0",
- "typical": "^5.0.0"
+ "typical": "^5.2.0"
},
"dependencies": {
- "reduce-flatten": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz",
- "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==",
- "dev": true
- },
"typical": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz",
@@ -6452,9 +6797,9 @@
}
},
"workerpool": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz",
- "integrity": "sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg==",
+ "version": "6.1.5",
+ "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz",
+ "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==",
"dev": true
},
"wrap-ansi": {
diff --git a/package.json b/package.json
index b38f173e..b0f6a406 100644
--- a/package.json
+++ b/package.json
@@ -68,27 +68,27 @@
"dependencies": {},
"devDependencies": {
"@rollup/plugin-alias": "^3.1.2",
- "@rollup/plugin-commonjs": "^17.1.0",
- "@rollup/plugin-node-resolve": "^11.2.1",
+ "@rollup/plugin-commonjs": "^19.0.0",
+ "@rollup/plugin-node-resolve": "^13.0.0",
"@rollup/plugin-replace": "^2.4.2",
- "@types/chai": "^4.2.19",
- "@types/mocha": "^8.2.2",
- "@typescript-eslint/eslint-plugin": "^3.2.0",
- "@typescript-eslint/parser": "^3.2.0",
+ "@types/chai": "^4.2.21",
+ "@types/mocha": "^8.2.3",
+ "@typescript-eslint/eslint-plugin": "^4.28.2",
+ "@typescript-eslint/parser": "^4.28.2",
"chai": "^4.3.4",
- "eslint": "^7.29.0",
- "local-web-server": "^4.2.1",
- "mocha": "^8.4.0",
+ "eslint": "^7.30.0",
+ "local-web-server": "^5.0.0",
+ "mocha": "^9.0.2",
"mocha-chrome": "^2.2.0",
"npm-run-all": "^4.1.5",
"rimraf": "^3.0.2",
- "rollup": "^2.52.1",
+ "rollup": "^2.53.1",
"rollup-plugin-sourcemaps": "^0.6.3",
"run-script-os": "^1.1.6",
"standard-version": "^9.3.0",
- "terser": "^5.7.0",
+ "terser": "^5.7.1",
"tslib": "^2.3.0",
- "typescript": "^4.3.4"
+ "typescript": "^4.3.5"
},
"repository": {
"type": "git",
diff --git a/scripts/cpp-build.sh b/scripts/cpp-build.sh
index bb5373d2..1161cbb3 100755
--- a/scripts/cpp-build.sh
+++ b/scripts/cpp-build.sh
@@ -9,4 +9,5 @@ then
else
cd ./build
fi
+# cmake ../cpp -DCMAKE_TOOLCHAIN_FILE="../emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake" -DCMAKE_BUILD_TYPE=Debug
cmake --build . --target install -- -j
diff --git a/scripts/cpp-install-emsdk.sh b/scripts/cpp-install-emsdk.sh
index 0947ef1e..3aab6237 100755
--- a/scripts/cpp-install-emsdk.sh
+++ b/scripts/cpp-install-emsdk.sh
@@ -8,6 +8,6 @@ fi
cd ./emsdk
git fetch
git pull
-./emsdk install 2.0.24-upstream
-./emsdk activate 2.0.24-upstream
+./emsdk install 2.0.25-upstream
+./emsdk activate 2.0.25-upstream
cd ..
diff --git a/scripts/cpp-install-expat.sh b/scripts/cpp-install-expat.sh
index 6b89a9f7..87b3a857 100755
--- a/scripts/cpp-install-expat.sh
+++ b/scripts/cpp-install-expat.sh
@@ -2,6 +2,7 @@
if [ ! -d "src-expat" ]
then
+ # https://github.com/libexpat/libexpat/tags
wget -c https://github.com/libexpat/libexpat/archive/R_2_4_1.tar.gz
mkdir ./src-expat
tar -xzf ./R_2_4_1.tar.gz -C ./src-expat --strip-components=1
diff --git a/scripts/cpp-install-graphviz.sh b/scripts/cpp-install-graphviz.sh
index 530b14ce..fa2d128b 100755
--- a/scripts/cpp-install-graphviz.sh
+++ b/scripts/cpp-install-graphviz.sh
@@ -2,6 +2,7 @@
if [ ! -d "src-graphviz" ]
then
+ # https://gitlab.com/graphviz/graphviz/-/tags
wget -c https://gitlab.com/graphviz/graphviz/-/archive/2.47.3/graphviz-2.47.3.tar.gz
mkdir ./src-graphviz
tar -xzf ./graphviz-2.47.3.tar.gz -C ./src-graphviz --strip-components=1
@@ -16,7 +17,7 @@ then
mkdir ./build
cd ./build
cmake ..
- cmake --build . -- -j
+ cmake --build . # -- -j (See https://gitlab.com/graphviz/graphviz/-/issues/2098)
cd ..
cd ..
diff --git a/src/__tests__/expat.ts b/src/__tests__/expat.ts
index 1512d9b2..f2a50fd7 100644
--- a/src/__tests__/expat.ts
+++ b/src/__tests__/expat.ts
@@ -1,5 +1,5 @@
import { expect } from "chai";
-import { Attributes, parse, StackParser } from "../expat";
+import { Attributes, parse, StackParser, expatVersion } from "../expat";
class Cat {
@@ -37,6 +37,12 @@ class KeywordParser extends StackParser {
}
describe("expat", function () {
+ it("version", async function () {
+ const v = await expatVersion();
+ expect(v).to.be.a.string;
+ expect(v).to.not.be.empty;
+ });
+
it("simple", function () {
const xml = "content";
const callback = {
diff --git a/src/__tests__/graphviz.ts b/src/__tests__/graphviz.ts
index 411c19d9..f901db40 100644
--- a/src/__tests__/graphviz.ts
+++ b/src/__tests__/graphviz.ts
@@ -1,6 +1,6 @@
import { expect } from "chai";
import { wasmFolder } from "..";
-import { graphviz, graphvizSync, GraphvizSync } from "../graphviz";
+import { graphviz, graphvizSync, GraphvizSync, graphvizVersion } from "../graphviz";
const dot = `
digraph G {
@@ -67,6 +67,12 @@ digraph G {
`;
describe("graphviz", function () {
+ it("version", async function () {
+ const v = await graphvizVersion();
+ expect(v).to.be.a.string;
+ expect(v).to.not.be.empty;
+ });
+
it("circo", function () {
return graphviz.circo(dot, "svg").then(svg => {
expect(svg).to.be.a("string");
@@ -199,8 +205,18 @@ describe("graphvizSync", function () {
});
describe("bad dot", function () {
- it("dot", function () {
- return graphviz.dot(badDot, "svg").then(svg => {
+ it("dot", async () => {
+ await graphviz.dot(badDot, "svg").then(svg => {
+ expect(true).to.be.false;
+ }).catch(e => {
+ expect(typeof e.message).to.equal("string");
+ expect(e.message).to.equal("syntax error in line 11 near ']'\n");
+ });
+ await graphviz.dot(dot, "svg").then(svg => {
+ expect(svg).to.be.a("string");
+ expect(svg).to.not.be.empty;
+ });
+ await graphviz.dot(badDot, "svg").then(svg => {
expect(true).to.be.false;
}).catch(e => {
expect(typeof e.message).to.equal("string");
@@ -229,7 +245,7 @@ describe("bad dot", function () {
});
});
-describe("yInvert", function () {
+describe("options", function () {
let gvSync: GraphvizSync;
it("create", function () {
@@ -239,12 +255,26 @@ describe("yInvert", function () {
});
});
- it("compare", function () {
+ it("yInvert", function () {
const plain1 = gvSync.dot(dot, "plain");
const plain2 = gvSync.dot(dot, "plain", { yInvert: false });
const plain3 = gvSync.dot(dot, "plain", { yInvert: true });
+ const plain4 = gvSync.dot(dot, "plain", { yInvert: false });
+ const plain5 = gvSync.dot(dot, "plain", { yInvert: true });
expect(plain1).to.equal(plain2);
expect(plain1).to.not.equal(plain3);
+ expect(plain1).to.equal(plain4);
+ expect(plain1).to.not.equal(plain5);
+ });
+
+ it("nop", function () {
+ const plain1 = gvSync.dot(dot, "svg");
+ const plain2 = gvSync.dot(dot, "svg", { nop: 0 });
+ const plain3 = gvSync.dot(dot, "svg", { nop: 1 });
+ const plain4 = gvSync.dot(dot, "svg", { nop: 2 });
+ expect(plain1).to.equal(plain2);
+ expect(plain1).to.equal(plain3);
+ expect(plain1).to.equal(plain4);
});
});
diff --git a/src/expat.ts b/src/expat.ts
index daccaba5..00184227 100644
--- a/src/expat.ts
+++ b/src/expat.ts
@@ -62,6 +62,12 @@ function parseAttrs(attrs: string): Attributes {
return retVal;
}
+export function expatVersion(wasmFolder?: string, wasmBinary?: Uint8Array) {
+ return loadWasm(expatlib, wasmFolder, wasmBinary).then(module => {
+ return module.CExpat.prototype.version();
+ });
+}
+
export function parse(xml: string, callback: IParser, wasmFolder?: string, wasmBinary?: Uint8Array): Promise {
return loadWasm(expatlib, wasmFolder, wasmBinary).then(module => {
const parser = new module.CExpatJS();
diff --git a/src/graphviz.ts b/src/graphviz.ts
index 6c20a2d5..2efceca8 100644
--- a/src/graphviz.ts
+++ b/src/graphviz.ts
@@ -38,25 +38,30 @@ function imagesToFiles(images: Image[]) {
return images.map(imageToFile);
}
-function createFiles(wasm: any, _ext?: Ext) {
+function createFiles(graphviz: any, _ext?: Ext) {
const ext = {
images: [],
files: [],
..._ext
};
- [...ext.files, ...imagesToFiles(ext.images)].forEach(file => wasm.Main.prototype.createFile(file.path, file.data));
+ [...ext.files, ...imagesToFiles(ext.images)].forEach(file => graphviz.createFile(file.path, file.data));
}
+export function graphvizVersion(wasmFolder?: string, wasmBinary?: Uint8Array) {
+ return loadWasm(graphvizlib, wasmFolder, wasmBinary).then(module => {
+ return module.Graphviz.prototype.version();
+ });
+}
export const graphviz = {
layout(dotSource: string, outputFormat: Format = "svg", layoutEngine: Engine = "dot", ext?: Ext): Promise {
if (!dotSource) return Promise.resolve("");
- return loadWasm(graphvizlib, ext?.wasmFolder, ext?.wasmBinary).then(wasm => {
- createFiles(wasm, ext);
- wasm.Main.prototype.setYInvert(ext?.yInvert ? 1 : 0);
- wasm.Main.prototype.setNop(ext?.nop ? ext?.nop : 0);
- const retVal = wasm.Main.prototype.layout(dotSource, outputFormat, layoutEngine);
+ return loadWasm(graphvizlib, ext?.wasmFolder, ext?.wasmBinary).then(module => {
+ const graphViz = new module.Graphviz(ext?.yInvert !== undefined ? ext?.yInvert : false, ext?.nop !== undefined ? ext?.nop : 0);
+ createFiles(graphViz, ext);
+ const retVal = graphViz.layout(dotSource, outputFormat, layoutEngine);
+ module.destroy(graphViz);
if (!retVal) {
- throw new Error(wasm.Main.prototype.lastError());
+ throw new Error(module.Graphviz.prototype.lastError());
}
return retVal;
});
@@ -94,12 +99,12 @@ export class GraphvizSync {
layout(dotSource: string, outputFormat: Format = "svg", layoutEngine: Engine = "dot", ext?: Ext): string {
if (!dotSource) return "";
- createFiles(this._wasm, ext);
- this._wasm.Main.prototype.setYInvert(ext?.yInvert ? 1 : 0);
- this._wasm.Main.prototype.setNop(ext?.nop ? ext?.nop : 0);
- const retVal = this._wasm.Main.prototype.layout(dotSource, outputFormat, layoutEngine);
+ const graphViz = new this._wasm.Graphviz(ext?.yInvert ? 1 : 0, ext?.nop ? ext?.nop : 0);
+ createFiles(graphViz, ext);
+ const retVal = graphViz.layout(dotSource, outputFormat, layoutEngine);
+ this._wasm.destroy(graphViz);
if (!retVal) {
- throw new Error(this._wasm.Main.prototype.lastError());
+ throw new Error(this._wasm.Graphviz.prototype.lastError());
}
return retVal;
}
diff --git a/src/util.ts b/src/util.ts
index 430e4c18..7f654d42 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -33,17 +33,11 @@ export function loadWasm(_wasmLib: any, wf?: string, wasmBinary?: Uint8Array): P
const wasmLib = _wasmLib.default || _wasmLib;
// Prevent double load ---
if (!wasmLib.__hpcc_promise) {
- wasmLib.__hpcc_promise = new Promise(resolve => {
- wasmLib({
+ wasmLib.__hpcc_promise = wasmLib({
wasmBinary,
locateFile: (path: string, prefix: string) => {
return `${trimEnd(wf || wasmFolder() || prefix || ".", "/")}/${trimStart(path, "/")}`;
}
- }).then((instance: any) => {
- // Not a real promise, remove "then" to prevent infinite loop ---
- delete instance.then;
- resolve(instance);
- });
});
}
return wasmLib.__hpcc_promise;