Skip to content

Commit

Permalink
Merge #5262 #5263
Browse files Browse the repository at this point in the history
5262: chore(deps): bump json-2-csv from 3.10.0 to 3.10.1 r=jniles a=dependabot-preview[bot]

Bumps [json-2-csv](https://github.com/mrodrig/json-2-csv) from 3.10.0 to 3.10.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/mrodrig/json-2-csv/releases">json-2-csv's releases</a>.</em></p>
<blockquote>
<h2>NPM Release v3.10.1</h2>
<p>Fixes <a href="https://github-redirect.dependabot.com/mrodrig/json-2-csv/issues/175">#175</a>, <a href="https://github-redirect.dependabot.com/mrodrig/json-2-csv/issues/176">#176</a> thanks to <a href="https://github.com/LandingWind">@LandingWind</a> in <a href="https://github-redirect.dependabot.com/mrodrig/json-2-csv/issues/177">#177</a>.</p>
</blockquote>


5263: chore(deps-dev): bump eslint from 7.16.0 to 7.17.0 r=jniles a=dependabot-preview[bot]

Bumps [eslint](https://github.com/eslint/eslint) from 7.16.0 to 7.17.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/eslint/eslint/releases">eslint's releases</a>.</em></p>
<blockquote>
<h2>v7.17.0</h2>
<ul>
<li><a href="https://github.com/eslint/eslint/commit/e128e775e9fa116a0ad68a071f1f0997589f8cd4"><code>e128e77</code></a> Update: check logical assignment in no-constant-condition (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13946">#13946</a>) (Milos Djermanovic)</li>
<li><a href="https://github.com/eslint/eslint/commit/cc4871369645c3409dc56ded7a555af8a9f63d51"><code>cc48713</code></a> Chore: refactor calculating range and loc in no-useless-escape (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13964">#13964</a>) (Milos Djermanovic)</li>
<li><a href="https://github.com/eslint/eslint/commit/535fe47fee6544b4957378f9408117c8318d4762"><code>535fe47</code></a> Update: use regexpp's default ecmaVersion in no-control-regex (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13969">#13969</a>) (Milos Djermanovic)</li>
<li><a href="https://github.com/eslint/eslint/commit/83e98cd48ce3d1acf729f4fb9be40cff332abd6e"><code>83e98cd</code></a> Fix: use regexpp's default ecmaVersion in no-invalid-regexp (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13968">#13968</a>) (Milos Djermanovic)</li>
<li><a href="https://github.com/eslint/eslint/commit/7297363ea355d0e3b2a74aaec586126deb91fd93"><code>7297363</code></a> Docs: fix examples for no-multi-str (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13966">#13966</a>) (Milos Djermanovic)</li>
<li><a href="https://github.com/eslint/eslint/commit/06498716bfba65ed8c7217917a29a07ad267193a"><code>0649871</code></a> Update: add autofix to rule multiline-ternary (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13958">#13958</a>) (薛定谔的猫)</li>
<li><a href="https://github.com/eslint/eslint/commit/f6e7e3231bc43c989f8c953de8e0d328bac5eea0"><code>f6e7e32</code></a> Fix: no-useless-escape wrong loc and fix with CRLF in template elements (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13953">#13953</a>) (Milos Djermanovic)</li>
<li><a href="https://github.com/eslint/eslint/commit/19c69c0293a98634ff0d4884a0cdabc1213ebcb4"><code>19c69c0</code></a> Fix: one-var shouldn't split declaration if it isn't in a statement list (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13959">#13959</a>) (Milos Djermanovic)</li>
<li><a href="https://github.com/eslint/eslint/commit/e451b9664aface32ad9321eaf5619c875dc76553"><code>e451b96</code></a> Docs: update build tool for webpack (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13962">#13962</a>) (Sam Chen)</li>
<li><a href="https://github.com/eslint/eslint/commit/c3e9accce2f61b04ab699fd37c90703305281aa3"><code>c3e9acc</code></a> Chore: fix typos (<a href="https://github-redirect.dependabot.com/eslint/eslint/issues/13960">#13960</a>) (YeonJuan)</li>
<li><a href="https://github.com/eslint/eslint/commit/7289ecf58ed0d2e7f0ad7f1e5004c8927a7bf805"><code>7289ecf</code></a> Sponsors: Sync README with website (ESLint Jenkins)</li>
</ul>
</blockquote>


Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
  • Loading branch information
bors[bot] and dependabot-preview[bot] authored Jan 4, 2021
3 parents 99fed07 + 46cc6a9 + e13d938 commit 8db9590
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"ioredis": "^4.19.4",
"jquery": "^3.5.1",
"jsbarcode": "^3.11.3",
"json-2-csv": "^3.10.0",
"json-2-csv": "^3.10.1",
"lodash": "^4.17.20",
"mailgun-js": "^0.22.0",
"moment": "^2.29.1",
Expand Down Expand Up @@ -145,7 +145,7 @@
"chai-spies-next": "^0.9.3",
"cssnano": "^4.1.10",
"del": "^6.0.0",
"eslint": "^7.16.0",
"eslint": "^7.17.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-plugin-import": "^2.22.1",
"gulp": "^4.0.0",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3174,10 +3174,10 @@ eslint@^6.1.0:
text-table "^0.2.0"
v8-compile-cache "^2.0.3"

eslint@^7.16.0:
version "7.16.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092"
integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==
eslint@^7.17.0:
version "7.17.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0"
integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==
dependencies:
"@babel/code-frame" "^7.0.0"
"@eslint/eslintrc" "^0.2.2"
Expand Down Expand Up @@ -5309,10 +5309,10 @@ jsbn@~0.1.0:
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=

json-2-csv@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/json-2-csv/-/json-2-csv-3.10.0.tgz#3b9f6be67785c5a56a6ff68f193bdd1c47430927"
integrity sha512-9kCTegRIF3dHxbKewSWDRBgHqP392lOZnazUKN4KYjxFAuY/mK+dN0XML12++5luHthBG2C/bM/IjYONvpzMSQ==
json-2-csv@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/json-2-csv/-/json-2-csv-3.10.1.tgz#ab9433278b3b13a060650610abfaf1ecb6818df4"
integrity sha512-umwsH3/wVcgJ92j3sN9a3u/5uT66IB3agP0iKUvEkP/AtP09QqMy1qy044ftjlPXgxYKc4/YMHrp4fJ6y0PAdQ==
dependencies:
deeks "2.3.0"
doc-path "2.2.0"
Expand Down

0 comments on commit 8db9590

Please sign in to comment.