Skip to content

Commit 13f3e85

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into dependabot/npm_and_yarn/babel/cli-7.12.8
2 parents b53131b + 2534a0c commit 13f3e85

File tree

2 files changed

+50
-57
lines changed

2 files changed

+50
-57
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
},
9393
"devDependencies": {
9494
"@babel/cli": "^7.12.8",
95-
"@babel/core": "^7.12.3",
95+
"@babel/core": "^7.12.8",
9696
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
9797
"@babel/plugin-transform-runtime": "^7.12.1",
9898
"@babel/preset-env": "^7.12.7",
@@ -116,7 +116,7 @@
116116
"codesandbox": "^2.2.1",
117117
"core-js": "^3.7.0",
118118
"cross-env": "^7.0.2",
119-
"eslint": "^7.13.0",
119+
"eslint": "^7.14.0",
120120
"eslint-config-prettier": "^6.15.0",
121121
"eslint-config-standard": "^16.0.2",
122122
"eslint-config-vue": "^2.0.2",
@@ -139,7 +139,7 @@
139139
"lodash": "^4.17.20",
140140
"marked": "^1.2.5",
141141
"nuxt": "^2.14.7",
142-
"postcss": "^8.1.9",
142+
"postcss": "^8.1.10",
143143
"postcss-cli": "^8.3.0",
144144
"prettier": "1.14.3",
145145
"require-context": "^1.1.0",

‎yarn.lock

Lines changed: 47 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@
3131
resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
3232
integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
3333

34-
"@babel/core@^7.1.0", "@babel/core@^7.12.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5":
35-
version "7.12.3"
36-
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
37-
integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
34+
"@babel/core@^7.1.0", "@babel/core@^7.12.0", "@babel/core@^7.12.8", "@babel/core@^7.7.5":
35+
version "7.12.8"
36+
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.8.tgz#8ad76c1a7d2a6a3beecc4395fa4f7b4cb88390e6"
37+
integrity sha512-ra28JXL+5z73r1IC/t+FT1ApXU5LsulFDnTDntNfLQaScJUJmcHL5Qxm/IWanCToQk3bPWQo5bflbplU5r15pg==
3838
dependencies:
3939
"@babel/code-frame" "^7.10.4"
40-
"@babel/generator" "^7.12.1"
40+
"@babel/generator" "^7.12.5"
4141
"@babel/helper-module-transforms" "^7.12.1"
42-
"@babel/helpers" "^7.12.1"
43-
"@babel/parser" "^7.12.3"
44-
"@babel/template" "^7.10.4"
45-
"@babel/traverse" "^7.12.1"
46-
"@babel/types" "^7.12.1"
42+
"@babel/helpers" "^7.12.5"
43+
"@babel/parser" "^7.12.7"
44+
"@babel/template" "^7.12.7"
45+
"@babel/traverse" "^7.12.8"
46+
"@babel/types" "^7.12.7"
4747
convert-source-map "^1.7.0"
4848
debug "^4.1.0"
4949
gensync "^1.0.0-beta.1"
@@ -53,12 +53,12 @@
5353
semver "^5.4.1"
5454
source-map "^0.5.0"
5555

56-
"@babel/generator@^7.12.1":
57-
version "7.12.1"
58-
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468"
59-
integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==
56+
"@babel/generator@^7.12.5":
57+
version "7.12.5"
58+
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
59+
integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
6060
dependencies:
61-
"@babel/types" "^7.12.1"
61+
"@babel/types" "^7.12.5"
6262
jsesc "^2.5.1"
6363
source-map "^0.5.0"
6464

@@ -254,14 +254,14 @@
254254
"@babel/traverse" "^7.10.4"
255255
"@babel/types" "^7.10.4"
256256

257-
"@babel/helpers@^7.12.1":
258-
version "7.12.1"
259-
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.1.tgz#8a8261c1d438ec18cb890434df4ec768734c1e79"
260-
integrity sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==
257+
"@babel/helpers@^7.12.5":
258+
version "7.12.5"
259+
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
260+
integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
261261
dependencies:
262262
"@babel/template" "^7.10.4"
263-
"@babel/traverse" "^7.12.1"
264-
"@babel/types" "^7.12.1"
263+
"@babel/traverse" "^7.12.5"
264+
"@babel/types" "^7.12.5"
265265

266266
"@babel/highlight@^7.10.4":
267267
version "7.10.4"
@@ -272,10 +272,10 @@
272272
chalk "^2.0.0"
273273
js-tokens "^4.0.0"
274274

275-
"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.1", "@babel/parser@^7.12.3", "@babel/parser@^7.7.0":
276-
version "7.12.3"
277-
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.3.tgz#a305415ebe7a6c7023b40b5122a0662d928334cd"
278-
integrity sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==
275+
"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
276+
version "7.12.7"
277+
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
278+
integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
279279

280280
"@babel/plugin-proposal-async-generator-functions@^7.12.1":
281281
version "7.12.1"
@@ -867,26 +867,26 @@
867867
resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.12.7.tgz#07dc3d76bea978d5c5a3fd0966c218da3fae89c9"
868868
integrity sha512-KsNrLEOTUDg/QZ2KdPUqC+PamvbIDBqrfdbkHxnY9TWyedSUch+KU/TDoj/1kg55rmma595fnVWVqQ1eCOwsaA==
869869

870-
"@babel/template@^7.10.4", "@babel/template@^7.3.3":
871-
version "7.10.4"
872-
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
873-
integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
870+
"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
871+
version "7.12.7"
872+
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
873+
integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
874874
dependencies:
875875
"@babel/code-frame" "^7.10.4"
876-
"@babel/parser" "^7.10.4"
877-
"@babel/types" "^7.10.4"
876+
"@babel/parser" "^7.12.7"
877+
"@babel/types" "^7.12.7"
878878

879-
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.7.0":
880-
version "7.12.1"
881-
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.1.tgz#941395e0c5cc86d5d3e75caa095d3924526f0c1e"
882-
integrity sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==
879+
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.8", "@babel/traverse@^7.7.0":
880+
version "7.12.8"
881+
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.8.tgz#c1c2983bf9ba0f4f0eaa11dff7e77fa63307b2a4"
882+
integrity sha512-EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q==
883883
dependencies:
884884
"@babel/code-frame" "^7.10.4"
885-
"@babel/generator" "^7.12.1"
885+
"@babel/generator" "^7.12.5"
886886
"@babel/helper-function-name" "^7.10.4"
887887
"@babel/helper-split-export-declaration" "^7.11.0"
888-
"@babel/parser" "^7.12.1"
889-
"@babel/types" "^7.12.1"
888+
"@babel/parser" "^7.12.7"
889+
"@babel/types" "^7.12.7"
890890
debug "^4.1.0"
891891
globals "^11.1.0"
892892
lodash "^4.17.19"
@@ -5620,10 +5620,10 @@ eslint-visitor-keys@^2.0.0:
56205620
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
56215621
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
56225622

5623-
eslint@^7.13.0:
5624-
version "7.13.0"
5625-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da"
5626-
integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==
5623+
eslint@^7.14.0:
5624+
version "7.14.0"
5625+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.14.0.tgz#2d2cac1d28174c510a97b377f122a5507958e344"
5626+
integrity sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==
56275627
dependencies:
56285628
"@babel/code-frame" "^7.0.0"
56295629
"@eslint/eslintrc" "^0.2.1"
@@ -11159,10 +11159,10 @@ postcss@7.x.x, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17,
1115911159
source-map "^0.6.1"
1116011160
supports-color "^6.1.0"
1116111161

11162-
postcss@^8.1.9:
11163-
version "8.1.9"
11164-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.9.tgz#20ff4b598a6f5015c5f7fe524b8ed5313d7ecade"
11165-
integrity sha512-oWuBpEl1meaMKkQXn0ic78TUrgsMvrAZLE/6ZY0H3LTteq2O3L8PGWwMbPLctpksTJIHjQeossMUMNQW7qRIHQ==
11162+
postcss@^8.1.10:
11163+
version "8.1.10"
11164+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.10.tgz#129834f94c720554d2cfdaeb27d5542ac4a026ea"
11165+
integrity sha512-iBXEV5VTTYaRRdxiFYzTtuv2lGMQBExqkZKSzkJe+Fl6rvQrA/49UVGKqB+LG54hpW/TtDBMGds8j33GFNW7pg==
1116611166
dependencies:
1116711167
colorette "^1.2.1"
1116811168
nanoid "^3.1.18"
@@ -11998,14 +11998,7 @@ resolve-url@^0.2.1:
1199811998
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
1199911999
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
1200012000

12001-
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.8.1:
12002-
version "1.17.0"
12003-
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
12004-
integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
12005-
dependencies:
12006-
path-parse "^1.0.6"
12007-
12008-
resolve@^1.18.1:
12001+
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.2.0, resolve@^1.3.2, resolve@^1.8.1:
1200912002
version "1.18.1"
1201012003
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
1201112004
integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==

0 commit comments

Comments
 (0)