diff --git a/package-lock.json b/package-lock.json index 8bdd419663d..dca90aa6103 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,27 +1,18 @@ { "name": "@asyncapi/cli", - "version": "1.2.34", + "version": "1.2.35", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@asyncapi/cli", - "version": "1.2.34", + "version": "1.2.35", "license": "Apache-2.0", "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.9", "@asyncapi/bundler": "^0.4.0", "@asyncapi/converter": "^1.4.7", "@asyncapi/diff": "^0.4.1", -<<<<<<< HEAD - "@asyncapi/generator": "^1.15.3", - "@asyncapi/modelina": "^2.0.2", - "@asyncapi/openapi-schema-parser": "^3.0.5", - "@asyncapi/optimizer": "^0.2.4", - "@asyncapi/parser": "^3.0.1", - "@asyncapi/protobuf-schema-parser": "^3.0.4", - "@asyncapi/raml-dt-schema-parser": "^4.0.6", -======= "@asyncapi/generator": "^1.16.0", "@asyncapi/modelina": "^2.1.1", "@asyncapi/openapi-schema-parser": "^3.0.10", @@ -29,7 +20,6 @@ "@asyncapi/parser": "^3.0.2", "@asyncapi/protobuf-schema-parser": "^3.0.6", "@asyncapi/raml-dt-schema-parser": "^4.0.10", ->>>>>>> master "@asyncapi/studio": "^0.17.3", "@oclif/core": "^1.26.2", "@oclif/errors": "^1.3.6", @@ -41,7 +31,6 @@ "chokidar": "^3.5.2", "fast-levenshtein": "^3.0.0", "fs-extra": "^11.1.0", - "handlebars": "^4.7.8", "indent-string": "^4.0.0", "inquirer": "^8.2.0", "js-yaml": "^4.1.0", @@ -193,12 +182,7 @@ }, "node_modules/@asyncapi/avro-schema-parser": { "version": "3.0.9", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/@asyncapi/avro-schema-parser/-/avro-schema-parser-3.0.9.tgz", - "integrity": "sha512-t6B6W8QXiM0fWhj8sNnGoFkFjrNqWjLGeKiKpQFKVEghVLz5vLmARs7kMWWKGbjxQSas3e4ChcmMi1B2IplrBQ==", -======= "license": "Apache-2.0", ->>>>>>> master "dependencies": { "@asyncapi/parser": "^3.0.2", "@types/json-schema": "^7.0.11", @@ -206,11 +190,7 @@ } }, "node_modules/@asyncapi/bundler": { -<<<<<<< HEAD - "version": "0.3.11", -======= "version": "0.4.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@apidevtools/json-schema-ref-parser": "^9.0.9", @@ -222,24 +202,12 @@ }, "node_modules/@asyncapi/converter": { "version": "1.4.7", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/@asyncapi/converter/-/converter-1.4.7.tgz", - "integrity": "sha512-6Asn98/YHQVrd53vPGXQ+YZ3jIaSM2XjMcDcnZIh3MDLgJdQHC395siJ7awGU+mpgjMVVKJlckSQfaI0rWTh/w==", -======= "license": "Apache-2.0", ->>>>>>> master "dependencies": { "@asyncapi/parser": "^3.0.2", "js-yaml": "^3.14.1" } }, - "node_modules/@asyncapi/converter/node_modules/argparse": { - "version": "1.0.10", - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, "node_modules/@asyncapi/converter/node_modules/js-yaml": { "version": "3.14.1", "license": "MIT", @@ -251,8 +219,6 @@ "js-yaml": "bin/js-yaml.js" } }, -<<<<<<< HEAD -======= "node_modules/@asyncapi/converter/node_modules/js-yaml/node_modules/argparse": { "version": "1.0.10", "license": "MIT", @@ -260,7 +226,6 @@ "sprintf-js": "~1.0.2" } }, ->>>>>>> master "node_modules/@asyncapi/diff": { "version": "0.4.1", "license": "Apache-2.0", @@ -271,20 +236,12 @@ } }, "node_modules/@asyncapi/generator": { -<<<<<<< HEAD - "version": "1.15.3", - "license": "Apache-2.0", - "dependencies": { - "@asyncapi/generator-react-sdk": "^1.0.3", - "@asyncapi/parser": "^3.0.0", -======= "version": "1.16.0", "resolved": "https://registry.npmjs.org/@asyncapi/generator/-/generator-1.16.0.tgz", "integrity": "sha512-DHiOG79hfsemmWvc9nSk2zmN4u9ZYVkElFO1EC0GyFDHXrdU0TbPgFXhz4AN0+I2ZSb6HaHbJif9sUreZriaug==", "dependencies": { "@asyncapi/generator-react-sdk": "^1.0.6", "@asyncapi/parser": "^3.0.2", ->>>>>>> master "@npmcli/arborist": "^2.2.4", "@smoya/multi-parser": "^5.0.0", "ajv": "^8.12.0", @@ -319,12 +276,7 @@ }, "node_modules/@asyncapi/generator-react-sdk": { "version": "1.0.6", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/@asyncapi/generator-react-sdk/-/generator-react-sdk-1.0.6.tgz", - "integrity": "sha512-FBn6rQtF8+SJL2VXhiiLy85rGrUDtnFAMOWGcYTw4yJC/IyL/3RyrRFqQFpNtoWW6h9Kh+RYKXiwltGkcTdASw==", -======= "license": "Apache-2.0", ->>>>>>> master "dependencies": { "@asyncapi/parser": "^3.0.2", "@babel/core": "7.12.9", @@ -367,13 +319,10 @@ "url": "https://opencollective.com/babel" } }, -<<<<<<< HEAD -======= "node_modules/@asyncapi/generator-react-sdk/node_modules/convert-source-map": { "version": "1.9.0", "license": "MIT" }, ->>>>>>> master "node_modules/@asyncapi/generator-react-sdk/node_modules/react": { "version": "17.0.2", "license": "MIT", @@ -412,13 +361,6 @@ "parserapiv3": "npm:@asyncapi/parser@^3.0.0-next-major-spec.10" } }, - "node_modules/@asyncapi/generator/node_modules/argparse": { - "version": "1.0.10", - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" - } - }, "node_modules/@asyncapi/generator/node_modules/js-yaml": { "version": "3.14.1", "license": "MIT", @@ -430,8 +372,6 @@ "js-yaml": "bin/js-yaml.js" } }, -<<<<<<< HEAD -======= "node_modules/@asyncapi/generator/node_modules/js-yaml/node_modules/argparse": { "version": "1.0.10", "license": "MIT", @@ -439,7 +379,6 @@ "sprintf-js": "~1.0.2" } }, ->>>>>>> master "node_modules/@asyncapi/generator/node_modules/typescript": { "version": "4.9.5", "license": "Apache-2.0", @@ -456,15 +395,9 @@ "link": true }, "node_modules/@asyncapi/modelina": { -<<<<<<< HEAD - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-2.1.0.tgz", - "integrity": "sha512-6q/HR74b7jOaH+ZfsPEy872xx/+Bi55iS0MA2/U24JSdEJmv67Qi/kzAf5qH4uxyZz18mK0dhryuJgWtBHEBCQ==", -======= "version": "2.1.1", "resolved": "https://registry.npmjs.org/@asyncapi/modelina/-/modelina-2.1.1.tgz", "integrity": "sha512-4xRm+YaBXBWf7Iefe3znQghOWgNFRXJzZXNwkA5GQa7z+cXSpnHISVmasLoYmPAFjgUYKRuDuRms30IRPUNWpA==", ->>>>>>> master "dependencies": { "@apidevtools/json-schema-ref-parser": "^9.0.9", "@apidevtools/swagger-parser": "^10.0.3", @@ -518,14 +451,8 @@ } }, "node_modules/@asyncapi/modelina/node_modules/@types/node": { -<<<<<<< HEAD - "version": "20.10.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz", - "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==", -======= "version": "20.10.0", "license": "MIT", ->>>>>>> master "dependencies": { "undici-types": "~5.26.4" } @@ -573,12 +500,7 @@ }, "node_modules/@asyncapi/openapi-schema-parser": { "version": "3.0.10", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/@asyncapi/openapi-schema-parser/-/openapi-schema-parser-3.0.10.tgz", - "integrity": "sha512-kaLeYLicn65iLCKnjrmOYEybjFgxrKBOc2ZjwloCMRahyWX3hQHPU9IqL54JxEQ2R9AGznROPhrKz4iczRfKZw==", -======= "license": "Apache-2.0", ->>>>>>> master "dependencies": { "@asyncapi/parser": "^3.0.2", "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", @@ -601,12 +523,7 @@ }, "node_modules/@asyncapi/parser": { "version": "3.0.2", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.0.2.tgz", - "integrity": "sha512-AtDFndWwnaqGoXZQY2DRtORT2Ls4BI7MSR+Rg7TRwxf5jxIz/WVvQwc5HElkHuDEkIZslYu+ukFzNq3awdj0aw==", -======= "license": "Apache-2.0", ->>>>>>> master "dependencies": { "@asyncapi/specs": "^6.2.0", "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", @@ -629,14 +546,6 @@ "node-fetch": "2.6.7" } }, - "node_modules/@asyncapi/parser/node_modules/@asyncapi/specs": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@asyncapi/specs/-/specs-6.2.0.tgz", - "integrity": "sha512-5uf/Rg6pavZHx7rVIkP0TP/icIahJCuHgmY1rdtkrWxHZMXbASDDV3DlTUaonbsUeemwchoqljmrTd1O1xqvxg==", - "dependencies": { - "@types/json-schema": "^7.0.11" - } - }, "node_modules/@asyncapi/parser/node_modules/jsonpath-plus": { "version": "7.2.0", "license": "MIT", @@ -680,12 +589,7 @@ }, "node_modules/@asyncapi/protobuf-schema-parser": { "version": "3.0.6", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/@asyncapi/protobuf-schema-parser/-/protobuf-schema-parser-3.0.6.tgz", - "integrity": "sha512-XdjGyj4Sp7Hu2xy1gXaEm5ed5TcB9iQy9j2im3Hcqg8pwk1DTQqWF8zvfcDAKPGn22rBRSfzyrmecLOZtbuOPQ==", -======= "license": "Apache-2.0", ->>>>>>> master "dependencies": { "@asyncapi/parser": "^3.0.2", "@types/protocol-buffers-schema": "^3.4.1", @@ -694,12 +598,7 @@ }, "node_modules/@asyncapi/raml-dt-schema-parser": { "version": "4.0.10", -<<<<<<< HEAD - "resolved": "https://registry.npmjs.org/@asyncapi/raml-dt-schema-parser/-/raml-dt-schema-parser-4.0.10.tgz", - "integrity": "sha512-qnO9kcO0P6LAd2zZ+jPAJy52f5UrzGOqli6OhjCLMHQhNa7DtCbv7JdioV/yNB5dbCFN0+p2CTvvVUKlu6yFSQ==", -======= "license": "Apache-2.0", ->>>>>>> master "dependencies": { "@asyncapi/parser": "^3.0.2", "js-yaml": "^4.1.0", @@ -708,17 +607,13 @@ } }, "node_modules/@asyncapi/react-component": { -<<<<<<< HEAD - "version": "1.2.4", -======= "version": "1.2.2", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.5", - "@asyncapi/openapi-schema-parser": "^3.0.7", - "@asyncapi/parser": "^3.0.0", - "@asyncapi/protobuf-schema-parser": "^3.0.3", + "@asyncapi/openapi-schema-parser": "^3.0.6", + "@asyncapi/parser": "^3.0.0-next-major-spec.10", + "@asyncapi/protobuf-schema-parser": "3.0.0", "highlight.js": "^10.7.2", "isomorphic-dompurify": "^0.13.0", "marked": "^4.0.14", @@ -730,10 +625,6 @@ "react-dom": ">=16.8.0" } }, -<<<<<<< HEAD - "node_modules/@asyncapi/specs": { - "version": "6.0.0", -======= "node_modules/@asyncapi/react-component/node_modules/@asyncapi/protobuf-schema-parser": { "version": "3.0.0", "license": "Apache-2.0", @@ -818,7 +709,6 @@ }, "node_modules/@asyncapi/specs": { "version": "6.2.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.11" @@ -868,19 +758,19 @@ } }, "node_modules/@asyncapi/studio/node_modules/@asyncapi/parser": { -<<<<<<< HEAD - "version": "2.1.0", -======= "version": "2.1.2", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@asyncapi/specs": "^5.1.0", "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", + "@stoplight/json": "^3.20.2", + "@stoplight/json-ref-readers": "^1.2.2", "@stoplight/json-ref-resolver": "^3.1.5", "@stoplight/spectral-core": "^1.16.1", "@stoplight/spectral-functions": "^1.7.2", "@stoplight/spectral-parsers": "^1.0.2", + "@stoplight/spectral-ref-resolver": "^1.0.3", + "@stoplight/types": "^13.12.0", "@types/json-schema": "^7.0.11", "@types/urijs": "^1.19.19", "ajv": "^8.11.0", @@ -889,9 +779,7 @@ "avsc": "^5.7.5", "js-yaml": "^4.1.0", "jsonpath-plus": "^7.2.0", - "node-fetch": "2.6.7", - "ramldt2jsonschema": "^1.2.3", - "webapi-parser": "^0.5.0" + "node-fetch": "2.6.7" } }, "node_modules/@asyncapi/studio/node_modules/@asyncapi/parser/node_modules/@asyncapi/specs": { @@ -909,14 +797,10 @@ } }, "node_modules/@asyncapi/studio/node_modules/@reactflow/background": { -<<<<<<< HEAD - "version": "11.2.8", -======= "version": "11.3.6", ->>>>>>> master "license": "MIT", "dependencies": { - "@reactflow/core": "11.8.3", + "@reactflow/core": "11.10.1", "classcat": "^5.0.3", "zustand": "^4.4.1" }, @@ -926,14 +810,10 @@ } }, "node_modules/@asyncapi/studio/node_modules/@reactflow/controls": { -<<<<<<< HEAD - "version": "11.1.19", -======= "version": "11.2.6", ->>>>>>> master "license": "MIT", "dependencies": { - "@reactflow/core": "11.8.3", + "@reactflow/core": "11.10.1", "classcat": "^5.0.3", "zustand": "^4.4.1" }, @@ -943,11 +823,7 @@ } }, "node_modules/@asyncapi/studio/node_modules/@reactflow/core": { -<<<<<<< HEAD - "version": "11.8.3", -======= "version": "11.10.1", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3": "^7.4.0", @@ -966,14 +842,10 @@ } }, "node_modules/@asyncapi/studio/node_modules/@reactflow/minimap": { -<<<<<<< HEAD - "version": "11.6.3", -======= "version": "11.7.6", ->>>>>>> master "license": "MIT", "dependencies": { - "@reactflow/core": "11.8.3", + "@reactflow/core": "11.10.1", "@types/d3-selection": "^3.0.3", "@types/d3-zoom": "^3.0.1", "classcat": "^5.0.3", @@ -987,14 +859,10 @@ } }, "node_modules/@asyncapi/studio/node_modules/@reactflow/node-resizer": { -<<<<<<< HEAD - "version": "2.1.5", -======= "version": "2.2.6", ->>>>>>> master "license": "MIT", "dependencies": { - "@reactflow/core": "11.8.3", + "@reactflow/core": "11.10.1", "classcat": "^5.0.4", "d3-drag": "^3.0.0", "d3-selection": "^3.0.0", @@ -1006,14 +874,10 @@ } }, "node_modules/@asyncapi/studio/node_modules/@reactflow/node-toolbar": { -<<<<<<< HEAD - "version": "1.2.7", -======= "version": "1.3.6", ->>>>>>> master "license": "MIT", "dependencies": { - "@reactflow/core": "11.8.3", + "@reactflow/core": "11.10.1", "classcat": "^5.0.3", "zustand": "^4.4.1" }, @@ -1069,19 +933,15 @@ } }, "node_modules/@asyncapi/studio/node_modules/reactflow": { -<<<<<<< HEAD - "version": "11.8.3", -======= "version": "11.10.1", ->>>>>>> master "license": "MIT", "dependencies": { - "@reactflow/background": "11.2.8", - "@reactflow/controls": "11.1.19", - "@reactflow/core": "11.8.3", - "@reactflow/minimap": "11.6.3", - "@reactflow/node-resizer": "2.1.5", - "@reactflow/node-toolbar": "1.2.7" + "@reactflow/background": "11.3.6", + "@reactflow/controls": "11.2.6", + "@reactflow/core": "11.10.1", + "@reactflow/minimap": "11.7.6", + "@reactflow/node-resizer": "2.2.6", + "@reactflow/node-toolbar": "1.3.6" }, "peerDependencies": { "react": ">=17", @@ -1112,14 +972,10 @@ } }, "node_modules/@babel/code-frame": { -<<<<<<< HEAD - "version": "7.22.13", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { @@ -1184,38 +1040,30 @@ } }, "node_modules/@babel/compat-data": { -<<<<<<< HEAD - "version": "7.22.9", -======= "version": "7.23.5", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-compilation-targets": "^7.22.10", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.10", - "@babel/parser": "^7.22.10", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.3", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.3", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.3", + "@babel/types": "^7.23.3", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -1234,11 +1082,7 @@ } }, "node_modules/@babel/eslint-parser": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.3", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -1271,14 +1115,10 @@ } }, "node_modules/@babel/generator": { -<<<<<<< HEAD - "version": "7.23.0", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/types": "^7.23.0", + "@babel/types": "^7.23.4", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -1298,35 +1138,22 @@ } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.22.15", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/types": "^7.22.10" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { -<<<<<<< HEAD - "version": "7.22.10", - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.9", -======= "version": "7.23.6", "license": "MIT", "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-validator-option": "^7.23.5", "browserslist": "^4.22.2", ->>>>>>> master "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -1342,19 +1169,15 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.6", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-replace-supers": "^7.22.20", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", "semver": "^6.3.1" @@ -1374,11 +1197,7 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { -<<<<<<< HEAD - "version": "7.22.9", -======= "version": "7.22.15", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -1400,11 +1219,7 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { -<<<<<<< HEAD - "version": "0.4.2", -======= "version": "0.4.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.22.6", @@ -1446,46 +1261,34 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.0", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.22.15", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { -<<<<<<< HEAD - "version": "7.22.9", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -1512,16 +1315,12 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { -<<<<<<< HEAD - "version": "7.22.9", -======= "version": "7.22.20", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-wrap-function": "^7.22.9" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -1531,15 +1330,11 @@ } }, "node_modules/@babel/helper-replace-supers": { -<<<<<<< HEAD - "version": "7.22.9", -======= "version": "7.22.20", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -1580,11 +1375,7 @@ } }, "node_modules/@babel/helper-string-parser": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1598,54 +1389,38 @@ } }, "node_modules/@babel/helper-validator-option": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.5", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.22.20", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-function-name": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.10" + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.4", + "@babel/types": "^7.23.4" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { -<<<<<<< HEAD - "version": "7.22.20", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", @@ -1714,11 +1489,7 @@ } }, "node_modules/@babel/parser": { -<<<<<<< HEAD - "version": "7.23.0", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "bin": { "parser": "bin/babel-parser.js" @@ -1728,11 +1499,7 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1745,16 +1512,12 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.5" + "@babel/plugin-transform-optional-chaining": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -1763,8 +1526,6 @@ "@babel/core": "^7.13.0" } }, -<<<<<<< HEAD -======= "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { "version": "7.23.3", "license": "MIT", @@ -1779,7 +1540,6 @@ "@babel/core": "^7.0.0" } }, ->>>>>>> master "node_modules/@babel/plugin-proposal-private-property-in-object": { "version": "7.21.0-placeholder-for-preset-env.2", "license": "MIT", @@ -1844,11 +1604,7 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1861,11 +1617,7 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -1898,11 +1650,7 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2015,11 +1763,7 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2032,16 +1776,12 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.9", + "@babel/helper-remap-async-to-generator": "^7.22.20", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -2052,16 +1792,12 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.5" + "@babel/helper-remap-async-to-generator": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2071,11 +1807,7 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2088,11 +1820,7 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2105,14 +1833,10 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2123,14 +1847,10 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, @@ -2142,20 +1862,16 @@ } }, "node_modules/@babel/plugin-transform-classes": { -<<<<<<< HEAD - "version": "7.22.6", -======= "version": "7.23.5", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.20", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -2167,15 +1883,11 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/template": "^7.22.5" + "@babel/template": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -2185,11 +1897,7 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2202,14 +1910,10 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2220,11 +1924,7 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2237,11 +1937,7 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2255,14 +1951,10 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2273,11 +1965,7 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2291,11 +1979,7 @@ } }, "node_modules/@babel/plugin-transform-for-of": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.6", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2309,15 +1993,11 @@ } }, "node_modules/@babel/plugin-transform-function-name": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2328,11 +2008,7 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2346,11 +2022,7 @@ } }, "node_modules/@babel/plugin-transform-literals": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2363,11 +2035,7 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2381,11 +2049,7 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2398,14 +2062,10 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2416,14 +2076,10 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-simple-access": "^7.22.5" }, @@ -2435,17 +2091,13 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2455,14 +2107,10 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2487,11 +2135,7 @@ } }, "node_modules/@babel/plugin-transform-new-target": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2504,11 +2148,7 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2522,11 +2162,7 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2540,18 +2176,14 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.5", + "@babel/compat-data": "^7.23.3", + "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.22.5" + "@babel/plugin-transform-parameters": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -2561,15 +2193,11 @@ } }, "node_modules/@babel/plugin-transform-object-super": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5" + "@babel/helper-replace-supers": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2579,11 +2207,7 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2597,11 +2221,7 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2616,11 +2236,7 @@ } }, "node_modules/@babel/plugin-transform-parameters": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2633,14 +2249,10 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2651,15 +2263,11 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, @@ -2671,11 +2279,7 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2688,11 +2292,7 @@ } }, "node_modules/@babel/plugin-transform-react-display-name": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2705,18 +2305,14 @@ } }, "node_modules/@babel/plugin-transform-react-jsx": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-jsx": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/plugin-syntax-jsx": "^7.23.3", + "@babel/types": "^7.23.4" }, "engines": { "node": ">=6.9.0" @@ -2739,11 +2335,7 @@ } }, "node_modules/@babel/plugin-transform-react-pure-annotations": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -2757,11 +2349,7 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2775,11 +2363,7 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2792,11 +2376,7 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2809,11 +2389,7 @@ } }, "node_modules/@babel/plugin-transform-spread": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -2827,11 +2403,7 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2844,11 +2416,7 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2861,11 +2429,7 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2878,11 +2442,7 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2895,14 +2455,10 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2913,14 +2469,10 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2931,14 +2483,10 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -2949,31 +2497,24 @@ } }, "node_modules/@babel/preset-env": { -<<<<<<< HEAD - "version": "7.22.10", - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.10", -======= "version": "7.23.6", "license": "MIT", "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-compilation-targets": "^7.23.6", ->>>>>>> master "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5", + "@babel/helper-validator-option": "^7.23.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.22.5", - "@babel/plugin-syntax-import-attributes": "^7.22.5", + "@babel/plugin-syntax-import-assertions": "^7.23.3", + "@babel/plugin-syntax-import-attributes": "^7.23.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", @@ -2985,33 +2526,6 @@ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", -<<<<<<< HEAD - "@babel/plugin-transform-arrow-functions": "^7.22.5", - "@babel/plugin-transform-async-generator-functions": "^7.22.10", - "@babel/plugin-transform-async-to-generator": "^7.22.5", - "@babel/plugin-transform-block-scoped-functions": "^7.22.5", - "@babel/plugin-transform-block-scoping": "^7.22.10", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.5", - "@babel/plugin-transform-classes": "^7.22.6", - "@babel/plugin-transform-computed-properties": "^7.22.5", - "@babel/plugin-transform-destructuring": "^7.22.10", - "@babel/plugin-transform-dotall-regex": "^7.22.5", - "@babel/plugin-transform-duplicate-keys": "^7.22.5", - "@babel/plugin-transform-dynamic-import": "^7.22.5", - "@babel/plugin-transform-exponentiation-operator": "^7.22.5", - "@babel/plugin-transform-export-namespace-from": "^7.22.5", - "@babel/plugin-transform-for-of": "^7.22.5", - "@babel/plugin-transform-function-name": "^7.22.5", - "@babel/plugin-transform-json-strings": "^7.22.5", - "@babel/plugin-transform-literals": "^7.22.5", - "@babel/plugin-transform-logical-assignment-operators": "^7.22.5", - "@babel/plugin-transform-member-expression-literals": "^7.22.5", - "@babel/plugin-transform-modules-amd": "^7.22.5", - "@babel/plugin-transform-modules-commonjs": "^7.22.5", - "@babel/plugin-transform-modules-systemjs": "^7.22.5", - "@babel/plugin-transform-modules-umd": "^7.22.5", -======= "@babel/plugin-transform-arrow-functions": "^7.23.3", "@babel/plugin-transform-async-generator-functions": "^7.23.4", "@babel/plugin-transform-async-to-generator": "^7.23.3", @@ -3037,35 +2551,33 @@ "@babel/plugin-transform-modules-commonjs": "^7.23.3", "@babel/plugin-transform-modules-systemjs": "^7.23.3", "@babel/plugin-transform-modules-umd": "^7.23.3", ->>>>>>> master "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", - "@babel/plugin-transform-new-target": "^7.22.5", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5", - "@babel/plugin-transform-numeric-separator": "^7.22.5", - "@babel/plugin-transform-object-rest-spread": "^7.22.5", - "@babel/plugin-transform-object-super": "^7.22.5", - "@babel/plugin-transform-optional-catch-binding": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.10", - "@babel/plugin-transform-parameters": "^7.22.5", - "@babel/plugin-transform-private-methods": "^7.22.5", - "@babel/plugin-transform-private-property-in-object": "^7.22.5", - "@babel/plugin-transform-property-literals": "^7.22.5", - "@babel/plugin-transform-regenerator": "^7.22.10", - "@babel/plugin-transform-reserved-words": "^7.22.5", - "@babel/plugin-transform-shorthand-properties": "^7.22.5", - "@babel/plugin-transform-spread": "^7.22.5", - "@babel/plugin-transform-sticky-regex": "^7.22.5", - "@babel/plugin-transform-template-literals": "^7.22.5", - "@babel/plugin-transform-typeof-symbol": "^7.22.5", - "@babel/plugin-transform-unicode-escapes": "^7.22.10", - "@babel/plugin-transform-unicode-property-regex": "^7.22.5", - "@babel/plugin-transform-unicode-regex": "^7.22.5", - "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.23.3", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", + "@babel/plugin-transform-numeric-separator": "^7.23.4", + "@babel/plugin-transform-object-rest-spread": "^7.23.4", + "@babel/plugin-transform-object-super": "^7.23.3", + "@babel/plugin-transform-optional-catch-binding": "^7.23.4", + "@babel/plugin-transform-optional-chaining": "^7.23.4", + "@babel/plugin-transform-parameters": "^7.23.3", + "@babel/plugin-transform-private-methods": "^7.23.3", + "@babel/plugin-transform-private-property-in-object": "^7.23.4", + "@babel/plugin-transform-property-literals": "^7.23.3", + "@babel/plugin-transform-regenerator": "^7.23.3", + "@babel/plugin-transform-reserved-words": "^7.23.3", + "@babel/plugin-transform-shorthand-properties": "^7.23.3", + "@babel/plugin-transform-spread": "^7.23.3", + "@babel/plugin-transform-sticky-regex": "^7.23.3", + "@babel/plugin-transform-template-literals": "^7.23.3", + "@babel/plugin-transform-typeof-symbol": "^7.23.3", + "@babel/plugin-transform-unicode-escapes": "^7.23.3", + "@babel/plugin-transform-unicode-property-regex": "^7.23.3", + "@babel/plugin-transform-unicode-regex": "^7.23.3", + "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", "@babel/preset-modules": "0.1.6-no-external-plugins", - "@babel/types": "^7.22.10", - "babel-plugin-polyfill-corejs2": "^0.4.5", - "babel-plugin-polyfill-corejs3": "^0.8.3", - "babel-plugin-polyfill-regenerator": "^0.5.2", + "babel-plugin-polyfill-corejs2": "^0.4.6", + "babel-plugin-polyfill-corejs3": "^0.8.5", + "babel-plugin-polyfill-regenerator": "^0.5.3", "core-js-compat": "^3.31.0", "semver": "^6.3.1" }, @@ -3096,19 +2608,15 @@ } }, "node_modules/@babel/preset-react": { -<<<<<<< HEAD - "version": "7.22.5", -======= "version": "7.23.3", ->>>>>>> master "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-option": "^7.22.5", - "@babel/plugin-transform-react-display-name": "^7.22.5", - "@babel/plugin-transform-react-jsx": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", + "@babel/plugin-transform-react-display-name": "^7.23.3", + "@babel/plugin-transform-react-jsx": "^7.22.15", "@babel/plugin-transform-react-jsx-development": "^7.22.5", - "@babel/plugin-transform-react-pure-annotations": "^7.22.5" + "@babel/plugin-transform-react-pure-annotations": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -3122,11 +2630,7 @@ "license": "MIT" }, "node_modules/@babel/runtime": { -<<<<<<< HEAD - "version": "7.22.10", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" @@ -3148,21 +2652,17 @@ } }, "node_modules/@babel/traverse": { -<<<<<<< HEAD - "version": "7.23.2", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/generator": "^7.23.0", + "@babel/code-frame": "^7.23.4", + "@babel/generator": "^7.23.4", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.0", - "@babel/types": "^7.23.0", + "@babel/parser": "^7.23.4", + "@babel/types": "^7.23.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -3171,14 +2671,10 @@ } }, "node_modules/@babel/types": { -<<<<<<< HEAD - "version": "7.23.0", -======= "version": "7.23.4", ->>>>>>> master "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, @@ -3205,11 +2701,7 @@ } }, "node_modules/@ebay/nice-modal-react": { -<<<<<<< HEAD - "version": "1.2.10", -======= "version": "1.2.13", ->>>>>>> master "license": "MIT", "peerDependencies": { "react": ">16.8.0", @@ -3231,11 +2723,7 @@ } }, "node_modules/@eslint-community/regexpp": { -<<<<<<< HEAD - "version": "4.7.0", -======= "version": "4.10.0", ->>>>>>> master "dev": true, "license": "MIT", "engines": { @@ -3243,11 +2731,7 @@ } }, "node_modules/@eslint/eslintrc": { -<<<<<<< HEAD - "version": "2.1.2", -======= "version": "2.1.3", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -3284,11 +2768,7 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { -<<<<<<< HEAD - "version": "13.21.0", -======= "version": "13.23.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -3318,11 +2798,7 @@ } }, "node_modules/@eslint/js": { -<<<<<<< HEAD - "version": "8.47.0", -======= "version": "8.54.0", ->>>>>>> master "dev": true, "license": "MIT", "engines": { @@ -3360,15 +2836,11 @@ } }, "node_modules/@humanwhocodes/config-array": { -<<<<<<< HEAD - "version": "0.11.10", -======= "version": "0.11.13", ->>>>>>> master "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -3389,11 +2861,7 @@ } }, "node_modules/@humanwhocodes/object-schema": { -<<<<<<< HEAD - "version": "1.2.1", -======= "version": "2.0.1", ->>>>>>> master "dev": true, "license": "BSD-3-Clause" }, @@ -3652,7 +3120,7 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "node_modules/@jest/create-cache-key-function/node_modules/@jest/types": { + "node_modules/@jest/types": { "version": "27.5.1", "license": "MIT", "dependencies": { @@ -3666,13 +3134,6 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, - "node_modules/@jest/create-cache-key-function/node_modules/@types/yargs": { - "version": "16.0.5", - "license": "MIT", - "dependencies": { - "@types/yargs-parser": "*" - } - }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "license": "MIT", @@ -3704,11 +3165,7 @@ "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { -<<<<<<< HEAD - "version": "0.3.19", -======= "version": "0.3.20", ->>>>>>> master "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -3755,11 +3212,7 @@ "license": "MIT" }, "node_modules/@monaco-editor/loader": { -<<<<<<< HEAD - "version": "1.3.3", -======= "version": "1.4.0", ->>>>>>> master "license": "MIT", "dependencies": { "state-local": "^1.0.6" @@ -3769,14 +3222,10 @@ } }, "node_modules/@monaco-editor/react": { -<<<<<<< HEAD - "version": "4.5.2", -======= "version": "4.6.0", ->>>>>>> master "license": "MIT", "dependencies": { - "@monaco-editor/loader": "^1.3.3" + "@monaco-editor/loader": "^1.4.0" }, "peerDependencies": { "monaco-editor": ">= 0.25.0 < 1", @@ -3980,20 +3429,6 @@ "read-package-json-fast": "^2.0.1" } }, - "node_modules/@oclif/color": { - "version": "1.0.11", - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.2.1", - "chalk": "^4.1.0", - "strip-ansi": "^6.0.1", - "supports-color": "^8.1.1", - "tslib": "^2" - }, - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/@oclif/core": { "version": "1.26.2", "license": "MIT", @@ -4038,20 +3473,6 @@ "sprintf-js": "~1.0.2" } }, - "node_modules/@oclif/core/node_modules/fast-glob": { - "version": "3.3.1", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/@oclif/core/node_modules/fs-extra": { "version": "9.1.0", "license": "MIT", @@ -4169,25 +3590,17 @@ "license": "ISC" }, "node_modules/@oclif/plugin-help": { -<<<<<<< HEAD - "version": "5.2.17", -======= "version": "5.2.20", ->>>>>>> master "license": "MIT", "dependencies": { - "@oclif/core": "^2.11.8" + "@oclif/core": "^2.15.0" }, "engines": { "node": ">=12.0.0" } }, "node_modules/@oclif/plugin-help/node_modules/@oclif/core": { -<<<<<<< HEAD - "version": "2.11.8", -======= "version": "2.15.0", ->>>>>>> master "license": "MIT", "dependencies": { "@types/cli-progress": "^3.11.0", @@ -4199,7 +3612,6 @@ "cli-progress": "^3.12.0", "debug": "^4.3.4", "ejs": "^3.1.8", - "fs-extra": "^9.1.0", "get-package-type": "^0.1.0", "globby": "^11.1.0", "hyperlinker": "^1.0.0", @@ -4209,7 +3621,6 @@ "natural-orderby": "^2.0.3", "object-treeify": "^1.1.33", "password-prompt": "^1.1.2", - "semver": "^7.5.3", "slice-ansi": "^4.0.0", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", @@ -4232,33 +3643,6 @@ "sprintf-js": "~1.0.2" } }, - "node_modules/@oclif/plugin-help/node_modules/fast-glob": { - "version": "3.3.1", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/@oclif/plugin-help/node_modules/fs-extra": { - "version": "9.1.0", - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@oclif/plugin-help/node_modules/globby": { "version": "11.1.0", "license": "MIT", @@ -4304,15 +3688,11 @@ } }, "node_modules/@oclif/plugin-not-found": { -<<<<<<< HEAD - "version": "2.3.37", -======= "version": "2.4.3", ->>>>>>> master "license": "MIT", "dependencies": { - "@oclif/color": "^1.0.10", - "@oclif/core": "^2.11.7", + "@oclif/core": "^2.15.0", + "chalk": "^4", "fast-levenshtein": "^3.0.0" }, "engines": { @@ -4320,11 +3700,7 @@ } }, "node_modules/@oclif/plugin-not-found/node_modules/@oclif/core": { -<<<<<<< HEAD - "version": "2.11.8", -======= "version": "2.15.0", ->>>>>>> master "license": "MIT", "dependencies": { "@types/cli-progress": "^3.11.0", @@ -4336,7 +3712,6 @@ "cli-progress": "^3.12.0", "debug": "^4.3.4", "ejs": "^3.1.8", - "fs-extra": "^9.1.0", "get-package-type": "^0.1.0", "globby": "^11.1.0", "hyperlinker": "^1.0.0", @@ -4346,7 +3721,6 @@ "natural-orderby": "^2.0.3", "object-treeify": "^1.1.33", "password-prompt": "^1.1.2", - "semver": "^7.5.3", "slice-ansi": "^4.0.0", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", @@ -4369,33 +3743,6 @@ "sprintf-js": "~1.0.2" } }, - "node_modules/@oclif/plugin-not-found/node_modules/fast-glob": { - "version": "3.3.1", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/@oclif/plugin-not-found/node_modules/fs-extra": { - "version": "9.1.0", - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@oclif/plugin-not-found/node_modules/globby": { "version": "11.1.0", "license": "MIT", @@ -4441,19 +3788,14 @@ } }, "node_modules/@oclif/plugin-warn-if-update-available": { -<<<<<<< HEAD - "version": "2.0.48", -======= "version": "2.1.1", ->>>>>>> master "license": "MIT", "dependencies": { - "@oclif/core": "^2.11.8", + "@oclif/core": "^2.15.0", "chalk": "^4.1.0", "debug": "^4.1.0", - "fs-extra": "^9.0.1", "http-call": "^5.2.2", - "lodash": "^4.17.21", + "lodash.template": "^4.5.0", "semver": "^7.5.4" }, "engines": { @@ -4461,11 +3803,7 @@ } }, "node_modules/@oclif/plugin-warn-if-update-available/node_modules/@oclif/core": { -<<<<<<< HEAD - "version": "2.11.8", -======= "version": "2.15.0", ->>>>>>> master "license": "MIT", "dependencies": { "@types/cli-progress": "^3.11.0", @@ -4477,7 +3815,6 @@ "cli-progress": "^3.12.0", "debug": "^4.3.4", "ejs": "^3.1.8", - "fs-extra": "^9.1.0", "get-package-type": "^0.1.0", "globby": "^11.1.0", "hyperlinker": "^1.0.0", @@ -4487,7 +3824,6 @@ "natural-orderby": "^2.0.3", "object-treeify": "^1.1.33", "password-prompt": "^1.1.2", - "semver": "^7.5.3", "slice-ansi": "^4.0.0", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", @@ -4510,33 +3846,6 @@ "sprintf-js": "~1.0.2" } }, - "node_modules/@oclif/plugin-warn-if-update-available/node_modules/fast-glob": { - "version": "3.3.1", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/@oclif/plugin-warn-if-update-available/node_modules/fs-extra": { - "version": "9.1.0", - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@oclif/plugin-warn-if-update-available/node_modules/globby": { "version": "11.1.0", "license": "MIT", @@ -4582,38 +3891,26 @@ } }, "node_modules/@oclif/screen": { -<<<<<<< HEAD - "version": "3.0.6", -======= "version": "3.0.8", ->>>>>>> master "license": "MIT", "engines": { "node": ">=12.0.0" } }, "node_modules/@oclif/test": { -<<<<<<< HEAD - "version": "2.4.6", -======= "version": "2.5.6", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "@oclif/core": "^2.11.8", - "fancy-test": "^2.0.34" + "@oclif/core": "^2.15.0", + "fancy-test": "^2.0.42" }, "engines": { "node": ">=12.0.0" } }, "node_modules/@oclif/test/node_modules/@oclif/core": { -<<<<<<< HEAD - "version": "2.11.8", -======= "version": "2.15.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -4626,7 +3923,6 @@ "cli-progress": "^3.12.0", "debug": "^4.3.4", "ejs": "^3.1.8", - "fs-extra": "^9.1.0", "get-package-type": "^0.1.0", "globby": "^11.1.0", "hyperlinker": "^1.0.0", @@ -4636,7 +3932,6 @@ "natural-orderby": "^2.0.3", "object-treeify": "^1.1.33", "password-prompt": "^1.1.2", - "semver": "^7.5.3", "slice-ansi": "^4.0.0", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", @@ -4660,37 +3955,8 @@ "sprintf-js": "~1.0.2" } }, - "node_modules/@oclif/test/node_modules/fast-glob": { - "version": "3.3.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/@oclif/test/node_modules/fs-extra": { - "version": "9.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@oclif/test/node_modules/globby": { - "version": "11.1.0", + "node_modules/@oclif/test/node_modules/globby": { + "version": "11.1.0", "dev": true, "license": "MIT", "dependencies": { @@ -4904,11 +4170,7 @@ } }, "node_modules/@pkgr/utils/node_modules/fast-glob": { -<<<<<<< HEAD - "version": "3.3.1", -======= "version": "3.3.2", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -5081,18 +4343,12 @@ } }, "node_modules/@sigstore/sign/node_modules/cacache/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/@sigstore/sign/node_modules/foreground-child": { "version": "3.1.1", "license": "ISC", @@ -5107,7 +4363,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/@sigstore/sign/node_modules/fs-minipass": { "version": "3.0.3", "license": "ISC", @@ -5119,32 +4374,24 @@ } }, "node_modules/@sigstore/sign/node_modules/fs-minipass/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, "node_modules/@sigstore/sign/node_modules/glob": { -<<<<<<< HEAD - "version": "10.3.3", -======= "version": "10.3.10", ->>>>>>> master "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -5232,18 +4479,12 @@ } }, "node_modules/@sigstore/sign/node_modules/minipass-fetch/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/@sigstore/sign/node_modules/signal-exit": { "version": "4.1.0", "license": "ISC", @@ -5254,7 +4495,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/@sigstore/sign/node_modules/socks-proxy-agent": { "version": "7.0.0", "license": "MIT", @@ -5278,11 +4518,7 @@ } }, "node_modules/@sigstore/sign/node_modules/ssri/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -5330,11 +4566,7 @@ } }, "node_modules/@smoya/multi-parser": { -<<<<<<< HEAD - "version": "4.0.0", -======= "version": "4.1.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.3", @@ -5517,11 +4749,7 @@ } }, "node_modules/@stoplight/spectral-formats": { -<<<<<<< HEAD - "version": "1.5.0", -======= "version": "1.6.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@stoplight/json": "^3.17.0", @@ -5534,11 +4762,7 @@ } }, "node_modules/@stoplight/spectral-formatters": { -<<<<<<< HEAD - "version": "1.2.0", -======= "version": "1.3.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@stoplight/path": "^1.3.2", @@ -5548,6 +4772,7 @@ "chalk": "4.1.2", "cliui": "7.0.4", "lodash": "^4.17.21", + "node-sarif-builder": "^2.0.3", "strip-ansi": "6.0", "text-table": "^0.2.0", "tslib": "^2.5.0" @@ -5652,11 +4877,7 @@ } }, "node_modules/@stoplight/spectral-rulesets": { -<<<<<<< HEAD - "version": "1.16.0", -======= "version": "1.18.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@asyncapi/specs": "^4.1.0", @@ -5713,11 +4934,7 @@ } }, "node_modules/@stoplight/types": { -<<<<<<< HEAD - "version": "13.19.0", -======= "version": "13.20.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.4", @@ -5745,11 +4962,6 @@ "license": "Apache-2.0" }, "node_modules/@swc/core": { -<<<<<<< HEAD - "version": "1.3.78", - "hasInstallScript": true, - "license": "Apache-2.0", -======= "version": "1.3.99", "hasInstallScript": true, "license": "Apache-2.0", @@ -5757,7 +4969,6 @@ "@swc/counter": "^0.1.1", "@swc/types": "^0.1.5" }, ->>>>>>> master "engines": { "node": ">=10" }, @@ -5766,16 +4977,15 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.3.78", - "@swc/core-darwin-x64": "1.3.78", - "@swc/core-linux-arm-gnueabihf": "1.3.78", - "@swc/core-linux-arm64-gnu": "1.3.78", - "@swc/core-linux-arm64-musl": "1.3.78", - "@swc/core-linux-x64-gnu": "1.3.78", - "@swc/core-linux-x64-musl": "1.3.78", - "@swc/core-win32-arm64-msvc": "1.3.78", - "@swc/core-win32-ia32-msvc": "1.3.78", - "@swc/core-win32-x64-msvc": "1.3.78" + "@swc/core-darwin-arm64": "1.3.99", + "@swc/core-darwin-x64": "1.3.99", + "@swc/core-linux-arm64-gnu": "1.3.99", + "@swc/core-linux-arm64-musl": "1.3.99", + "@swc/core-linux-x64-gnu": "1.3.99", + "@swc/core-linux-x64-musl": "1.3.99", + "@swc/core-win32-arm64-msvc": "1.3.99", + "@swc/core-win32-ia32-msvc": "1.3.99", + "@swc/core-win32-x64-msvc": "1.3.99" }, "peerDependencies": { "@swc/helpers": "^0.5.0" @@ -5786,8 +4996,6 @@ } } }, -<<<<<<< HEAD -======= "node_modules/@swc/core-darwin-x64": { "version": "1.3.99", "cpu": [ @@ -5806,7 +5014,6 @@ "version": "0.1.2", "license": "Apache-2.0" }, ->>>>>>> master "node_modules/@swc/jest": { "version": "0.2.29", "license": "MIT", @@ -5824,13 +5031,10 @@ "node_modules/@swc/jest/node_modules/jsonc-parser": { "version": "3.2.0", "license": "MIT" -<<<<<<< HEAD -======= }, "node_modules/@swc/types": { "version": "0.1.5", "license": "Apache-2.0" ->>>>>>> master }, "node_modules/@szmarczak/http-timer": { "version": "4.0.6", @@ -5914,47 +5118,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@types/babel__core": { - "version": "7.20.1", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "node_modules/@types/babel__generator": { - "version": "7.6.4", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__template": { - "version": "7.4.1", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "node_modules/@types/babel__traverse": { - "version": "7.20.1", - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "@babel/types": "^7.20.7" - } - }, "node_modules/@types/cacheable-request": { "version": "6.0.3", "license": "MIT", @@ -5966,31 +5129,19 @@ } }, "node_modules/@types/chai": { -<<<<<<< HEAD - "version": "4.3.6", -======= "version": "4.3.11", ->>>>>>> master "dev": true, "license": "MIT" }, "node_modules/@types/cli-progress": { -<<<<<<< HEAD - "version": "3.11.0", -======= "version": "3.11.5", ->>>>>>> master "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/d3": { -<<<<<<< HEAD - "version": "7.4.0", -======= "version": "7.4.3", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-array": "*", @@ -6026,47 +5177,24 @@ } }, "node_modules/@types/d3-array": { -<<<<<<< HEAD - "version": "3.0.6", - "license": "MIT" - }, - "node_modules/@types/d3-axis": { - "version": "3.0.3", -======= "version": "3.2.1", "license": "MIT" }, "node_modules/@types/d3-axis": { "version": "3.0.6", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-selection": "*" } }, "node_modules/@types/d3-brush": { -<<<<<<< HEAD - "version": "3.0.3", -======= "version": "3.0.6", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-selection": "*" } }, "node_modules/@types/d3-chord": { -<<<<<<< HEAD - "version": "3.0.3", - "license": "MIT" - }, - "node_modules/@types/d3-color": { - "version": "3.1.0", - "license": "MIT" - }, - "node_modules/@types/d3-contour": { - "version": "3.0.3", -======= "version": "3.0.6", "license": "MIT" }, @@ -6076,7 +5204,6 @@ }, "node_modules/@types/d3-contour": { "version": "3.0.6", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-array": "*", @@ -6084,17 +5211,6 @@ } }, "node_modules/@types/d3-delaunay": { -<<<<<<< HEAD - "version": "6.0.1", - "license": "MIT" - }, - "node_modules/@types/d3-dispatch": { - "version": "3.0.3", - "license": "MIT" - }, - "node_modules/@types/d3-drag": { - "version": "3.0.3", -======= "version": "6.0.4", "license": "MIT" }, @@ -6104,24 +5220,12 @@ }, "node_modules/@types/d3-drag": { "version": "3.0.7", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-selection": "*" } }, "node_modules/@types/d3-dsv": { -<<<<<<< HEAD - "version": "3.0.2", - "license": "MIT" - }, - "node_modules/@types/d3-ease": { - "version": "3.0.0", - "license": "MIT" - }, - "node_modules/@types/d3-fetch": { - "version": "3.0.3", -======= "version": "3.0.7", "license": "MIT" }, @@ -6131,24 +5235,12 @@ }, "node_modules/@types/d3-fetch": { "version": "3.0.7", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-dsv": "*" } }, "node_modules/@types/d3-force": { -<<<<<<< HEAD - "version": "3.0.5", - "license": "MIT" - }, - "node_modules/@types/d3-format": { - "version": "3.0.1", - "license": "MIT" - }, - "node_modules/@types/d3-geo": { - "version": "3.0.4", -======= "version": "3.0.9", "license": "MIT" }, @@ -6158,51 +5250,23 @@ }, "node_modules/@types/d3-geo": { "version": "3.1.0", ->>>>>>> master "license": "MIT", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/d3-hierarchy": { -<<<<<<< HEAD - "version": "3.1.3", - "license": "MIT" - }, - "node_modules/@types/d3-interpolate": { - "version": "3.0.1", -======= "version": "3.1.6", "license": "MIT" }, "node_modules/@types/d3-interpolate": { "version": "3.0.4", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-color": "*" } }, "node_modules/@types/d3-path": { -<<<<<<< HEAD - "version": "3.0.0", - "license": "MIT" - }, - "node_modules/@types/d3-polygon": { - "version": "3.0.0", - "license": "MIT" - }, - "node_modules/@types/d3-quadtree": { - "version": "3.0.2", - "license": "MIT" - }, - "node_modules/@types/d3-random": { - "version": "3.0.1", - "license": "MIT" - }, - "node_modules/@types/d3-scale": { - "version": "4.0.4", -======= "version": "3.0.2", "license": "MIT" }, @@ -6220,24 +5284,12 @@ }, "node_modules/@types/d3-scale": { "version": "4.0.8", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-time": "*" } }, "node_modules/@types/d3-scale-chromatic": { -<<<<<<< HEAD - "version": "3.0.0", - "license": "MIT" - }, - "node_modules/@types/d3-selection": { - "version": "3.0.6", - "license": "MIT" - }, - "node_modules/@types/d3-shape": { - "version": "3.1.2", -======= "version": "3.0.3", "license": "MIT" }, @@ -6247,28 +5299,12 @@ }, "node_modules/@types/d3-shape": { "version": "3.1.6", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-path": "*" } }, "node_modules/@types/d3-time": { -<<<<<<< HEAD - "version": "3.0.0", - "license": "MIT" - }, - "node_modules/@types/d3-time-format": { - "version": "4.0.0", - "license": "MIT" - }, - "node_modules/@types/d3-timer": { - "version": "3.0.0", - "license": "MIT" - }, - "node_modules/@types/d3-transition": { - "version": "3.0.4", -======= "version": "3.0.3", "license": "MIT" }, @@ -6282,18 +5318,13 @@ }, "node_modules/@types/d3-transition": { "version": "3.0.8", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-selection": "*" } }, "node_modules/@types/d3-zoom": { -<<<<<<< HEAD - "version": "3.0.4", -======= "version": "3.0.8", ->>>>>>> master "license": "MIT", "dependencies": { "@types/d3-interpolate": "*", @@ -6308,11 +5339,7 @@ } }, "node_modules/@types/es-aggregate-error": { -<<<<<<< HEAD - "version": "1.0.2", -======= "version": "1.0.6", ->>>>>>> master "license": "MIT", "dependencies": { "@types/node": "*" @@ -6332,11 +5359,7 @@ "license": "MIT" }, "node_modules/@types/fs-extra": { -<<<<<<< HEAD - "version": "11.0.1", -======= "version": "11.0.4", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -6345,11 +5368,7 @@ } }, "node_modules/@types/geojson": { -<<<<<<< HEAD - "version": "7946.0.10", -======= "version": "7946.0.13", ->>>>>>> master "license": "MIT" }, "node_modules/@types/glob": { @@ -6366,11 +5385,7 @@ "license": "MIT" }, "node_modules/@types/inquirer": { -<<<<<<< HEAD - "version": "8.2.6", -======= "version": "8.2.10", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -6379,50 +5394,30 @@ } }, "node_modules/@types/istanbul-lib-coverage": { -<<<<<<< HEAD - "version": "2.0.4", - "license": "MIT" - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", -======= "version": "2.0.6", "license": "MIT" }, "node_modules/@types/istanbul-lib-report": { "version": "3.0.3", ->>>>>>> master "license": "MIT", "dependencies": { "@types/istanbul-lib-coverage": "*" } }, "node_modules/@types/istanbul-reports": { -<<<<<<< HEAD - "version": "3.0.1", -======= "version": "3.0.4", ->>>>>>> master "license": "MIT", "dependencies": { "@types/istanbul-lib-report": "*" } }, "node_modules/@types/js-yaml": { -<<<<<<< HEAD - "version": "4.0.5", -======= "version": "4.0.9", ->>>>>>> master "dev": true, "license": "MIT" }, "node_modules/@types/json-schema": { -<<<<<<< HEAD - "version": "7.0.12", -======= "version": "7.0.15", ->>>>>>> master "license": "MIT" }, "node_modules/@types/json5": { @@ -6431,11 +5426,7 @@ "license": "MIT" }, "node_modules/@types/jsonfile": { -<<<<<<< HEAD - "version": "6.1.1", -======= "version": "6.1.4", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -6450,20 +5441,12 @@ } }, "node_modules/@types/lodash": { -<<<<<<< HEAD - "version": "4.14.197", -======= "version": "4.14.202", ->>>>>>> master "dev": true, "license": "MIT" }, "node_modules/@types/lodash.template": { -<<<<<<< HEAD - "version": "4.5.1", -======= "version": "4.5.3", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -6476,11 +5459,7 @@ "license": "MIT" }, "node_modules/@types/mocha": { -<<<<<<< HEAD - "version": "10.0.2", -======= "version": "10.0.6", ->>>>>>> master "dev": true, "license": "MIT" }, @@ -6489,43 +5468,27 @@ "license": "MIT" }, "node_modules/@types/node-fetch": { -<<<<<<< HEAD - "version": "2.6.4", -======= "version": "2.6.9", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", - "form-data": "^3.0.0" + "form-data": "^4.0.0" } }, "node_modules/@types/normalize-package-data": { -<<<<<<< HEAD - "version": "2.4.1", - "license": "MIT" - }, - "node_modules/@types/protocol-buffers-schema": { - "version": "3.4.1", -======= "version": "2.4.4", "license": "MIT" }, "node_modules/@types/protocol-buffers-schema": { "version": "3.4.3", ->>>>>>> master "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@types/responselike": { -<<<<<<< HEAD - "version": "1.0.0", -======= "version": "1.0.3", ->>>>>>> master "license": "MIT", "dependencies": { "@types/node": "*" @@ -6540,26 +5503,17 @@ "@types/node": "*" } }, -<<<<<<< HEAD - "node_modules/@types/semver": { - "version": "7.5.0", -======= "node_modules/@types/sarif": { "version": "2.1.7", "license": "MIT" }, "node_modules/@types/semver": { "version": "7.5.6", ->>>>>>> master "dev": true, "license": "MIT" }, "node_modules/@types/serve-handler": { -<<<<<<< HEAD - "version": "6.1.1", -======= "version": "6.1.4", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -6567,11 +5521,7 @@ } }, "node_modules/@types/sinon": { -<<<<<<< HEAD - "version": "10.0.16", -======= "version": "17.0.2", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -6579,20 +5529,12 @@ } }, "node_modules/@types/sinonjs__fake-timers": { -<<<<<<< HEAD - "version": "8.1.2", -======= "version": "8.1.5", ->>>>>>> master "dev": true, "license": "MIT" }, "node_modules/@types/through": { -<<<<<<< HEAD - "version": "0.0.30", -======= "version": "0.0.33", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -6600,17 +5542,6 @@ } }, "node_modules/@types/trusted-types": { -<<<<<<< HEAD - "version": "2.0.3", - "license": "MIT" - }, - "node_modules/@types/urijs": { - "version": "1.19.19", - "license": "MIT" - }, - "node_modules/@types/vinyl": { - "version": "2.0.7", -======= "version": "2.0.7", "license": "MIT" }, @@ -6620,7 +5551,6 @@ }, "node_modules/@types/vinyl": { "version": "2.0.11", ->>>>>>> master "license": "MIT", "dependencies": { "@types/expect": "^1.20.4", @@ -6628,14 +5558,6 @@ } }, "node_modules/@types/wrap-ansi": { -<<<<<<< HEAD - "version": "8.0.1", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/ws": { - "version": "8.5.5", -======= "version": "8.1.0", "deprecated": "This is a stub types definition. wrap-ansi provides its own type definitions, so you do not need this installed.", "dev": true, @@ -6646,17 +5568,12 @@ }, "node_modules/@types/ws": { "version": "8.5.10", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "@types/node": "*" } }, -<<<<<<< HEAD - "node_modules/@types/yargs-parser": { - "version": "21.0.0", -======= "node_modules/@types/yargs": { "version": "16.0.9", "license": "MIT", @@ -6666,7 +5583,6 @@ }, "node_modules/@types/yargs-parser": { "version": "21.0.3", ->>>>>>> master "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { @@ -6803,21 +5719,6 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/experimental-utils/node_modules/fast-glob": { - "version": "3.3.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/@typescript-eslint/experimental-utils/node_modules/globby": { "version": "11.1.0", "dev": true, @@ -6943,21 +5844,6 @@ } } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": { - "version": "3.3.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": { "version": "11.1.0", "dev": true, @@ -7018,14 +5904,11 @@ "url": "https://opencollective.com/typescript-eslint" } }, -<<<<<<< HEAD -======= "node_modules/@ungap/structured-clone": { "version": "1.2.0", "dev": true, "license": "ISC" }, ->>>>>>> master "node_modules/a-sync-waterfall": { "version": "1.0.1", "license": "MIT" @@ -7049,11 +5932,7 @@ } }, "node_modules/acorn": { -<<<<<<< HEAD - "version": "8.10.0", -======= "version": "8.11.2", ->>>>>>> master "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -7195,16 +6074,9 @@ } }, "node_modules/ansi-colors": { -<<<<<<< HEAD - "version": "4.1.3", - "dev": true, - "license": "MIT", - "peer": true, -======= "version": "4.1.1", "dev": true, "license": "MIT", ->>>>>>> master "engines": { "node": ">=6" } @@ -7350,18 +6222,14 @@ "license": "MIT" }, "node_modules/array-includes": { -<<<<<<< HEAD - "version": "3.1.6", -======= "version": "3.1.7", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" }, "engines": { @@ -7379,19 +6247,15 @@ } }, "node_modules/array.prototype.findlastindex": { -<<<<<<< HEAD - "version": "1.2.2", -======= "version": "1.2.3", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "get-intrinsic": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -7401,17 +6265,13 @@ } }, "node_modules/array.prototype.flat": { -<<<<<<< HEAD - "version": "1.3.1", -======= "version": "1.3.2", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -7422,17 +6282,13 @@ } }, "node_modules/array.prototype.flatmap": { -<<<<<<< HEAD - "version": "1.3.1", -======= "version": "1.3.2", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -7443,16 +6299,13 @@ } }, "node_modules/arraybuffer.prototype.slice": { -<<<<<<< HEAD - "version": "1.0.1", -======= "version": "1.0.2", ->>>>>>> master "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", "is-array-buffer": "^3.0.2", "is-shared-array-buffer": "^1.0.2" @@ -7515,15 +6368,9 @@ } }, "node_modules/ast-types-flow": { -<<<<<<< HEAD - "version": "0.0.7", - "dev": true, - "license": "ISC" -======= "version": "0.0.8", "dev": true, "license": "MIT" ->>>>>>> master }, "node_modules/astral-regex": { "version": "2.0.0", @@ -7540,10 +6387,6 @@ } }, "node_modules/async": { -<<<<<<< HEAD - "version": "3.2.4", - "license": "MIT" -======= "version": "3.2.5", "license": "MIT" }, @@ -7561,7 +6404,6 @@ "dependencies": { "has-symbols": "^1.0.3" } ->>>>>>> master }, "node_modules/asynckit": { "version": "0.4.0", @@ -7600,11 +6442,7 @@ } }, "node_modules/aws-sdk": { -<<<<<<< HEAD - "version": "2.1442.0", -======= "version": "2.1503.0", ->>>>>>> master "license": "Apache-2.0", "dependencies": { "buffer": "4.9.2", @@ -7629,8 +6467,6 @@ "node": ">= 0.6.0" } }, -<<<<<<< HEAD -======= "node_modules/aws-sdk/node_modules/uuid": { "version": "8.0.0", "license": "MIT", @@ -7638,7 +6474,6 @@ "uuid": "dist/bin/uuid" } }, ->>>>>>> master "node_modules/aws-sign2": { "version": "0.7.0", "license": "Apache-2.0", @@ -7651,11 +6486,7 @@ "license": "MIT" }, "node_modules/axe-core": { -<<<<<<< HEAD - "version": "4.7.2", -======= "version": "4.7.0", ->>>>>>> master "dev": true, "license": "MPL-2.0", "engines": { @@ -7671,19 +6502,11 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { -<<<<<<< HEAD - "version": "0.4.5", - "license": "MIT", - "dependencies": { - "@babel/compat-data": "^7.22.6", - "@babel/helper-define-polyfill-provider": "^0.4.2", -======= "version": "0.4.7", "license": "MIT", "dependencies": { "@babel/compat-data": "^7.22.6", "@babel/helper-define-polyfill-provider": "^0.4.4", ->>>>>>> master "semver": "^6.3.1" }, "peerDependencies": { @@ -7698,36 +6521,21 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { -<<<<<<< HEAD - "version": "0.8.3", - "license": "MIT", - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.2", - "core-js-compat": "^3.31.0" -======= "version": "0.8.7", "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.4.4", "core-js-compat": "^3.33.1" ->>>>>>> master }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/babel-plugin-polyfill-regenerator": { -<<<<<<< HEAD - "version": "0.5.2", - "license": "MIT", - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.2" -======= "version": "0.5.4", "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.4.4" ->>>>>>> master }, "peerDependencies": { "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" @@ -7774,11 +6582,7 @@ "license": "Apache-2.0" }, "node_modules/big-integer": { -<<<<<<< HEAD - "version": "1.6.51", -======= "version": "1.6.52", ->>>>>>> master "license": "Unlicense", "engines": { "node": ">=0.6" @@ -7815,13 +6619,8 @@ } }, "node_modules/binaryextensions": { -<<<<<<< HEAD - "version": "4.18.0", - "license": "MIT", -======= "version": "4.19.0", "license": "Artistic-2.0", ->>>>>>> master "engines": { "node": ">=0.8" }, @@ -7915,11 +6714,7 @@ "license": "ISC" }, "node_modules/browserslist": { -<<<<<<< HEAD - "version": "4.21.10", -======= "version": "4.22.2", ->>>>>>> master "funding": [ { "type": "opencollective", @@ -7936,17 +6731,10 @@ ], "license": "MIT", "dependencies": { -<<<<<<< HEAD - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" -======= "caniuse-lite": "^1.0.30001565", "electron-to-chromium": "^1.4.601", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" ->>>>>>> master }, "bin": { "browserslist": "cli.js" @@ -7981,19 +6769,6 @@ "node": ">=0.2.0" } }, - "node_modules/bufferutil": { - "version": "4.0.8", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "node-gyp-build": "^4.3.0" - }, - "engines": { - "node": ">=6.14.2" - } - }, "node_modules/builtin-modules": { "version": "3.3.0", "dev": true, @@ -8023,8 +6798,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD -======= "node_modules/bytes": { "version": "3.0.0", "license": "MIT", @@ -8032,7 +6805,6 @@ "node": ">= 0.8" } }, ->>>>>>> master "node_modules/cacache": { "version": "15.3.0", "license": "ISC", @@ -8097,19 +6869,6 @@ "node": ">=8" } }, - "node_modules/cacheable-request/node_modules/get-stream": { - "version": "5.2.0", - "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/caching-transform": { "version": "4.0.0", "dev": true, @@ -8124,39 +6883,13 @@ "node": ">=8" } }, -<<<<<<< HEAD - "node_modules/caching-transform/node_modules/make-dir": { - "version": "3.1.0", - "dev": true, -======= "node_modules/call-bind": { "version": "1.0.5", ->>>>>>> master - "license": "MIT", - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/caching-transform/node_modules/semver": { - "version": "6.3.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/call-bind": { - "version": "1.0.2", "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8191,11 +6924,7 @@ } }, "node_modules/caniuse-lite": { -<<<<<<< HEAD - "version": "1.0.30001522", -======= "version": "1.0.30001565", ->>>>>>> master "funding": [ { "type": "opencollective", @@ -8237,21 +6966,17 @@ "license": "Apache-2.0" }, "node_modules/chai": { -<<<<<<< HEAD - "version": "4.3.7", -======= "version": "4.3.10", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^4.1.2", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" }, "engines": { "node": ">=4" @@ -8311,18 +7036,12 @@ "license": "MIT" }, "node_modules/check-error": { -<<<<<<< HEAD - "version": "1.0.2", - "dev": true, - "license": "MIT", -======= "version": "1.0.3", "dev": true, "license": "MIT", "dependencies": { "get-func-name": "^2.0.2" }, ->>>>>>> master "engines": { "node": "*" } @@ -8360,11 +7079,7 @@ } }, "node_modules/ci-info": { -<<<<<<< HEAD - "version": "3.8.0", -======= "version": "3.9.0", ->>>>>>> master "dev": true, "funding": [ { @@ -8434,11 +7149,7 @@ } }, "node_modules/cli-spinners": { -<<<<<<< HEAD - "version": "2.9.0", -======= "version": "2.9.2", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6" @@ -8743,16 +7454,6 @@ } }, "node_modules/convert-source-map": { -<<<<<<< HEAD - "version": "1.9.0", - "license": "MIT" - }, - "node_modules/core-js-compat": { - "version": "3.32.1", - "license": "MIT", - "dependencies": { - "browserslist": "^4.21.10" -======= "version": "2.0.0", "license": "MIT" }, @@ -8761,7 +7462,6 @@ "license": "MIT", "dependencies": { "browserslist": "^4.22.2" ->>>>>>> master }, "funding": { "type": "opencollective", @@ -8936,13 +7636,10 @@ "node": ">=0.10" } }, -<<<<<<< HEAD -======= "node_modules/data-uri-to-buffer": { "version": "2.0.2", "license": "MIT" }, ->>>>>>> master "node_modules/data-urls": { "version": "2.0.0", "license": "MIT", @@ -9110,8 +7807,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, -<<<<<<< HEAD -======= "node_modules/default-browser/node_modules/get-stream": { "version": "6.0.1", "dev": true, @@ -9123,7 +7818,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, ->>>>>>> master "node_modules/default-browser/node_modules/human-signals": { "version": "4.3.1", "dev": true, @@ -9235,8 +7929,6 @@ "node": ">=10" } }, -<<<<<<< HEAD -======= "node_modules/define-data-property": { "version": "1.1.1", "license": "MIT", @@ -9249,7 +7941,6 @@ "node": ">= 0.4" } }, ->>>>>>> master "node_modules/define-lazy-prop": { "version": "2.0.0", "license": "MIT", @@ -9258,13 +7949,10 @@ } }, "node_modules/define-properties": { -<<<<<<< HEAD - "version": "1.2.0", -======= "version": "1.2.1", ->>>>>>> master "license": "MIT", "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -9322,11 +8010,7 @@ } }, "node_modules/diff": { -<<<<<<< HEAD - "version": "4.0.2", -======= "version": "5.0.0", ->>>>>>> master "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" @@ -9425,11 +8109,7 @@ } }, "node_modules/electron-to-chromium": { -<<<<<<< HEAD - "version": "1.4.499", -======= "version": "1.4.613", ->>>>>>> master "license": "ISC" }, "node_modules/emoji-regex": { @@ -9497,28 +8177,24 @@ } }, "node_modules/es-abstract": { -<<<<<<< HEAD - "version": "1.22.1", -======= "version": "1.22.3", ->>>>>>> master "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", + "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -9526,23 +8202,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", "typed-array-buffer": "^1.0.0", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" + "which-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -9552,20 +8228,17 @@ } }, "node_modules/es-aggregate-error": { -<<<<<<< HEAD - "version": "1.0.9", -======= "version": "1.0.11", ->>>>>>> master "license": "MIT", "dependencies": { - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-data-property": "^1.1.0", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.1", "function-bind": "^1.1.1", - "functions-have-names": "^1.2.3", - "get-intrinsic": "^1.1.3", + "get-intrinsic": "^1.2.1", "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.0", + "set-function-name": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -9574,10 +8247,6 @@ "url": "https://github.com/sponsors/ljharb" } }, -<<<<<<< HEAD - "node_modules/es-set-tostringtag": { - "version": "2.0.1", -======= "node_modules/es-iterator-helpers": { "version": "1.0.15", "dev": true, @@ -9601,27 +8270,22 @@ }, "node_modules/es-set-tostringtag": { "version": "2.0.2", ->>>>>>> master "license": "MIT", "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { -<<<<<<< HEAD - "version": "1.0.0", -======= "version": "1.0.2", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { @@ -9688,21 +8352,18 @@ } }, "node_modules/eslint": { -<<<<<<< HEAD - "version": "8.47.0", -======= "version": "8.54.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "^8.47.0", - "@humanwhocodes/config-array": "^0.11.10", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -9825,15 +8486,12 @@ "node": ">=10.10.0" } }, -<<<<<<< HEAD -======= "node_modules/eslint-config-oclif-typescript/node_modules/@humanwhocodes/object-schema": { "version": "1.2.1", "dev": true, "license": "BSD-3-Clause", "peer": true }, ->>>>>>> master "node_modules/eslint-config-oclif-typescript/node_modules/@typescript-eslint/eslint-plugin": { "version": "4.33.0", "dev": true, @@ -10153,32 +8811,10 @@ "node": ">=4" } }, -<<<<<<< HEAD - "node_modules/eslint-config-oclif-typescript/node_modules/fast-glob": { - "version": "3.3.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/eslint-config-oclif-typescript/node_modules/globals": { - "version": "13.21.0", - "dev": true, - "license": "MIT", -======= "node_modules/eslint-config-oclif-typescript/node_modules/globals": { "version": "13.23.0", "dev": true, "license": "MIT", ->>>>>>> master "peer": true, "dependencies": { "type-fest": "^0.20.2" @@ -10419,11 +9055,7 @@ } }, "node_modules/eslint-plugin-github": { -<<<<<<< HEAD - "version": "4.9.2", -======= "version": "4.10.1", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -10453,19 +9085,15 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/eslint-plugin": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.4.1", - "@typescript-eslint/type-utils": "6.4.1", - "@typescript-eslint/utils": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/type-utils": "6.12.0", + "@typescript-eslint/utils": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -10491,18 +9119,14 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/parser": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "6.4.1", - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/typescript-estree": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4" }, "engines": { @@ -10522,16 +9146,12 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/scope-manager": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1" + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -10542,16 +9162,12 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/type-utils": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "6.4.1", - "@typescript-eslint/utils": "6.4.1", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/utils": "6.12.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -10572,11 +9188,7 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/types": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "MIT", "engines": { @@ -10588,16 +9200,12 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/typescript-estree": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/visitor-keys": "6.4.1", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -10618,20 +9226,16 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/utils": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.4.1", - "@typescript-eslint/types": "6.4.1", - "@typescript-eslint/typescript-estree": "6.4.1", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", "semver": "^7.5.4" }, "engines": { @@ -10646,15 +9250,11 @@ } }, "node_modules/eslint-plugin-github/node_modules/@typescript-eslint/visitor-keys": { -<<<<<<< HEAD - "version": "6.4.1", -======= "version": "6.12.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "6.4.1", + "@typescript-eslint/types": "6.12.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -10665,21 +9265,6 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/eslint-plugin-github/node_modules/fast-glob": { - "version": "3.3.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/eslint-plugin-github/node_modules/globby": { "version": "11.1.0", "dev": true, @@ -10708,29 +9293,25 @@ } }, "node_modules/eslint-plugin-import": { -<<<<<<< HEAD - "version": "2.28.1", -======= "version": "2.29.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.findlastindex": "^1.2.2", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", + "eslint-import-resolver-node": "^0.3.9", "eslint-module-utils": "^2.8.0", - "has": "^1.0.3", - "is-core-module": "^2.13.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.fromentries": "^2.0.6", - "object.groupby": "^1.0.0", - "object.values": "^1.1.6", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", "semver": "^6.3.1", "tsconfig-paths": "^3.14.2" }, @@ -10769,30 +9350,26 @@ } }, "node_modules/eslint-plugin-jsx-a11y": { -<<<<<<< HEAD - "version": "6.7.1", -======= "version": "6.8.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "@babel/runtime": "^7.20.7", - "aria-query": "^5.1.3", - "array-includes": "^3.1.6", - "array.prototype.flatmap": "^1.3.1", - "ast-types-flow": "^0.0.7", - "axe-core": "^4.6.2", - "axobject-query": "^3.1.1", + "@babel/runtime": "^7.23.2", + "aria-query": "^5.3.0", + "array-includes": "^3.1.7", + "array.prototype.flatmap": "^1.3.2", + "ast-types-flow": "^0.0.8", + "axe-core": "=4.7.0", + "axobject-query": "^3.2.1", "damerau-levenshtein": "^1.0.8", "emoji-regex": "^9.2.2", - "has": "^1.0.3", - "jsx-ast-utils": "^3.3.3", - "language-tags": "=1.0.5", + "es-iterator-helpers": "^1.0.15", + "hasown": "^2.0.0", + "jsx-ast-utils": "^3.3.5", + "language-tags": "^1.0.9", "minimatch": "^3.1.2", - "object.entries": "^1.1.6", - "object.fromentries": "^2.0.6", - "semver": "^6.3.0" + "object.entries": "^1.1.7", + "object.fromentries": "^2.0.7" }, "engines": { "node": ">=4.0" @@ -10801,14 +9378,6 @@ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" } }, - "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": { - "version": "6.3.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/eslint-plugin-mocha": { "version": "9.0.0", "dev": true, @@ -10882,11 +9451,7 @@ } }, "node_modules/eslint-plugin-prettier": { -<<<<<<< HEAD - "version": "5.0.0", -======= "version": "5.0.1", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -11089,11 +9654,7 @@ } }, "node_modules/eslint/node_modules/globals": { -<<<<<<< HEAD - "version": "13.21.0", -======= "version": "13.23.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -11245,8 +9806,6 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, -<<<<<<< HEAD -======= "node_modules/execa/node_modules/get-stream": { "version": "6.0.1", "license": "MIT", @@ -11257,7 +9816,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, ->>>>>>> master "node_modules/expand-range": { "version": "1.8.2", "dev": true, @@ -11334,11 +9892,7 @@ "license": "MIT" }, "node_modules/fancy-test": { -<<<<<<< HEAD - "version": "2.0.35", -======= "version": "2.0.42", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { @@ -11525,28 +10079,6 @@ "url": "https://github.com/avajs/find-cache-dir?sponsor=1" } }, - "node_modules/find-cache-dir/node_modules/make-dir": { - "version": "3.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/find-cache-dir/node_modules/semver": { - "version": "6.3.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/find-up": { "version": "5.0.0", "license": "MIT", @@ -11595,15 +10127,12 @@ } }, "node_modules/flat-cache": { -<<<<<<< HEAD - "version": "3.0.4", -======= "version": "3.2.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.9", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { @@ -11611,11 +10140,7 @@ } }, "node_modules/flatted": { -<<<<<<< HEAD - "version": "3.2.7", -======= "version": "3.2.9", ->>>>>>> master "dev": true, "license": "ISC" }, @@ -11652,32 +10177,15 @@ "license": "Apache2" }, "node_modules/foreground-child": { -<<<<<<< HEAD - "version": "3.1.1", -======= "version": "2.0.0", "dev": true, ->>>>>>> master "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" + "signal-exit": "^3.0.2" }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/foreground-child/node_modules/signal-exit": { - "version": "4.1.0", - "license": "ISC", "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=8.0.0" } }, "node_modules/forever-agent": { @@ -11688,12 +10196,8 @@ } }, "node_modules/form-data": { -<<<<<<< HEAD - "version": "3.0.1", -======= "version": "4.0.0", "dev": true, ->>>>>>> master "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -11828,13 +10332,6 @@ } }, "node_modules/function-bind": { -<<<<<<< HEAD - "version": "1.1.1", - "license": "MIT" - }, - "node_modules/function.prototype.name": { - "version": "1.1.5", -======= "version": "1.1.2", "license": "MIT", "funding": { @@ -11843,13 +10340,12 @@ }, "node_modules/function.prototype.name": { "version": "1.1.6", ->>>>>>> master "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -11948,11 +10444,7 @@ } }, "node_modules/get-func-name": { -<<<<<<< HEAD - "version": "2.0.0", -======= "version": "2.0.2", ->>>>>>> master "dev": true, "license": "MIT", "engines": { @@ -11960,17 +10452,13 @@ } }, "node_modules/get-intrinsic": { -<<<<<<< HEAD - "version": "1.2.1", -======= "version": "1.2.2", ->>>>>>> master "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -11991,23 +10479,14 @@ "source-map": "^0.6.1" } }, - "node_modules/get-source/node_modules/data-uri-to-buffer": { - "version": "2.0.2", - "license": "MIT" - }, "node_modules/get-stream": { -<<<<<<< HEAD - "version": "6.0.1", - "license": "MIT", -======= "version": "5.2.0", "license": "MIT", "dependencies": { "pump": "^3.0.0" }, ->>>>>>> master "engines": { - "node": ">=10" + "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -12240,25 +10719,6 @@ "through2": "^2.0.0" } }, - "node_modules/handlebars": { - "version": "4.7.8", - "license": "MIT", - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.2", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, "node_modules/har-schema": { "version": "2.0.0", "license": "ISC", @@ -12294,19 +10754,6 @@ "node_modules/har-validator/node_modules/json-schema-traverse": { "version": "0.4.1", "license": "MIT" -<<<<<<< HEAD - }, - "node_modules/has": { - "version": "1.0.3", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } -======= ->>>>>>> master }, "node_modules/has-bigints": { "version": "1.0.2", @@ -12323,14 +10770,10 @@ } }, "node_modules/has-property-descriptors": { -<<<<<<< HEAD - "version": "1.0.0", -======= "version": "1.0.1", ->>>>>>> master "license": "MIT", "dependencies": { - "get-intrinsic": "^1.1.1" + "get-intrinsic": "^1.2.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12396,8 +10839,6 @@ "node": ">=8" } }, -<<<<<<< HEAD -======= "node_modules/hasown": { "version": "2.0.0", "license": "MIT", @@ -12408,7 +10849,6 @@ "node": ">= 0.4" } }, ->>>>>>> master "node_modules/he": { "version": "1.2.0", "dev": true, @@ -12497,17 +10937,6 @@ "node": ">=8.0.0" } }, - "node_modules/http-call/node_modules/parse-json": { - "version": "4.0.0", - "license": "MIT", - "dependencies": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/http-proxy-agent": { "version": "4.0.1", "license": "MIT", @@ -12591,11 +11020,7 @@ "license": "BSD-3-Clause" }, "node_modules/ignore": { -<<<<<<< HEAD - "version": "5.2.4", -======= "version": "5.3.0", ->>>>>>> master "license": "MIT", "engines": { "node": ">= 4" @@ -12717,15 +11142,11 @@ } }, "node_modules/internal-slot": { -<<<<<<< HEAD - "version": "1.0.5", -======= "version": "1.0.6", ->>>>>>> master "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", "side-channel": "^1.0.4" }, "engines": { @@ -12739,13 +11160,10 @@ "node": ">= 0.10" } }, -<<<<<<< HEAD -======= "node_modules/ip": { "version": "2.0.0", "license": "MIT" }, ->>>>>>> master "node_modules/is-arguments": { "version": "1.1.1", "license": "MIT", @@ -12775,8 +11193,6 @@ "node_modules/is-arrayish": { "version": "0.2.1", "license": "MIT" -<<<<<<< HEAD -======= }, "node_modules/is-async-function": { "version": "2.0.0", @@ -12791,7 +11207,6 @@ "funding": { "url": "https://github.com/sponsors/ljharb" } ->>>>>>> master }, "node_modules/is-bigint": { "version": "1.0.4", @@ -12856,14 +11271,10 @@ } }, "node_modules/is-core-module": { -<<<<<<< HEAD - "version": "2.13.0", -======= "version": "2.13.1", ->>>>>>> master "license": "MIT", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12909,8 +11320,6 @@ "node": ">=0.10.0" } }, -<<<<<<< HEAD -======= "node_modules/is-finalizationregistry": { "version": "1.0.2", "dev": true, @@ -12922,7 +11331,6 @@ "url": "https://github.com/sponsors/ljharb" } }, ->>>>>>> master "node_modules/is-fullwidth-code-point": { "version": "3.0.0", "license": "MIT", @@ -12994,8 +11402,6 @@ "node_modules/is-lambda": { "version": "1.0.1", "license": "MIT" -<<<<<<< HEAD -======= }, "node_modules/is-map": { "version": "2.0.2", @@ -13004,7 +11410,6 @@ "funding": { "url": "https://github.com/sponsors/ljharb" } ->>>>>>> master }, "node_modules/is-negative-zero": { "version": "2.0.2", @@ -13114,8 +11519,6 @@ "node": ">=8" } }, -<<<<<<< HEAD -======= "node_modules/is-set": { "version": "2.0.2", "dev": true, @@ -13124,7 +11527,6 @@ "url": "https://github.com/sponsors/ljharb" } }, ->>>>>>> master "node_modules/is-shared-array-buffer": { "version": "1.0.2", "license": "MIT", @@ -13201,8 +11603,6 @@ "node_modules/is-utf8": { "version": "0.2.1", "license": "MIT" -<<<<<<< HEAD -======= }, "node_modules/is-weakmap": { "version": "2.0.1", @@ -13211,7 +11611,6 @@ "funding": { "url": "https://github.com/sponsors/ljharb" } ->>>>>>> master }, "node_modules/is-weakref": { "version": "1.0.2", @@ -13223,8 +11622,6 @@ "url": "https://github.com/sponsors/ljharb" } }, -<<<<<<< HEAD -======= "node_modules/is-weakset": { "version": "2.0.2", "dev": true, @@ -13237,7 +11634,6 @@ "url": "https://github.com/sponsors/ljharb" } }, ->>>>>>> master "node_modules/is-windows": { "version": "1.0.2", "dev": true, @@ -13295,11 +11691,7 @@ "license": "MIT" }, "node_modules/istanbul-lib-coverage": { -<<<<<<< HEAD - "version": "3.2.0", -======= "version": "3.2.2", ->>>>>>> master "dev": true, "license": "BSD-3-Clause", "engines": { @@ -13317,8 +11709,6 @@ "node": ">=8" } }, -<<<<<<< HEAD -======= "node_modules/istanbul-lib-instrument": { "version": "4.0.3", "dev": true, @@ -13341,7 +11731,6 @@ "semver": "bin/semver.js" } }, ->>>>>>> master "node_modules/istanbul-lib-processinfo": { "version": "2.0.3", "dev": true, @@ -13369,14 +11758,6 @@ "node": ">=8" } }, - "node_modules/istanbul-lib-processinfo/node_modules/uuid": { - "version": "8.3.2", - "dev": true, - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/istanbul-lib-report": { "version": "3.0.1", "dev": true, @@ -13390,8 +11771,6 @@ "node": ">=10" } }, -<<<<<<< HEAD -======= "node_modules/istanbul-lib-report/node_modules/make-dir": { "version": "4.0.0", "dev": true, @@ -13406,7 +11785,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, ->>>>>>> master "node_modules/istanbul-lib-report/node_modules/supports-color": { "version": "7.2.0", "dev": true, @@ -13443,10 +11821,6 @@ "node": ">=8" } }, -<<<<<<< HEAD - "node_modules/jackspeak": { - "version": "2.3.0", -======= "node_modules/iterator.prototype": { "version": "1.1.2", "dev": true, @@ -13461,7 +11835,6 @@ }, "node_modules/jackspeak": { "version": "2.3.6", ->>>>>>> master "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -13568,8 +11941,6 @@ } } }, -<<<<<<< HEAD -======= "node_modules/jsdom/node_modules/form-data": { "version": "3.0.1", "license": "MIT", @@ -13582,7 +11953,6 @@ "node": ">= 6" } }, ->>>>>>> master "node_modules/jsdom/node_modules/ws": { "version": "7.5.9", "license": "MIT", @@ -13624,11 +11994,7 @@ "license": "MIT" }, "node_modules/json-e": { -<<<<<<< HEAD - "version": "4.5.3", -======= "version": "4.6.0", ->>>>>>> master "license": "MPL-2.0", "dependencies": { "json-stable-stringify-without-jsonify": "^1.0.1" @@ -13792,11 +12158,7 @@ "license": "MIT" }, "node_modules/keyv": { -<<<<<<< HEAD - "version": "4.5.3", -======= "version": "4.5.4", ->>>>>>> master "license": "MIT", "dependencies": { "json-buffer": "3.0.1" @@ -13818,15 +12180,14 @@ "license": "CC0-1.0" }, "node_modules/language-tags": { -<<<<<<< HEAD - "version": "1.0.5", -======= "version": "1.0.9", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "language-subtag-registry": "~0.3.2" + "language-subtag-registry": "^0.3.20" + }, + "engines": { + "node": ">=0.10" } }, "node_modules/lazy-cache": { @@ -14053,15 +12414,11 @@ } }, "node_modules/loupe": { -<<<<<<< HEAD - "version": "2.3.6", -======= "version": "2.3.7", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "get-func-name": "^2.0.0" + "get-func-name": "^2.0.1" } }, "node_modules/lower-case": { @@ -14093,25 +12450,19 @@ } }, "node_modules/make-dir": { -<<<<<<< HEAD - "version": "4.0.0", -======= "version": "3.1.0", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { - "semver": "^7.5.3" + "semver": "^6.0.0" }, "engines": { - "node": ">=10" + "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD -======= "node_modules/make-dir/node_modules/semver": { "version": "6.3.1", "dev": true, @@ -14120,7 +12471,6 @@ "semver": "bin/semver.js" } }, ->>>>>>> master "node_modules/make-error": { "version": "1.3.6", "license": "ISC" @@ -14251,26 +12601,12 @@ "optional": true } } - }, - "node_modules/mem-fs-editor/node_modules/brace-expansion": { - "version": "2.0.1", - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/mem-fs-editor/node_modules/fast-glob": { - "version": "3.3.1", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" + }, + "node_modules/mem-fs-editor/node_modules/brace-expansion": { + "version": "2.0.1", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" } }, "node_modules/mem-fs-editor/node_modules/globby": { @@ -14594,22 +12930,6 @@ "url": "https://opencollective.com/mochajs" } }, - "node_modules/mocha/node_modules/ansi-colors": { - "version": "4.1.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/mocha/node_modules/diff": { - "version": "5.0.0", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/mocha/node_modules/glob": { "version": "7.2.0", "dev": true, @@ -14681,14 +13001,6 @@ "node": ">=10" } }, - "node_modules/mocha/node_modules/yargs-parser": { - "version": "20.2.4", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/mock-stdin": { "version": "1.0.0", "dev": true, @@ -14837,10 +13149,6 @@ "node": ">= 0.6" } }, - "node_modules/neo-async": { - "version": "2.6.2", - "license": "MIT" - }, "node_modules/nimma": { "version": "0.2.2", "license": "Apache-2.0", @@ -14867,17 +13175,12 @@ } }, "node_modules/nock": { -<<<<<<< HEAD - "version": "13.3.3", -======= "version": "13.3.8", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "debug": "^4.1.0", "json-stringify-safe": "^5.0.1", - "lodash": "^4.17.21", "propagate": "^2.0.0" }, "engines": { @@ -14885,11 +13188,7 @@ } }, "node_modules/node-fetch": { -<<<<<<< HEAD - "version": "2.6.13", -======= "version": "2.7.0", ->>>>>>> master "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" @@ -14944,17 +13243,6 @@ "node": ">= 10.12.0" } }, - "node_modules/node-gyp-build": { - "version": "4.7.1", - "license": "MIT", - "optional": true, - "peer": true, - "bin": { - "node-gyp-build": "bin.js", - "node-gyp-build-optional": "optional.js", - "node-gyp-build-test": "build-test.js" - } - }, "node_modules/node-preload": { "version": "0.2.1", "dev": true, @@ -14967,10 +13255,6 @@ } }, "node_modules/node-releases": { -<<<<<<< HEAD - "version": "2.0.13", - "license": "MIT" -======= "version": "2.0.14", "license": "MIT" }, @@ -14996,7 +13280,6 @@ "engines": { "node": ">=12" } ->>>>>>> master }, "node_modules/nopt": { "version": "5.0.0", @@ -15226,14 +13509,11 @@ "wrap-ansi": "^6.2.0" } }, -<<<<<<< HEAD -======= "node_modules/nyc/node_modules/convert-source-map": { "version": "1.9.0", "dev": true, "license": "MIT" }, ->>>>>>> master "node_modules/nyc/node_modules/find-up": { "version": "4.1.0", "dev": true, @@ -15246,32 +13526,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/foreground-child": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/nyc/node_modules/istanbul-lib-instrument": { - "version": "4.0.3", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/nyc/node_modules/locate-path": { "version": "5.0.0", "dev": true, @@ -15283,20 +13537,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/make-dir": { - "version": "3.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^6.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/nyc/node_modules/p-limit": { "version": "2.3.0", "dev": true, @@ -15333,14 +13573,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/semver": { - "version": "6.3.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/nyc/node_modules/wrap-ansi": { "version": "6.2.0", "dev": true, @@ -15414,11 +13646,7 @@ } }, "node_modules/object-inspect": { -<<<<<<< HEAD - "version": "1.12.3", -======= "version": "1.13.1", ->>>>>>> master "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -15455,34 +13683,26 @@ } }, "node_modules/object.entries": { -<<<<<<< HEAD - "version": "1.1.6", -======= "version": "1.1.7", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { -<<<<<<< HEAD - "version": "2.0.6", -======= "version": "2.0.7", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -15492,17 +13712,13 @@ } }, "node_modules/object.groupby": { -<<<<<<< HEAD - "version": "1.0.0", -======= "version": "1.0.1", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", + "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1" } }, @@ -15518,17 +13734,13 @@ } }, "node_modules/object.values": { -<<<<<<< HEAD - "version": "1.1.6", -======= "version": "1.1.7", ->>>>>>> master "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -15538,17 +13750,14 @@ } }, "node_modules/oclif": { -<<<<<<< HEAD - "version": "3.11.3", -======= "version": "3.17.2", ->>>>>>> master "license": "MIT", "dependencies": { "@oclif/core": "^2.11.4", "@oclif/plugin-help": "^5.2.14", "@oclif/plugin-not-found": "^2.3.32", "@oclif/plugin-warn-if-update-available": "^2.0.44", + "async-retry": "^1.3.3", "aws-sdk": "^2.1231.0", "concurrently": "^7.6.0", "debug": "^4.3.3", @@ -15572,11 +13781,7 @@ } }, "node_modules/oclif/node_modules/@oclif/core": { -<<<<<<< HEAD - "version": "2.11.8", -======= "version": "2.15.0", ->>>>>>> master "license": "MIT", "dependencies": { "@types/cli-progress": "^3.11.0", @@ -15588,7 +13793,6 @@ "cli-progress": "^3.12.0", "debug": "^4.3.4", "ejs": "^3.1.8", - "fs-extra": "^9.1.0", "get-package-type": "^0.1.0", "globby": "^11.1.0", "hyperlinker": "^1.0.0", @@ -15598,7 +13802,6 @@ "natural-orderby": "^2.0.3", "object-treeify": "^1.1.33", "password-prompt": "^1.1.2", - "semver": "^7.5.3", "slice-ansi": "^4.0.0", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", @@ -15614,19 +13817,6 @@ "node": ">=14.0.0" } }, - "node_modules/oclif/node_modules/@oclif/core/node_modules/fs-extra": { - "version": "9.1.0", - "license": "MIT", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/oclif/node_modules/argparse": { "version": "1.0.10", "license": "MIT", @@ -15634,20 +13824,6 @@ "sprintf-js": "~1.0.2" } }, - "node_modules/oclif/node_modules/fast-glob": { - "version": "3.3.1", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/oclif/node_modules/fs-extra": { "version": "8.1.0", "license": "MIT", @@ -15660,20 +13836,6 @@ "node": ">=6 <7 || >=8" } }, - "node_modules/oclif/node_modules/fs-extra/node_modules/jsonfile": { - "version": "4.0.0", - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/oclif/node_modules/fs-extra/node_modules/universalify": { - "version": "0.1.2", - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/oclif/node_modules/globby": { "version": "11.1.0", "license": "MIT", @@ -15703,8 +13865,6 @@ "js-yaml": "bin/js-yaml.js" } }, -<<<<<<< HEAD -======= "node_modules/oclif/node_modules/jsonfile": { "version": "4.0.0", "license": "MIT", @@ -15719,7 +13879,6 @@ "node": ">= 4.0.0" } }, ->>>>>>> master "node_modules/oclif/node_modules/wrap-ansi": { "version": "7.0.0", "license": "MIT", @@ -16000,23 +14159,14 @@ } }, "node_modules/parse-json": { -<<<<<<< HEAD - "version": "5.2.0", -======= "version": "4.0.0", ->>>>>>> master "license": "MIT", "dependencies": { - "@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" + "json-parse-better-errors": "^1.0.1" }, "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" } }, "node_modules/parse5": { @@ -16164,12 +14314,6 @@ }, "node_modules/parserapiv3": { "name": "@asyncapi/parser", -<<<<<<< HEAD - "version": "3.0.0", - "license": "Apache-2.0", - "dependencies": { - "@asyncapi/specs": "^6.0.0", -======= "version": "3.0.0-next-major-spec.12", "license": "Apache-2.0", "dependencies": { @@ -16239,7 +14383,6 @@ "license": "Apache-2.0", "dependencies": { "@asyncapi/specs": "^5.1.0", ->>>>>>> master "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", "@stoplight/json": "^3.20.2", "@stoplight/json-ref-readers": "^1.2.2", @@ -16260,71 +14403,6 @@ "node-fetch": "2.6.7" } }, - "node_modules/parserapiv3/node_modules/jsonpath-plus": { - "version": "7.2.0", - "license": "MIT", - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/parserapiv3/node_modules/node-fetch": { - "version": "2.6.7", - "license": "MIT", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, - "node_modules/parserapiv3/node_modules/tr46": { - "version": "0.0.3", - "license": "MIT" - }, - "node_modules/parserapiv3/node_modules/webidl-conversions": { - "version": "3.0.1", - "license": "BSD-2-Clause" - }, - "node_modules/parserapiv3/node_modules/whatwg-url": { - "version": "5.0.0", - "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/parserv2": { - "name": "@asyncapi/parser", - "version": "2.1.0", - "license": "Apache-2.0", - "dependencies": { - "@asyncapi/specs": "^5.1.0", - "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", - "@stoplight/json-ref-resolver": "^3.1.5", - "@stoplight/spectral-core": "^1.16.1", - "@stoplight/spectral-functions": "^1.7.2", - "@stoplight/spectral-parsers": "^1.0.2", - "@types/json-schema": "^7.0.11", - "@types/urijs": "^1.19.19", - "ajv": "^8.11.0", - "ajv-errors": "^3.0.0", - "ajv-formats": "^2.1.1", - "avsc": "^5.7.5", - "js-yaml": "^4.1.0", - "jsonpath-plus": "^7.2.0", - "node-fetch": "2.6.7", - "ramldt2jsonschema": "^1.2.3", - "webapi-parser": "^0.5.0" - } - }, "node_modules/parserv2/node_modules/@asyncapi/specs": { "version": "5.1.0", "license": "Apache-2.0", @@ -16375,14 +14453,10 @@ }, "node_modules/parserv3": { "name": "@asyncapi/parser", -<<<<<<< HEAD - "version": "3.0.0-next-major-spec.3", -======= "version": "3.0.0-next-major-spec.12", ->>>>>>> master "license": "Apache-2.0", "dependencies": { - "@asyncapi/specs": "^6.0.0-next-major-spec.6", + "@asyncapi/specs": "^6.0.0-next-major-spec.9", "@openapi-contrib/openapi-schema-to-json-schema": "~3.2.0", "@stoplight/json-ref-resolver": "^3.1.5", "@stoplight/spectral-core": "^1.16.1", @@ -16518,22 +14592,14 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { -<<<<<<< HEAD - "version": "10.0.1", -======= "version": "10.1.0", ->>>>>>> master "license": "ISC", "engines": { "node": "14 || >=16.14" } }, "node_modules/path-scurry/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -16653,11 +14719,7 @@ } }, "node_modules/preferred-pm": { -<<<<<<< HEAD - "version": "3.0.3", -======= "version": "3.1.2", ->>>>>>> master "license": "MIT", "dependencies": { "find-up": "^5.0.0", @@ -16678,11 +14740,7 @@ } }, "node_modules/prettier": { -<<<<<<< HEAD - "version": "3.0.2", -======= "version": "3.1.0", ->>>>>>> master "dev": true, "license": "MIT", "bin": { @@ -16784,8 +14842,6 @@ "node": ">=10" } }, -<<<<<<< HEAD -======= "node_modules/promise-retry/node_modules/retry": { "version": "0.12.0", "license": "MIT", @@ -16793,7 +14849,6 @@ "node": ">= 4" } }, ->>>>>>> master "node_modules/prop-types": { "version": "15.8.1", "license": "MIT", @@ -16803,10 +14858,6 @@ "react-is": "^16.13.1" } }, - "node_modules/prop-types/node_modules/react-is": { - "version": "16.13.1", - "license": "MIT" - }, "node_modules/propagate": { "version": "2.0.1", "dev": true, @@ -17020,23 +15071,16 @@ } }, "node_modules/react-icons": { -<<<<<<< HEAD - "version": "4.10.1", -======= "version": "4.12.0", ->>>>>>> master "license": "MIT", "peerDependencies": { "react": "*" } }, -<<<<<<< HEAD -======= "node_modules/react-is": { "version": "16.13.1", "license": "MIT" }, ->>>>>>> master "node_modules/read-cmd-shim": { "version": "2.0.0", "license": "ISC" @@ -17072,10 +15116,6 @@ "balanced-match": "^1.0.0" } }, -<<<<<<< HEAD - "node_modules/read-package-json/node_modules/glob": { - "version": "10.3.3", -======= "node_modules/read-package-json/node_modules/foreground-child": { "version": "3.1.1", "license": "ISC", @@ -17092,17 +15132,16 @@ }, "node_modules/read-package-json/node_modules/glob": { "version": "10.3.10", ->>>>>>> master "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -17149,11 +15188,7 @@ } }, "node_modules/read-package-json/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -17179,8 +15214,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, -<<<<<<< HEAD -======= "node_modules/read-package-json/node_modules/signal-exit": { "version": "4.1.0", "license": "ISC", @@ -17191,7 +15224,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/read-pkg": { "version": "5.2.0", "license": "MIT", @@ -17285,8 +15317,6 @@ "validate-npm-package-license": "^3.0.1" } }, -<<<<<<< HEAD -======= "node_modules/read-pkg/node_modules/parse-json": { "version": "5.2.0", "license": "MIT", @@ -17303,7 +15333,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, ->>>>>>> master "node_modules/read-pkg/node_modules/semver": { "version": "5.7.2", "license": "ISC", @@ -17370,8 +15399,6 @@ "node_modules/reflect-metadata": { "version": "0.1.13", "license": "Apache-2.0" -<<<<<<< HEAD -======= }, "node_modules/reflect.getprototypeof": { "version": "1.0.4", @@ -17391,18 +15418,13 @@ "funding": { "url": "https://github.com/sponsors/ljharb" } ->>>>>>> master }, "node_modules/regenerate": { "version": "1.4.2", "license": "MIT" }, "node_modules/regenerate-unicode-properties": { -<<<<<<< HEAD - "version": "10.1.0", -======= "version": "10.1.1", ->>>>>>> master "license": "MIT", "dependencies": { "regenerate": "^1.4.2" @@ -17431,16 +15453,12 @@ } }, "node_modules/regexp.prototype.flags": { -<<<<<<< HEAD - "version": "1.5.0", -======= "version": "1.5.1", ->>>>>>> master "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -17594,11 +15612,7 @@ } }, "node_modules/request/node_modules/punycode": { -<<<<<<< HEAD - "version": "2.3.0", -======= "version": "2.3.1", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6" @@ -17652,11 +15666,7 @@ } }, "node_modules/resolve": { -<<<<<<< HEAD - "version": "1.22.4", -======= "version": "1.22.8", ->>>>>>> master "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", @@ -17713,11 +15723,7 @@ } }, "node_modules/retry": { -<<<<<<< HEAD - "version": "0.12.0", -======= "version": "0.13.1", ->>>>>>> master "license": "MIT", "engines": { "node": ">= 4" @@ -17807,15 +15813,11 @@ } }, "node_modules/safe-array-concat": { -<<<<<<< HEAD - "version": "1.0.0", -======= "version": "1.0.1", ->>>>>>> master "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -17949,13 +15951,6 @@ "range-parser": "1.2.0" } }, - "node_modules/serve-handler/node_modules/bytes": { - "version": "3.0.0", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/serve-handler/node_modules/mime-db": { "version": "1.33.0", "license": "MIT", @@ -17976,8 +15971,6 @@ "node_modules/set-blocking": { "version": "2.0.0", "license": "ISC" -<<<<<<< HEAD -======= }, "node_modules/set-function-length": { "version": "1.1.1", @@ -18003,7 +15996,6 @@ "engines": { "node": ">= 0.4" } ->>>>>>> master }, "node_modules/set-getter": { "version": "0.1.1", @@ -18168,18 +16160,12 @@ } }, "node_modules/sigstore/node_modules/cacache/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/sigstore/node_modules/foreground-child": { "version": "3.1.1", "license": "ISC", @@ -18194,7 +16180,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/sigstore/node_modules/fs-minipass": { "version": "3.0.3", "license": "ISC", @@ -18206,32 +16191,24 @@ } }, "node_modules/sigstore/node_modules/fs-minipass/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, "node_modules/sigstore/node_modules/glob": { -<<<<<<< HEAD - "version": "10.3.3", -======= "version": "10.3.10", ->>>>>>> master "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -18319,18 +16296,12 @@ } }, "node_modules/sigstore/node_modules/minipass-fetch/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/sigstore/node_modules/signal-exit": { "version": "4.1.0", "license": "ISC", @@ -18341,7 +16312,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/sigstore/node_modules/socks-proxy-agent": { "version": "7.0.0", "license": "MIT", @@ -18365,11 +16335,7 @@ } }, "node_modules/sigstore/node_modules/ssri/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -18406,11 +16372,7 @@ } }, "node_modules/simple-git": { -<<<<<<< HEAD - "version": "3.19.1", -======= "version": "3.21.0", ->>>>>>> master "license": "MIT", "dependencies": { "@kwsites/file-exists": "^1.1.1", @@ -18484,10 +16446,6 @@ "node": ">= 10" } }, - "node_modules/socks/node_modules/ip": { - "version": "2.0.0", - "license": "MIT" - }, "node_modules/sort-keys": { "version": "4.2.0", "license": "MIT", @@ -18524,54 +16482,20 @@ "version": "0.0.2-1", "license": "MIT" }, - "node_modules/spawn-wrap": { - "version": "2.0.0", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^2.0.0", - "is-windows": "^1.0.2", - "make-dir": "^3.0.0", - "rimraf": "^3.0.0", - "signal-exit": "^3.0.2", - "which": "^2.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/spawn-wrap/node_modules/foreground-child": { + "node_modules/spawn-wrap": { "version": "2.0.0", "dev": true, "license": "ISC", "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/spawn-wrap/node_modules/make-dir": { - "version": "3.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "semver": "^6.0.0" + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/spawn-wrap/node_modules/semver": { - "version": "6.3.1", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" } }, "node_modules/spdx-correct": { @@ -18595,11 +16519,7 @@ } }, "node_modules/spdx-license-ids": { -<<<<<<< HEAD - "version": "3.0.13", -======= "version": "3.0.16", ->>>>>>> master "license": "CC0-1.0" }, "node_modules/sprintf-js": { @@ -18607,11 +16527,7 @@ "license": "BSD-3-Clause" }, "node_modules/sshpk": { -<<<<<<< HEAD - "version": "1.17.0", -======= "version": "1.18.0", ->>>>>>> master "license": "MIT", "dependencies": { "asn1": "~0.2.3", @@ -18708,16 +16624,12 @@ "license": "MIT" }, "node_modules/string.prototype.trim": { -<<<<<<< HEAD - "version": "1.2.7", -======= "version": "1.2.8", ->>>>>>> master "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -18727,32 +16639,24 @@ } }, "node_modules/string.prototype.trimend": { -<<<<<<< HEAD - "version": "1.0.6", -======= "version": "1.0.7", ->>>>>>> master "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { -<<<<<<< HEAD - "version": "1.0.6", -======= "version": "1.0.7", ->>>>>>> master "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -18950,11 +16854,7 @@ } }, "node_modules/tar": { -<<<<<<< HEAD - "version": "6.1.15", -======= "version": "6.2.0", ->>>>>>> master "license": "ISC", "dependencies": { "chownr": "^2.0.0", @@ -19101,11 +17001,7 @@ } }, "node_modules/tough-cookie/node_modules/punycode": { -<<<<<<< HEAD - "version": "2.3.0", -======= "version": "2.3.1", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6" @@ -19129,11 +17025,7 @@ } }, "node_modules/tr46/node_modules/punycode": { -<<<<<<< HEAD - "version": "2.3.0", -======= "version": "2.3.1", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6" @@ -19172,11 +17064,7 @@ } }, "node_modules/ts-api-utils": { -<<<<<<< HEAD - "version": "1.0.2", -======= "version": "1.0.3", ->>>>>>> master "dev": true, "license": "MIT", "engines": { @@ -19228,18 +17116,12 @@ } }, "node_modules/ts-node/node_modules/acorn-walk": { -<<<<<<< HEAD - "version": "8.2.0", -======= "version": "8.3.0", ->>>>>>> master "license": "MIT", "engines": { "node": ">=0.4.0" } }, -<<<<<<< HEAD -======= "node_modules/ts-node/node_modules/diff": { "version": "4.0.2", "license": "BSD-3-Clause", @@ -19247,7 +17129,6 @@ "node": ">=0.3.1" } }, ->>>>>>> master "node_modules/tsconfig-paths": { "version": "3.14.2", "dev": true, @@ -19359,18 +17240,12 @@ } }, "node_modules/tuf-js/node_modules/cacache/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/tuf-js/node_modules/foreground-child": { "version": "3.1.1", "license": "ISC", @@ -19385,7 +17260,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/tuf-js/node_modules/fs-minipass": { "version": "3.0.3", "license": "ISC", @@ -19397,32 +17271,24 @@ } }, "node_modules/tuf-js/node_modules/fs-minipass/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, "node_modules/tuf-js/node_modules/glob": { -<<<<<<< HEAD - "version": "10.3.3", -======= "version": "10.3.10", ->>>>>>> master "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -19510,18 +17376,12 @@ } }, "node_modules/tuf-js/node_modules/minipass-fetch/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/tuf-js/node_modules/signal-exit": { "version": "4.1.0", "license": "ISC", @@ -19532,7 +17392,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/tuf-js/node_modules/socks-proxy-agent": { "version": "7.0.0", "license": "MIT", @@ -19556,11 +17415,7 @@ } }, "node_modules/tuf-js/node_modules/ssri/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -19727,14 +17582,8 @@ } }, "node_modules/typescript-json-schema/node_modules/@types/node": { -<<<<<<< HEAD - "version": "16.18.68", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.68.tgz", - "integrity": "sha512-sG3hPIQwJLoewrN7cr0dwEy+yF5nD4D/4FxtQpFciRD/xwUzgD+G05uxZHv5mhfXo4F9Jkp13jjn0CC2q325sg==" -======= "version": "16.18.65", "license": "MIT" ->>>>>>> master }, "node_modules/typescript-json-schema/node_modules/safe-stable-stringify": { "version": "2.4.3", @@ -19754,17 +17603,6 @@ "node": ">=4.2.0" } }, - "node_modules/uglify-js": { - "version": "3.17.4", - "license": "BSD-2-Clause", - "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/unbox-primitive": { "version": "1.0.2", "license": "MIT", @@ -19829,19 +17667,11 @@ } }, "node_modules/universal-user-agent": { -<<<<<<< HEAD - "version": "6.0.0", - "license": "ISC" - }, - "node_modules/universalify": { - "version": "2.0.0", -======= "version": "6.0.1", "license": "ISC" }, "node_modules/universalify": { "version": "2.0.1", ->>>>>>> master "license": "MIT", "engines": { "node": ">= 10.0.0" @@ -19871,11 +17701,7 @@ } }, "node_modules/update-browserslist-db": { -<<<<<<< HEAD - "version": "1.0.11", -======= "version": "1.0.13", ->>>>>>> master "funding": [ { "type": "opencollective", @@ -19924,11 +17750,7 @@ } }, "node_modules/uri-js/node_modules/punycode": { -<<<<<<< HEAD - "version": "2.3.0", -======= "version": "2.3.1", ->>>>>>> master "license": "MIT", "engines": { "node": ">=6" @@ -19976,19 +17798,6 @@ "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, - "node_modules/utf-8-validate": { - "version": "5.0.10", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "peer": true, - "dependencies": { - "node-gyp-build": "^4.3.0" - }, - "engines": { - "node": ">=6.14.2" - } - }, "node_modules/util": { "version": "0.12.5", "license": "MIT", @@ -20012,12 +17821,8 @@ } }, "node_modules/uuid": { -<<<<<<< HEAD - "version": "8.0.0", -======= "version": "8.3.2", "dev": true, ->>>>>>> master "license": "MIT", "bin": { "uuid": "dist/bin/uuid" @@ -20101,17 +17906,6 @@ } }, "node_modules/vscode-languageserver-textdocument": { -<<<<<<< HEAD - "version": "1.0.8", - "license": "MIT" - }, - "node_modules/vscode-languageserver-types": { - "version": "3.17.3", - "license": "MIT" - }, - "node_modules/vscode-uri": { - "version": "3.0.7", -======= "version": "1.0.11", "license": "MIT" }, @@ -20121,7 +17915,6 @@ }, "node_modules/vscode-uri": { "version": "3.0.8", ->>>>>>> master "license": "MIT" }, "node_modules/w3c-hr-time": { @@ -20241,8 +18034,6 @@ "url": "https://github.com/sponsors/ljharb" } }, -<<<<<<< HEAD -======= "node_modules/which-builtin-type": { "version": "1.1.3", "dev": true, @@ -20287,7 +18078,6 @@ "url": "https://github.com/sponsors/ljharb" } }, ->>>>>>> master "node_modules/which-module": { "version": "2.0.1", "dev": true, @@ -20305,15 +18095,11 @@ } }, "node_modules/which-typed-array": { -<<<<<<< HEAD - "version": "1.1.11", -======= "version": "1.1.13", ->>>>>>> master "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" @@ -20449,11 +18235,7 @@ } }, "node_modules/ws": { -<<<<<<< HEAD - "version": "8.13.0", -======= "version": "8.14.2", ->>>>>>> master "license": "MIT", "engines": { "node": ">=10.0.0" @@ -20517,11 +18299,7 @@ "license": "ISC" }, "node_modules/yaml": { -<<<<<<< HEAD - "version": "2.3.1", -======= "version": "2.3.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">= 14" @@ -20544,15 +18322,11 @@ } }, "node_modules/yargs-parser": { -<<<<<<< HEAD - "version": "21.1.1", -======= "version": "20.2.4", "dev": true, ->>>>>>> master "license": "ISC", "engines": { - "node": ">=12" + "node": ">=10" } }, "node_modules/yargs-unparser": { @@ -20591,8 +18365,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, -<<<<<<< HEAD -======= "node_modules/yargs/node_modules/yargs-parser": { "version": "21.1.1", "license": "ISC", @@ -20600,7 +18372,6 @@ "node": ">=12" } }, ->>>>>>> master "node_modules/yeoman-environment": { "version": "3.19.3", "license": "BSD-2-Clause", @@ -20842,13 +18613,6 @@ "node": ">= 10" } }, - "node_modules/yeoman-environment/node_modules/diff": { - "version": "5.1.0", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/yeoman-environment/node_modules/events": { "version": "3.3.0", "license": "MIT", @@ -20856,20 +18620,6 @@ "node": ">=0.8.x" } }, - "node_modules/yeoman-environment/node_modules/fast-glob": { - "version": "3.3.1", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/yeoman-environment/node_modules/gauge": { "version": "3.0.2", "license": "ISC", @@ -21372,11 +19122,7 @@ } }, "node_modules/yeoman-generator": { -<<<<<<< HEAD - "version": "5.9.0", -======= "version": "5.10.0", ->>>>>>> master "license": "BSD-2-Clause", "dependencies": { "chalk": "^4.1.0", @@ -21395,6 +19141,9 @@ "sort-keys": "^4.2.0", "text-table": "^0.2.0" }, + "acceptDependencies": { + "yeoman-environment": "^4.0.0" + }, "engines": { "node": ">=12.10.0" }, @@ -21448,8 +19197,6 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, -<<<<<<< HEAD -======= "node_modules/yeoman-generator/node_modules/@npmcli/move-file": { "version": "2.0.1", "license": "MIT", @@ -21461,7 +19208,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, ->>>>>>> master "node_modules/yeoman-generator/node_modules/@npmcli/node-gyp": { "version": "3.0.0", "license": "ISC", @@ -21547,21 +19293,17 @@ } }, "node_modules/yeoman-generator/node_modules/cacache/node_modules/glob": { -<<<<<<< HEAD - "version": "10.3.3", -======= "version": "10.3.10", ->>>>>>> master "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -21571,18 +19313,12 @@ } }, "node_modules/yeoman-generator/node_modules/cacache/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, -<<<<<<< HEAD -======= "node_modules/yeoman-generator/node_modules/foreground-child": { "version": "3.1.1", "license": "ISC", @@ -21607,7 +19343,6 @@ "url": "https://github.com/sponsors/isaacs" } }, ->>>>>>> master "node_modules/yeoman-generator/node_modules/fs-minipass": { "version": "3.0.3", "license": "ISC", @@ -21619,11 +19354,7 @@ } }, "node_modules/yeoman-generator/node_modules/fs-minipass/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -21693,8 +19424,6 @@ } }, "node_modules/yeoman-generator/node_modules/make-fetch-happen": { -<<<<<<< HEAD -======= "version": "10.2.1", "license": "ISC", "dependencies": { @@ -22008,7 +19737,6 @@ } }, "node_modules/yeoman-generator/node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { ->>>>>>> master "version": "11.1.1", "license": "ISC", "dependencies": { @@ -22032,27 +19760,7 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, - "node_modules/yeoman-generator/node_modules/minimatch": { - "version": "9.0.3", - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/yeoman-generator/node_modules/minipass": { - "version": "5.0.0", - "license": "ISC", - "engines": { - "node": ">=8" - } - }, - "node_modules/yeoman-generator/node_modules/minipass-fetch": { + "node_modules/yeoman-generator/node_modules/npm-registry-fetch/node_modules/minipass-fetch": { "version": "3.0.4", "license": "MIT", "dependencies": { @@ -22067,146 +19775,13 @@ "encoding": "^0.1.13" } }, -<<<<<<< HEAD - "node_modules/yeoman-generator/node_modules/minipass-fetch/node_modules/minipass": { - "version": "7.0.3", -======= "node_modules/yeoman-generator/node_modules/npm-registry-fetch/node_modules/minipass-fetch/node_modules/minipass": { "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, - "node_modules/yeoman-generator/node_modules/node-gyp": { - "version": "9.4.0", - "license": "MIT", - "dependencies": { - "env-paths": "^2.2.0", - "exponential-backoff": "^3.1.1", - "glob": "^7.1.4", - "graceful-fs": "^4.2.6", - "make-fetch-happen": "^11.0.3", - "nopt": "^6.0.0", - "npmlog": "^6.0.0", - "rimraf": "^3.0.2", - "semver": "^7.3.5", - "tar": "^6.1.2", - "which": "^2.0.2" - }, - "bin": { - "node-gyp": "bin/node-gyp.js" - }, - "engines": { - "node": "^12.13 || ^14.13 || >=16" - } - }, - "node_modules/yeoman-generator/node_modules/node-gyp/node_modules/which": { - "version": "2.0.2", - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/yeoman-generator/node_modules/nopt": { - "version": "6.0.0", - "license": "ISC", - "dependencies": { - "abbrev": "^1.0.0" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" - } - }, - "node_modules/yeoman-generator/node_modules/npm-bundled": { - "version": "3.0.0", - "license": "ISC", - "dependencies": { - "npm-normalize-package-bin": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/yeoman-generator/node_modules/npm-install-checks": { - "version": "6.2.0", - "license": "BSD-2-Clause", - "dependencies": { - "semver": "^7.1.1" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/yeoman-generator/node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/yeoman-generator/node_modules/npm-package-arg": { - "version": "10.1.0", - "license": "ISC", - "dependencies": { - "hosted-git-info": "^6.0.0", - "proc-log": "^3.0.0", - "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/yeoman-generator/node_modules/npm-packlist": { - "version": "7.0.4", - "license": "ISC", - "dependencies": { - "ignore-walk": "^6.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/yeoman-generator/node_modules/npm-pick-manifest": { - "version": "8.0.2", - "license": "ISC", - "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^10.0.0", - "semver": "^7.3.5" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/yeoman-generator/node_modules/npm-registry-fetch": { - "version": "14.0.5", - "license": "ISC", - "dependencies": { - "make-fetch-happen": "^11.0.0", - "minipass": "^5.0.0", - "minipass-fetch": "^3.0.0", - "minipass-json-stream": "^1.0.1", - "minizlib": "^2.1.2", - "npm-package-arg": "^10.0.0", - "proc-log": "^3.0.0" - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, "node_modules/yeoman-generator/node_modules/npmlog": { "version": "6.0.2", "license": "ISC", @@ -22303,11 +19878,7 @@ } }, "node_modules/yeoman-generator/node_modules/ssri/node_modules/minipass": { -<<<<<<< HEAD - "version": "7.0.3", -======= "version": "7.0.4", ->>>>>>> master "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -22356,13 +19927,10 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, -<<<<<<< HEAD -======= "node_modules/yeoman-generator/node_modules/yallist": { "version": "4.0.0", "license": "ISC" }, ->>>>>>> master "node_modules/yn": { "version": "3.1.1", "license": "MIT", @@ -22381,11 +19949,7 @@ } }, "node_modules/zustand": { -<<<<<<< HEAD - "version": "4.4.1", -======= "version": "4.4.6", ->>>>>>> master "license": "MIT", "dependencies": { "use-sync-external-store": "1.2.0"