Skip to content

Commit 6ebad6d

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into dependabot/npm_and_yarn/nuxt-2.14.11
2 parents 58cd778 + 4674af1 commit 6ebad6d

File tree

2 files changed

+54
-56
lines changed

2 files changed

+54
-56
lines changed

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@
9191
"vue-functional-data-merge": "^3.1.0"
9292
},
9393
"devDependencies": {
94-
"@babel/cli": "^7.12.8",
95-
"@babel/core": "^7.12.9",
94+
"@babel/cli": "^7.12.10",
95+
"@babel/core": "^7.12.10",
9696
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
97-
"@babel/plugin-transform-runtime": "^7.12.1",
98-
"@babel/preset-env": "^7.12.7",
97+
"@babel/plugin-transform-runtime": "^7.12.10",
98+
"@babel/preset-env": "^7.12.10",
9999
"@babel/standalone": "^7.12.9",
100100
"@nuxt/content": "^1.11.1",
101101
"@nuxtjs/google-analytics": "^2.4.0",

‎yarn.lock

Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

5-
"@babel/cli@^7.12.8":
6-
version "7.12.8"
7-
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.8.tgz#3b24ed2fd5da353ee6f19e8935ff8c93b5fe8430"
8-
integrity sha512-/6nQj11oaGhLmZiuRUfxsujiPDc9BBReemiXgIbxc+M5W+MIiFKYwvNDJvBfnGKNsJTKbUfEheKc9cwoPHAVQA==
5+
"@babel/cli@^7.12.10":
6+
version "7.12.10"
7+
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.10.tgz#67a1015b1cd505bde1696196febf910c4c339a48"
8+
integrity sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==
99
dependencies:
1010
commander "^4.0.1"
1111
convert-source-map "^1.1.0"
@@ -31,34 +31,33 @@
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.9", "@babel/core@^7.7.5":
35-
version "7.12.9"
36-
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
37-
integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
34+
"@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.9", "@babel/core@^7.7.5":
35+
version "7.12.10"
36+
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"
37+
integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==
3838
dependencies:
3939
"@babel/code-frame" "^7.10.4"
40-
"@babel/generator" "^7.12.5"
40+
"@babel/generator" "^7.12.10"
4141
"@babel/helper-module-transforms" "^7.12.1"
4242
"@babel/helpers" "^7.12.5"
43-
"@babel/parser" "^7.12.7"
43+
"@babel/parser" "^7.12.10"
4444
"@babel/template" "^7.12.7"
45-
"@babel/traverse" "^7.12.9"
46-
"@babel/types" "^7.12.7"
45+
"@babel/traverse" "^7.12.10"
46+
"@babel/types" "^7.12.10"
4747
convert-source-map "^1.7.0"
4848
debug "^4.1.0"
4949
gensync "^1.0.0-beta.1"
5050
json5 "^2.1.2"
5151
lodash "^4.17.19"
52-
resolve "^1.3.2"
5352
semver "^5.4.1"
5453
source-map "^0.5.0"
5554

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==
55+
"@babel/generator@^7.12.10":
56+
version "7.12.10"
57+
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460"
58+
integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww==
6059
dependencies:
61-
"@babel/types" "^7.12.5"
60+
"@babel/types" "^7.12.10"
6261
jsesc "^2.5.1"
6362
source-map "^0.5.0"
6463

@@ -264,10 +263,10 @@
264263
chalk "^2.0.0"
265264
js-tokens "^4.0.0"
266265

267-
"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
268-
version "7.12.7"
269-
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
270-
integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
266+
"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7", "@babel/parser@^7.7.0":
267+
version "7.12.10"
268+
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81"
269+
integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA==
271270

272271
"@babel/plugin-proposal-async-generator-functions@^7.12.1":
273272
version "7.12.1"
@@ -695,14 +694,13 @@
695694
dependencies:
696695
"@babel/helper-plugin-utils" "^7.10.4"
697696

698-
"@babel/plugin-transform-runtime@^7.12.1":
699-
version "7.12.1"
700-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5"
701-
integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==
697+
"@babel/plugin-transform-runtime@^7.12.1", "@babel/plugin-transform-runtime@^7.12.10":
698+
version "7.12.10"
699+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz#af0fded4e846c4b37078e8e5d06deac6cd848562"
700+
integrity sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==
702701
dependencies:
703-
"@babel/helper-module-imports" "^7.12.1"
702+
"@babel/helper-module-imports" "^7.12.5"
704703
"@babel/helper-plugin-utils" "^7.10.4"
705-
resolve "^1.8.1"
706704
semver "^5.5.1"
707705

708706
"@babel/plugin-transform-shorthand-properties@^7.12.1":
@@ -734,10 +732,10 @@
734732
dependencies:
735733
"@babel/helper-plugin-utils" "^7.10.4"
736734

737-
"@babel/plugin-transform-typeof-symbol@^7.12.1":
738-
version "7.12.1"
739-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
740-
integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
735+
"@babel/plugin-transform-typeof-symbol@^7.12.10":
736+
version "7.12.10"
737+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz#de01c4c8f96580bd00f183072b0d0ecdcf0dec4b"
738+
integrity sha512-JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA==
741739
dependencies:
742740
"@babel/helper-plugin-utils" "^7.10.4"
743741

@@ -756,10 +754,10 @@
756754
"@babel/helper-create-regexp-features-plugin" "^7.12.1"
757755
"@babel/helper-plugin-utils" "^7.10.4"
758756

759-
"@babel/preset-env@^7.12.7":
760-
version "7.12.7"
761-
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
762-
integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
757+
"@babel/preset-env@^7.12.10", "@babel/preset-env@^7.12.7":
758+
version "7.12.10"
759+
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.10.tgz#ca981b95f641f2610531bd71948656306905e6ab"
760+
integrity sha512-Gz9hnBT/tGeTE2DBNDkD7BiWRELZt+8lSysHuDwmYXUIvtwZl0zI+D6mZgXZX0u8YBlLS4tmai9ONNY9tjRgRA==
763761
dependencies:
764762
"@babel/compat-data" "^7.12.7"
765763
"@babel/helper-compilation-targets" "^7.12.5"
@@ -820,12 +818,12 @@
820818
"@babel/plugin-transform-spread" "^7.12.1"
821819
"@babel/plugin-transform-sticky-regex" "^7.12.7"
822820
"@babel/plugin-transform-template-literals" "^7.12.1"
823-
"@babel/plugin-transform-typeof-symbol" "^7.12.1"
821+
"@babel/plugin-transform-typeof-symbol" "^7.12.10"
824822
"@babel/plugin-transform-unicode-escapes" "^7.12.1"
825823
"@babel/plugin-transform-unicode-regex" "^7.12.1"
826824
"@babel/preset-modules" "^0.1.3"
827-
"@babel/types" "^7.12.7"
828-
core-js-compat "^3.7.0"
825+
"@babel/types" "^7.12.10"
826+
core-js-compat "^3.8.0"
829827
semver "^5.5.0"
830828

831829
"@babel/preset-modules@^0.1.3":
@@ -868,25 +866,25 @@
868866
"@babel/parser" "^7.12.7"
869867
"@babel/types" "^7.12.7"
870868

871-
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.7.0":
872-
version "7.12.9"
873-
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
874-
integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
869+
"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5", "@babel/traverse@^7.7.0":
870+
version "7.12.10"
871+
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"
872+
integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg==
875873
dependencies:
876874
"@babel/code-frame" "^7.10.4"
877-
"@babel/generator" "^7.12.5"
875+
"@babel/generator" "^7.12.10"
878876
"@babel/helper-function-name" "^7.10.4"
879877
"@babel/helper-split-export-declaration" "^7.11.0"
880-
"@babel/parser" "^7.12.7"
881-
"@babel/types" "^7.12.7"
878+
"@babel/parser" "^7.12.10"
879+
"@babel/types" "^7.12.10"
882880
debug "^4.1.0"
883881
globals "^11.1.0"
884882
lodash "^4.17.19"
885883

886-
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
887-
version "7.12.7"
888-
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
889-
integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
884+
"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
885+
version "7.12.10"
886+
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260"
887+
integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw==
890888
dependencies:
891889
"@babel/helper-validator-identifier" "^7.10.4"
892890
lodash "^4.17.19"
@@ -4380,7 +4378,7 @@ copy-descriptor@^0.1.0:
43804378
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
43814379
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
43824380

4383-
core-js-compat@^3.7.0:
4381+
core-js-compat@^3.8.0:
43844382
version "3.8.1"
43854383
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.1.tgz#8d1ddd341d660ba6194cbe0ce60f4c794c87a36e"
43864384
integrity sha512-a16TLmy9NVD1rkjUGbwuyWkiDoN0FDpAwrfLONvHFQx0D9k7J9y0srwMT8QP/Z6HE3MIFaVynEeYwZwPX1o5RQ==
@@ -12126,7 +12124,7 @@ resolve-url@^0.2.1:
1212612124
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
1212712125
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
1212812126

12129-
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:
12127+
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.8.1:
1213012128
version "1.19.0"
1213112129
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
1213212130
integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==

0 commit comments

Comments
 (0)