From 809cae6adc6c1d72ff3bd40e888e2ccadae65a3e Mon Sep 17 00:00:00 2001 From: nivedin Date: Wed, 10 Jul 2024 14:09:16 +0530 Subject: [PATCH 1/6] chore: update package --- CONTRIBUTING.md | 101 ------------------------------------------------ package.json | 12 +++--- 2 files changed, 6 insertions(+), 107 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 970d4228..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,101 +0,0 @@ -# Contributing to this project - -Please take a moment to review this document in order to make the contribution process easy and effective for everyone involved. - -Following these guidelines helps to communicate that you respect the time of the developers managing and developing this open source project. In return, they should reciprocate that respect in addressing your issue or assessing patches and features. - -## Using the issue tracker - -The [issue tracker](/issues) is the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests) and [submitting pull requests](#pull-requests), but please respect the following restrictions: - -- Please **do not** use the issue tracker for personal support requests (use [Stack Overflow](http://stackoverflow.com) or IRC). - -- Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others. - -## Bug reports - -A bug is a _demonstrable problem_ that is caused by the code in the repository. Good bug reports are extremely helpful - thank you! - -Guidelines for bug reports: - -1. **Use the GitHub issue search** — check if the issue has already been reported. - -1. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or development branch in the repository. - -1. **Isolate the problem** — create a [reduced test case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. - -A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report. What is your environment? What steps will reproduce the issue? What browser(s) and OS experience the problem? What would you expect to be the outcome? All these details will help people to fix any potential bugs. - -Example: - -> Short and descriptive example bug report title -> -> A summary of the issue and the browser/OS environment in which it occurs. If suitable, include the steps required to reproduce the bug. -> -> 1. This is the first step -> 1. This is the second step -> 1. Further steps, etc. -> -> `` - a link to the reduced test case -> -> Any other information you want to share that is relevant to the issue being reported. This might include the lines of code that you have identified as causing the bug, and potential solutions (and your opinions on their merits). - -## Feature requests - -Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to _you_ to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible. - -## Pull requests - -Good pull requests (patches, improvements, new features) are a fantastic help. They should remain focused in scope and avoid containing unrelated commits. - -**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code, porting to a different language), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project. - -Please adhere to the coding conventions used throughout a project (indentation, accurate comments, etc.) and any other requirements (such as test coverage). - -Follow this process if you'd like your work considered for inclusion in the project: - -1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, and configure the remotes: - - ```bash - # Clone your fork of the repo into the current directory - git clone https://github.com// - # Navigate to the newly cloned directory - cd - # Assign the original repo to a remote called "upstream" - git remote add upstream https://github.com/Kong/httpsnippet.git - ``` - -1. If you cloned a while ago, get the latest changes from upstream: - - ```bash - git checkout - git pull upstream - ``` - -1. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix: - - ```bash - git checkout -b - ``` - -1. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) or your code is unlikely be merged into the main project. Use Git's [interactive rebase](https://help.github.com/articles/interactive-rebase) feature to tidy up your commits before making them public. - -1. Locally merge (or rebase) the upstream development branch into your topic branch: - - ```bash - git pull [--rebase] upstream - ``` - -1. Push your topic branch up to your fork: - - ```bash - git push origin - ``` - -1. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description. - -**IMPORTANT**: By submitting a patch, you agree to allow the project owner to license your work under the same license as that used by the project. - -## Creating New Conversion Targets - -For a info on creating new conversion targets, please review this [guideline](https://github.com/Kong/httpsnippet/wiki/Creating-Targets) diff --git a/package.json b/package.json index ea245662..e75396e3 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "version": "3.0.4", - "name": "httpsnippet", + "name": "@hoppscotch/httpsnippet", "description": "HTTP Request snippet generator for *most* languages", - "author": "Kong ", - "homepage": "https://github.com/Kong/httpsnippet", + "author": "Hoppscotch Team ", + "homepage": "https://github.com/Hoppscotch/httpsnippet", "license": "MIT", "main": "dist/httpsnippet.js", "types": "dist/httpsnippet.d.ts", @@ -39,11 +39,11 @@ "xmlhttprequest" ], "engines": { - "node": "^14.19.1 || ^16.14.2 || ^18.0.0 || ^20.0.0" + "node": "^14.19.1 || ^16.14.2 || ^18.0.0 " }, - "repository": "Kong/httpsnippet", + "repository": "Hoppscotch/httpsnippet", "bugs": { - "url": "https://github.com/Kong/httpsnippet/issues" + "url": "https://github.com/Hoppscotch/httpsnippet/issues" }, "scripts": { "clean": "tsc --build tsconfig.build.json --clean", From ca2d672d4f4afe6340c0111ae5e57da923cf205c Mon Sep 17 00:00:00 2001 From: nivedin Date: Wed, 10 Jul 2024 14:13:30 +0530 Subject: [PATCH 2/6] chore: update contributing guidelines --- CONTRIBUTING.MD | 101 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 CONTRIBUTING.MD diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD new file mode 100644 index 00000000..970d4228 --- /dev/null +++ b/CONTRIBUTING.MD @@ -0,0 +1,101 @@ +# Contributing to this project + +Please take a moment to review this document in order to make the contribution process easy and effective for everyone involved. + +Following these guidelines helps to communicate that you respect the time of the developers managing and developing this open source project. In return, they should reciprocate that respect in addressing your issue or assessing patches and features. + +## Using the issue tracker + +The [issue tracker](/issues) is the preferred channel for [bug reports](#bug-reports), [features requests](#feature-requests) and [submitting pull requests](#pull-requests), but please respect the following restrictions: + +- Please **do not** use the issue tracker for personal support requests (use [Stack Overflow](http://stackoverflow.com) or IRC). + +- Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others. + +## Bug reports + +A bug is a _demonstrable problem_ that is caused by the code in the repository. Good bug reports are extremely helpful - thank you! + +Guidelines for bug reports: + +1. **Use the GitHub issue search** — check if the issue has already been reported. + +1. **Check if the issue has been fixed** — try to reproduce it using the latest `master` or development branch in the repository. + +1. **Isolate the problem** — create a [reduced test case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. + +A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report. What is your environment? What steps will reproduce the issue? What browser(s) and OS experience the problem? What would you expect to be the outcome? All these details will help people to fix any potential bugs. + +Example: + +> Short and descriptive example bug report title +> +> A summary of the issue and the browser/OS environment in which it occurs. If suitable, include the steps required to reproduce the bug. +> +> 1. This is the first step +> 1. This is the second step +> 1. Further steps, etc. +> +> `` - a link to the reduced test case +> +> Any other information you want to share that is relevant to the issue being reported. This might include the lines of code that you have identified as causing the bug, and potential solutions (and your opinions on their merits). + +## Feature requests + +Feature requests are welcome. But take a moment to find out whether your idea fits with the scope and aims of the project. It's up to _you_ to make a strong case to convince the project's developers of the merits of this feature. Please provide as much detail and context as possible. + +## Pull requests + +Good pull requests (patches, improvements, new features) are a fantastic help. They should remain focused in scope and avoid containing unrelated commits. + +**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code, porting to a different language), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project. + +Please adhere to the coding conventions used throughout a project (indentation, accurate comments, etc.) and any other requirements (such as test coverage). + +Follow this process if you'd like your work considered for inclusion in the project: + +1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, and configure the remotes: + + ```bash + # Clone your fork of the repo into the current directory + git clone https://github.com// + # Navigate to the newly cloned directory + cd + # Assign the original repo to a remote called "upstream" + git remote add upstream https://github.com/Kong/httpsnippet.git + ``` + +1. If you cloned a while ago, get the latest changes from upstream: + + ```bash + git checkout + git pull upstream + ``` + +1. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix: + + ```bash + git checkout -b + ``` + +1. Commit your changes in logical chunks. Please adhere to these [git commit message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) or your code is unlikely be merged into the main project. Use Git's [interactive rebase](https://help.github.com/articles/interactive-rebase) feature to tidy up your commits before making them public. + +1. Locally merge (or rebase) the upstream development branch into your topic branch: + + ```bash + git pull [--rebase] upstream + ``` + +1. Push your topic branch up to your fork: + + ```bash + git push origin + ``` + +1. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) with a clear title and description. + +**IMPORTANT**: By submitting a patch, you agree to allow the project owner to license your work under the same license as that used by the project. + +## Creating New Conversion Targets + +For a info on creating new conversion targets, please review this [guideline](https://github.com/Kong/httpsnippet/wiki/Creating-Targets) From e9d532a17aa553835cd895b23286b74e65387aff Mon Sep 17 00:00:00 2001 From: nivedin Date: Wed, 10 Jul 2024 14:28:52 +0530 Subject: [PATCH 3/6] chore: decode full url --- src/httpsnippet.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/httpsnippet.ts b/src/httpsnippet.ts index 8d315a5c..bac07ba2 100644 --- a/src/httpsnippet.ts +++ b/src/httpsnippet.ts @@ -310,10 +310,12 @@ export class HTTPSnippet { ...uriObj, }); //? + const decodedFullUrl = decodeURIComponent(fullUrl); + return { ...request, allHeaders, - fullUrl, + fullUrl:decodedFullUrl, url, uriObj, }; From d7338a019e61571f72b5caadf7a2a81c5c36469b Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Wed, 10 Jul 2024 14:22:34 +0300 Subject: [PATCH 4/6] feat: add ci pipeline to publish to npm on release --- .github/workflows/hopp-publish.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/hopp-publish.yml diff --git a/.github/workflows/hopp-publish.yml b/.github/workflows/hopp-publish.yml new file mode 100644 index 00000000..87d43b6f --- /dev/null +++ b/.github/workflows/hopp-publish.yml @@ -0,0 +1,26 @@ +name: Publish Package to NPM + +on: + release: + types: [published] + +jobs: + publish: + name: Publish + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: 20 + cache: 'npm' + + - run: npm install + + - name: Publish package + run: npm publish --access public + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_ACCESS_TOKEN }} From 5bc434fd686435a3c824f6fb5494df01a560b3af Mon Sep 17 00:00:00 2001 From: nivedin Date: Wed, 10 Jul 2024 19:13:51 +0530 Subject: [PATCH 5/6] chore: fix test and update editorconfig --- .editorconfig | 4 ++-- package-lock.json | 6 +++--- package.json | 4 +++- src/httpsnippet.ts | 2 +- src/targets/c/libcurl/fixtures/nested.c | 2 +- src/targets/csharp/httpclient/fixtures/nested.cs | 2 +- src/targets/csharp/restsharp/fixtures/nested.cs | 2 +- src/targets/go/native/fixtures/nested.go | 2 +- src/targets/java/asynchttp/fixtures/nested.java | 2 +- src/targets/java/nethttp/fixtures/nested.java | 2 +- src/targets/java/okhttp/fixtures/nested.java | 2 +- src/targets/java/unirest/fixtures/nested.java | 2 +- src/targets/javascript/fetch/fixtures/nested.js | 2 +- src/targets/javascript/jquery/fixtures/nested.js | 2 +- src/targets/javascript/xhr/fixtures/nested.js | 2 +- src/targets/kotlin/okhttp/fixtures/nested.kt | 2 +- src/targets/node/fetch/fixtures/nested.js | 2 +- src/targets/objc/nsurlsession/fixtures/nested.m | 2 +- src/targets/ocaml/cohttp/fixtures/nested.ml | 2 +- src/targets/php/curl/fixtures/nested.php | 2 +- src/targets/php/guzzle/fixtures/nested.php | 2 +- .../powershell/restmethod/fixtures/nested.ps1 | 2 +- .../powershell/webrequest/fixtures/nested.ps1 | 2 +- src/targets/ruby/native/fixtures/nested.rb | 2 +- src/targets/shell/curl/fixtures/dont-deglob.sh | 2 +- src/targets/shell/curl/fixtures/nested.sh | 2 +- src/targets/shell/httpie/fixtures/nested.sh | 2 +- src/targets/shell/wget/fixtures/nested.sh | 2 +- src/targets/swift/nsurlsession/fixtures/nested.swift | 2 +- src/targets/targets.test.ts | 12 +++++++++++- 30 files changed, 45 insertions(+), 33 deletions(-) diff --git a/.editorconfig b/.editorconfig index 366bdb57..c39d438f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,8 +6,8 @@ indent_style = space indent_size = 2 end_of_line = lf charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true +trim_trailing_whitespace = false +insert_final_newline = false [targets/**/fixtures/*] insert_final_newline = false diff --git a/package-lock.json b/package-lock.json index 2dd07b59..e64521e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "httpsnippet", + "name": "@hoppscotch/httpsnippet", "version": "3.0.4", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "httpsnippet", + "name": "@hoppscotch/httpsnippet", "version": "3.0.4", "license": "MIT", "dependencies": { @@ -43,7 +43,7 @@ "typescript": "^4.6.3" }, "engines": { - "node": "^14.19.1 || ^16.14.2 || ^18.0.0" + "node": "^14.19.1 || ^16.14.2 || ^18.0.0 " } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index e75396e3..f983d7af 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,9 @@ "lint:markdown": "markdownlint-cli2 \"**/*.md\" \"#**/node_modules\"", "build": "tsc --build tsconfig.build.json", "build:types": "tsc -d --declarationDir dist/lib --declarationMap --emitDeclarationOnly", - "test": "jest" + "test": "jest", + "dev": "tsc --watch --preserveWatchOutput", + "test:watch": "jest --watch" }, "devDependencies": { "@types/eslint": "^8.4.1", diff --git a/src/httpsnippet.ts b/src/httpsnippet.ts index bac07ba2..2db690b1 100644 --- a/src/httpsnippet.ts +++ b/src/httpsnippet.ts @@ -315,7 +315,7 @@ export class HTTPSnippet { return { ...request, allHeaders, - fullUrl:decodedFullUrl, + fullUrl: decodedFullUrl, url, uriObj, }; diff --git a/src/targets/c/libcurl/fixtures/nested.c b/src/targets/c/libcurl/fixtures/nested.c index 6b7a7e87..e5218376 100644 --- a/src/targets/c/libcurl/fixtures/nested.c +++ b/src/targets/c/libcurl/fixtures/nested.c @@ -1,6 +1,6 @@ CURL *hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_CUSTOMREQUEST, "GET"); -curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value"); +curl_easy_setopt(hnd, CURLOPT_URL, "http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value"); CURLcode ret = curl_easy_perform(hnd); \ No newline at end of file diff --git a/src/targets/csharp/httpclient/fixtures/nested.cs b/src/targets/csharp/httpclient/fixtures/nested.cs index d513d83f..65987ff8 100644 --- a/src/targets/csharp/httpclient/fixtures/nested.cs +++ b/src/targets/csharp/httpclient/fixtures/nested.cs @@ -3,7 +3,7 @@ var request = new HttpRequestMessage { Method = HttpMethod.Get, - RequestUri = new Uri("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value"), + RequestUri = new Uri("http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value"), }; using (var response = await client.SendAsync(request)) { diff --git a/src/targets/csharp/restsharp/fixtures/nested.cs b/src/targets/csharp/restsharp/fixtures/nested.cs index e28bf319..784ee780 100644 --- a/src/targets/csharp/restsharp/fixtures/nested.cs +++ b/src/targets/csharp/restsharp/fixtures/nested.cs @@ -1,3 +1,3 @@ -var client = new RestClient("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value"); +var client = new RestClient("http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value"); var request = new RestRequest(Method.GET); IRestResponse response = client.Execute(request); \ No newline at end of file diff --git a/src/targets/go/native/fixtures/nested.go b/src/targets/go/native/fixtures/nested.go index cd95ccda..7eb40168 100644 --- a/src/targets/go/native/fixtures/nested.go +++ b/src/targets/go/native/fixtures/nested.go @@ -8,7 +8,7 @@ import ( func main() { - url := "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value" + url := "http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value" req, _ := http.NewRequest("GET", url, nil) diff --git a/src/targets/java/asynchttp/fixtures/nested.java b/src/targets/java/asynchttp/fixtures/nested.java index b05658ca..4ee91ad8 100644 --- a/src/targets/java/asynchttp/fixtures/nested.java +++ b/src/targets/java/asynchttp/fixtures/nested.java @@ -1,5 +1,5 @@ AsyncHttpClient client = new DefaultAsyncHttpClient(); -client.prepare("GET", "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value") +client.prepare("GET", "http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value") .execute() .toCompletableFuture() .thenAccept(System.out::println) diff --git a/src/targets/java/nethttp/fixtures/nested.java b/src/targets/java/nethttp/fixtures/nested.java index abe7fce7..14b72938 100644 --- a/src/targets/java/nethttp/fixtures/nested.java +++ b/src/targets/java/nethttp/fixtures/nested.java @@ -1,5 +1,5 @@ HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value")) + .uri(URI.create("http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value")) .method("GET", HttpRequest.BodyPublishers.noBody()) .build(); HttpResponse response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString()); diff --git a/src/targets/java/okhttp/fixtures/nested.java b/src/targets/java/okhttp/fixtures/nested.java index 1debd481..a35a80df 100644 --- a/src/targets/java/okhttp/fixtures/nested.java +++ b/src/targets/java/okhttp/fixtures/nested.java @@ -1,7 +1,7 @@ OkHttpClient client = new OkHttpClient(); Request request = new Request.Builder() - .url("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value") + .url("http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value") .get() .build(); diff --git a/src/targets/java/unirest/fixtures/nested.java b/src/targets/java/unirest/fixtures/nested.java index 95e6476b..2c4b36fe 100644 --- a/src/targets/java/unirest/fixtures/nested.java +++ b/src/targets/java/unirest/fixtures/nested.java @@ -1,2 +1,2 @@ -HttpResponse response = Unirest.get("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value") +HttpResponse response = Unirest.get("http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value") .asString(); \ No newline at end of file diff --git a/src/targets/javascript/fetch/fixtures/nested.js b/src/targets/javascript/fetch/fixtures/nested.js index 4a64cd6c..3da4596c 100644 --- a/src/targets/javascript/fetch/fixtures/nested.js +++ b/src/targets/javascript/fetch/fixtures/nested.js @@ -1,4 +1,4 @@ -const url = 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value'; +const url = 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value'; const options = {method: 'GET'}; try { diff --git a/src/targets/javascript/jquery/fixtures/nested.js b/src/targets/javascript/jquery/fixtures/nested.js index 4a8ead25..af089d88 100644 --- a/src/targets/javascript/jquery/fixtures/nested.js +++ b/src/targets/javascript/jquery/fixtures/nested.js @@ -1,7 +1,7 @@ const settings = { async: true, crossDomain: true, - url: 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value', + url: 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value', method: 'GET', headers: {} }; diff --git a/src/targets/javascript/xhr/fixtures/nested.js b/src/targets/javascript/xhr/fixtures/nested.js index b4170a35..c781da68 100644 --- a/src/targets/javascript/xhr/fixtures/nested.js +++ b/src/targets/javascript/xhr/fixtures/nested.js @@ -9,6 +9,6 @@ xhr.addEventListener('readystatechange', function () { } }); -xhr.open('GET', 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value'); +xhr.open('GET', 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value'); xhr.send(data); \ No newline at end of file diff --git a/src/targets/kotlin/okhttp/fixtures/nested.kt b/src/targets/kotlin/okhttp/fixtures/nested.kt index 5e947bf9..8b6a0db9 100644 --- a/src/targets/kotlin/okhttp/fixtures/nested.kt +++ b/src/targets/kotlin/okhttp/fixtures/nested.kt @@ -1,7 +1,7 @@ val client = OkHttpClient() val request = Request.Builder() - .url("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value") + .url("http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value") .get() .build() diff --git a/src/targets/node/fetch/fixtures/nested.js b/src/targets/node/fetch/fixtures/nested.js index c0dec502..1ceccc7d 100644 --- a/src/targets/node/fetch/fixtures/nested.js +++ b/src/targets/node/fetch/fixtures/nested.js @@ -1,6 +1,6 @@ const fetch = require('node-fetch'); -const url = 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value'; +const url = 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value'; const options = {method: 'GET'}; try { diff --git a/src/targets/objc/nsurlsession/fixtures/nested.m b/src/targets/objc/nsurlsession/fixtures/nested.m index 233d2f04..5df4f95c 100644 --- a/src/targets/objc/nsurlsession/fixtures/nested.m +++ b/src/targets/objc/nsurlsession/fixtures/nested.m @@ -1,6 +1,6 @@ #import -NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value"] +NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value"] cachePolicy:NSURLRequestUseProtocolCachePolicy timeoutInterval:10.0]; [request setHTTPMethod:@"GET"]; diff --git a/src/targets/ocaml/cohttp/fixtures/nested.ml b/src/targets/ocaml/cohttp/fixtures/nested.ml index 901559c9..399e773b 100644 --- a/src/targets/ocaml/cohttp/fixtures/nested.ml +++ b/src/targets/ocaml/cohttp/fixtures/nested.ml @@ -2,7 +2,7 @@ open Cohttp_lwt_unix open Cohttp open Lwt -let uri = Uri.of_string "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value" in +let uri = Uri.of_string "http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value" in Client.call `GET uri >>= fun (res, body_stream) -> diff --git a/src/targets/php/curl/fixtures/nested.php b/src/targets/php/curl/fixtures/nested.php index 69a0a33b..5e90314d 100644 --- a/src/targets/php/curl/fixtures/nested.php +++ b/src/targets/php/curl/fixtures/nested.php @@ -3,7 +3,7 @@ $curl = curl_init(); curl_setopt_array($curl, [ - CURLOPT_URL => "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value", + CURLOPT_URL => "http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value", CURLOPT_RETURNTRANSFER => true, CURLOPT_ENCODING => "", CURLOPT_MAXREDIRS => 10, diff --git a/src/targets/php/guzzle/fixtures/nested.php b/src/targets/php/guzzle/fixtures/nested.php index 00429e83..e16dbdbe 100644 --- a/src/targets/php/guzzle/fixtures/nested.php +++ b/src/targets/php/guzzle/fixtures/nested.php @@ -2,6 +2,6 @@ $client = new \GuzzleHttp\Client(); -$response = $client->request('GET', 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value'); +$response = $client->request('GET', 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value'); echo $response->getBody(); \ No newline at end of file diff --git a/src/targets/powershell/restmethod/fixtures/nested.ps1 b/src/targets/powershell/restmethod/fixtures/nested.ps1 index cd2b5a97..81f719bd 100644 --- a/src/targets/powershell/restmethod/fixtures/nested.ps1 +++ b/src/targets/powershell/restmethod/fixtures/nested.ps1 @@ -1 +1 @@ -$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' -Method GET \ No newline at end of file +$response = Invoke-RestMethod -Uri 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' -Method GET \ No newline at end of file diff --git a/src/targets/powershell/webrequest/fixtures/nested.ps1 b/src/targets/powershell/webrequest/fixtures/nested.ps1 index afd5485a..d358fd68 100644 --- a/src/targets/powershell/webrequest/fixtures/nested.ps1 +++ b/src/targets/powershell/webrequest/fixtures/nested.ps1 @@ -1 +1 @@ -$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' -Method GET \ No newline at end of file +$response = Invoke-WebRequest -Uri 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' -Method GET \ No newline at end of file diff --git a/src/targets/ruby/native/fixtures/nested.rb b/src/targets/ruby/native/fixtures/nested.rb index d0bbd40c..faa4d6ca 100644 --- a/src/targets/ruby/native/fixtures/nested.rb +++ b/src/targets/ruby/native/fixtures/nested.rb @@ -1,7 +1,7 @@ require 'uri' require 'net/http' -url = URI("http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value") +url = URI("http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value") http = Net::HTTP.new(url.host, url.port) diff --git a/src/targets/shell/curl/fixtures/dont-deglob.sh b/src/targets/shell/curl/fixtures/dont-deglob.sh index 049ebdba..63a81f23 100644 --- a/src/targets/shell/curl/fixtures/dont-deglob.sh +++ b/src/targets/shell/curl/fixtures/dont-deglob.sh @@ -1 +1 @@ -curl --request GET --url 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file +curl --request GET --url 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' \ No newline at end of file diff --git a/src/targets/shell/curl/fixtures/nested.sh b/src/targets/shell/curl/fixtures/nested.sh index 2126d58f..89ece9a9 100644 --- a/src/targets/shell/curl/fixtures/nested.sh +++ b/src/targets/shell/curl/fixtures/nested.sh @@ -1,2 +1,2 @@ curl --request GET \ - --url 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file + --url 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' \ No newline at end of file diff --git a/src/targets/shell/httpie/fixtures/nested.sh b/src/targets/shell/httpie/fixtures/nested.sh index 1e07f269..a726a867 100644 --- a/src/targets/shell/httpie/fixtures/nested.sh +++ b/src/targets/shell/httpie/fixtures/nested.sh @@ -1 +1 @@ -http GET 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file +http GET 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' \ No newline at end of file diff --git a/src/targets/shell/wget/fixtures/nested.sh b/src/targets/shell/wget/fixtures/nested.sh index 6c2c988c..f3255450 100644 --- a/src/targets/shell/wget/fixtures/nested.sh +++ b/src/targets/shell/wget/fixtures/nested.sh @@ -1,4 +1,4 @@ wget --quiet \ --method GET \ --output-document \ - - 'http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value' \ No newline at end of file + - 'http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value' \ No newline at end of file diff --git a/src/targets/swift/nsurlsession/fixtures/nested.swift b/src/targets/swift/nsurlsession/fixtures/nested.swift index 43aaf84a..04691624 100644 --- a/src/targets/swift/nsurlsession/fixtures/nested.swift +++ b/src/targets/swift/nsurlsession/fixtures/nested.swift @@ -1,6 +1,6 @@ import Foundation -let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har?foo%5Bbar%5D=baz%2Czap&fiz=buz&key=value")! as URL, +let request = NSMutableURLRequest(url: NSURL(string: "http://mockbin.com/har?foo[bar]=baz,zap&fiz=buz&key=value")! as URL, cachePolicy: .useProtocolCachePolicy, timeoutInterval: 10.0) request.httpMethod = "GET" diff --git a/src/targets/targets.test.ts b/src/targets/targets.test.ts index bbd10748..befb3c68 100644 --- a/src/targets/targets.test.ts +++ b/src/targets/targets.test.ts @@ -4,7 +4,17 @@ import path from 'path'; import short from '../fixtures/requests/short.json'; import { availableTargets, extname } from '../helpers/utils'; import { HTTPSnippet, Request } from '../httpsnippet'; -import { addTarget, addTargetClient, Client, ClientId, isClient, isTarget, Target, TargetId, targets } from './targets'; +import { + addTarget, + addTargetClient, + Client, + ClientId, + isClient, + isTarget, + Target, + TargetId, + targets, +} from './targets'; const expectedBasePath = ['src', 'fixtures', 'requests']; From 2d6d9952de203bca61d26a65a7ac3f4b1c2032a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:45:27 +0000 Subject: [PATCH 6/6] chore(deps-dev): bump markdownlint-cli2 Bumps the npm_and_yarn group with 1 update in the / directory: [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2). Updates `markdownlint-cli2` from 0.5.1 to 0.13.0 - [Changelog](https://github.com/DavidAnson/markdownlint-cli2/blob/main/CHANGELOG.md) - [Commits](https://github.com/DavidAnson/markdownlint-cli2/compare/v0.5.1...v0.13.0) --- updated-dependencies: - dependency-name: markdownlint-cli2 dependency-type: direct:development dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] --- package-lock.json | 348 ++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 216 insertions(+), 134 deletions(-) diff --git a/package-lock.json b/package-lock.json index e64521e2..a99c666b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "eslint-plugin-jest-formatting": "^3.1.0", "eslint-plugin-simple-import-sort": "^7.0.0", "jest": "^27.5.1", - "markdownlint-cli2": "^0.5.1", + "markdownlint-cli2": "^0.13.0", "prettier": "^2.6.2", "ts-jest": "^27.1.4", "type-fest": "^2.12.2", @@ -1055,6 +1055,18 @@ "node": ">= 8" } }, + "node_modules/@sindresorhus/merge-streams": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", + "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@sinonjs/commons": { "version": "1.8.3", "dev": true, @@ -2087,9 +2099,9 @@ "license": "MIT" }, "node_modules/entities": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", - "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, "engines": { "node": ">=0.12" @@ -2473,9 +2485,10 @@ "license": "MIT" }, "node_modules/fast-glob": { - "version": "3.2.11", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, - "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -2809,9 +2822,10 @@ } }, "node_modules/ignore": { - "version": "5.2.0", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } @@ -3811,6 +3825,12 @@ "node": ">=6" } }, + "node_modules/jsonc-parser": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "dev": true + }, "node_modules/kleur": { "version": "3.0.3", "dev": true, @@ -3864,12 +3884,12 @@ "license": "MIT" }, "node_modules/linkify-it": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", - "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dev": true, "dependencies": { - "uc.micro": "^1.0.1" + "uc.micro": "^2.0.0" } }, "node_modules/locate-path": { @@ -3941,87 +3961,94 @@ "license": "MIT" }, "node_modules/markdown-it": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz", - "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", + "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", "dev": true, "dependencies": { "argparse": "^2.0.1", - "entities": "~3.0.1", - "linkify-it": "^4.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" }, "bin": { - "markdown-it": "bin/markdown-it.js" + "markdown-it": "bin/markdown-it.mjs" } }, "node_modules/markdownlint": { - "version": "0.26.2", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.26.2.tgz", - "integrity": "sha512-2Am42YX2Ex5SQhRq35HxYWDfz1NLEOZWWN25nqd2h3AHRKsGRE+Qg1gt1++exW792eXTrR4jCNHfShfWk9Nz8w==", + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.34.0.tgz", + "integrity": "sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==", "dev": true, "dependencies": { - "markdown-it": "13.0.1" + "markdown-it": "14.1.0", + "markdownlint-micromark": "0.1.9" }, "engines": { - "node": ">=14" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/DavidAnson" } }, "node_modules/markdownlint-cli2": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.5.1.tgz", - "integrity": "sha512-f3Nb1GF/c8YSrV/FntsCWzpa5mLFJRlO+wzEgv+lkNQjU6MZflUwc2FbyEDPTo6oVhP2VyUOkK0GkFgfuktl1w==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.13.0.tgz", + "integrity": "sha512-Pg4nF7HlopU97ZXtrcVISWp3bdsuc5M0zXyLp2/sJv2zEMlInrau0ZKK482fQURzVezJzWBpNmu4u6vGAhij+g==", "dev": true, "dependencies": { - "globby": "13.1.2", - "markdownlint": "0.26.2", - "markdownlint-cli2-formatter-default": "0.0.3", - "micromatch": "4.0.5", - "strip-json-comments": "5.0.0", - "yaml": "2.1.1" + "globby": "14.0.1", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.1", + "markdownlint": "0.34.0", + "markdownlint-cli2-formatter-default": "0.0.4", + "micromatch": "4.0.5" }, "bin": { - "markdownlint-cli2": "markdownlint-cli2.js", - "markdownlint-cli2-config": "markdownlint-cli2-config.js", - "markdownlint-cli2-fix": "markdownlint-cli2-fix.js" + "markdownlint-cli2": "markdownlint-cli2.js" }, "engines": { - "node": ">=14" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/DavidAnson" } }, "node_modules/markdownlint-cli2-formatter-default": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.3.tgz", - "integrity": "sha512-QEAJitT5eqX1SNboOD+SO/LNBpu4P4je8JlR02ug2cLQAqmIhh8IJnSK7AcaHBHhNADqdGydnPpQOpsNcEEqCw==", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.4.tgz", + "integrity": "sha512-xm2rM0E+sWgjpPn1EesPXx5hIyrN2ddUnUwnbCsD/ONxYtw3PX6LydvdH6dciWAoFDpwzbHM1TO7uHfcMd6IYg==", "dev": true, "peerDependencies": { "markdownlint-cli2": ">=0.0.4" } }, "node_modules/markdownlint-cli2/node_modules/globby": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz", - "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", + "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==", "dev": true, "dependencies": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" + "@sindresorhus/merge-streams": "^2.1.0", + "fast-glob": "^3.3.2", + "ignore": "^5.2.4", + "path-type": "^5.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.1.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/markdownlint-cli2/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "node_modules/markdownlint-cli2/node_modules/path-type": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", + "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", "dev": true, "engines": { "node": ">=12" @@ -4030,10 +4057,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/markdownlint-cli2/node_modules/strip-json-comments": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz", - "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==", + "node_modules/markdownlint-cli2/node_modules/slash": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "dev": true, "engines": { "node": ">=14.16" @@ -4042,10 +4069,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/markdownlint-micromark": { + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.9.tgz", + "integrity": "sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/DavidAnson" + } + }, "node_modules/mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "dev": true }, "node_modules/merge-stream": { @@ -4431,6 +4470,15 @@ "node": ">=6" } }, + "node_modules/punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "dev": true, @@ -5015,11 +5063,23 @@ } }, "node_modules/uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", "dev": true }, + "node_modules/unicorn-magic": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/universalify": { "version": "0.1.2", "dev": true, @@ -5248,15 +5308,6 @@ "dev": true, "license": "ISC" }, - "node_modules/yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", - "dev": true, - "engines": { - "node": ">= 14" - } - }, "node_modules/yargs": { "version": "17.4.0", "license": "MIT", @@ -6046,6 +6097,12 @@ "fastq": "^1.6.0" } }, + "@sindresorhus/merge-streams": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", + "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", + "dev": true + }, "@sinonjs/commons": { "version": "1.8.3", "dev": true, @@ -6702,9 +6759,9 @@ "version": "8.0.0" }, "entities": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", - "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true }, "error-ex": { @@ -6937,7 +6994,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.11", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -7154,7 +7213,9 @@ } }, "ignore": { - "version": "5.2.0", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "dev": true }, "import-fresh": { @@ -7875,6 +7936,12 @@ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, + "jsonc-parser": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "dev": true + }, "kleur": { "version": "3.0.3", "dev": true @@ -7909,12 +7976,12 @@ "dev": true }, "linkify-it": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", - "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", + "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "dev": true, "requires": { - "uc.micro": "^1.0.1" + "uc.micro": "^2.0.0" } }, "locate-path": { @@ -7965,79 +8032,88 @@ "version": "0.0.7" }, "markdown-it": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz", - "integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==", + "version": "14.1.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", + "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", "dev": true, "requires": { "argparse": "^2.0.1", - "entities": "~3.0.1", - "linkify-it": "^4.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "entities": "^4.4.0", + "linkify-it": "^5.0.0", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" } }, "markdownlint": { - "version": "0.26.2", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.26.2.tgz", - "integrity": "sha512-2Am42YX2Ex5SQhRq35HxYWDfz1NLEOZWWN25nqd2h3AHRKsGRE+Qg1gt1++exW792eXTrR4jCNHfShfWk9Nz8w==", + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.34.0.tgz", + "integrity": "sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==", "dev": true, "requires": { - "markdown-it": "13.0.1" + "markdown-it": "14.1.0", + "markdownlint-micromark": "0.1.9" } }, "markdownlint-cli2": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.5.1.tgz", - "integrity": "sha512-f3Nb1GF/c8YSrV/FntsCWzpa5mLFJRlO+wzEgv+lkNQjU6MZflUwc2FbyEDPTo6oVhP2VyUOkK0GkFgfuktl1w==", + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.13.0.tgz", + "integrity": "sha512-Pg4nF7HlopU97ZXtrcVISWp3bdsuc5M0zXyLp2/sJv2zEMlInrau0ZKK482fQURzVezJzWBpNmu4u6vGAhij+g==", "dev": true, "requires": { - "globby": "13.1.2", - "markdownlint": "0.26.2", - "markdownlint-cli2-formatter-default": "0.0.3", - "micromatch": "4.0.5", - "strip-json-comments": "5.0.0", - "yaml": "2.1.1" + "globby": "14.0.1", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.1", + "markdownlint": "0.34.0", + "markdownlint-cli2-formatter-default": "0.0.4", + "micromatch": "4.0.5" }, "dependencies": { "globby": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.2.tgz", - "integrity": "sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz", + "integrity": "sha512-jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==", "dev": true, "requires": { - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.11", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^4.0.0" + "@sindresorhus/merge-streams": "^2.1.0", + "fast-glob": "^3.3.2", + "ignore": "^5.2.4", + "path-type": "^5.0.0", + "slash": "^5.1.0", + "unicorn-magic": "^0.1.0" } }, - "slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "path-type": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz", + "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==", "dev": true }, - "strip-json-comments": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz", - "integrity": "sha512-V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw==", + "slash": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "dev": true } } }, "markdownlint-cli2-formatter-default": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.3.tgz", - "integrity": "sha512-QEAJitT5eqX1SNboOD+SO/LNBpu4P4je8JlR02ug2cLQAqmIhh8IJnSK7AcaHBHhNADqdGydnPpQOpsNcEEqCw==", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/markdownlint-cli2-formatter-default/-/markdownlint-cli2-formatter-default-0.0.4.tgz", + "integrity": "sha512-xm2rM0E+sWgjpPn1EesPXx5hIyrN2ddUnUwnbCsD/ONxYtw3PX6LydvdH6dciWAoFDpwzbHM1TO7uHfcMd6IYg==", "dev": true, "requires": {} }, + "markdownlint-micromark": { + "version": "0.1.9", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.9.tgz", + "integrity": "sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==", + "dev": true + }, "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "dev": true }, "merge-stream": { @@ -8275,6 +8351,12 @@ "version": "2.1.1", "dev": true }, + "punycode.js": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", + "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", + "dev": true + }, "queue-microtask": { "version": "1.2.3", "dev": true @@ -8604,9 +8686,15 @@ "dev": true }, "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", + "dev": true + }, + "unicorn-magic": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", "dev": true }, "universalify": { @@ -8747,12 +8835,6 @@ "version": "4.0.0", "dev": true }, - "yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", - "dev": true - }, "yargs": { "version": "17.4.0", "requires": { diff --git a/package.json b/package.json index f983d7af..abeaaaae 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "eslint-plugin-jest": "^26.1.3", "eslint-plugin-jest-formatting": "^3.1.0", "eslint-plugin-simple-import-sort": "^7.0.0", - "markdownlint-cli2": "^0.5.1", + "markdownlint-cli2": "^0.13.0", "jest": "^27.5.1", "prettier": "^2.6.2", "ts-jest": "^27.1.4",