Skip to content

Commit 113d3af

Browse files
authored
Merge branch 'dev' into dependabot/npm_and_yarn/babel/standalone-7.12.9
2 parents 184f9b7 + c34b890 commit 113d3af

File tree

2 files changed

+109
-26
lines changed

2 files changed

+109
-26
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"@babel/plugin-transform-runtime": "^7.12.1",
9898
"@babel/preset-env": "^7.12.7",
9999
"@babel/standalone": "^7.12.9",
100-
"@nuxt/content": "^1.11.0",
100+
"@nuxt/content": "^1.11.1",
101101
"@nuxtjs/google-analytics": "^2.4.0",
102102
"@nuxtjs/pwa": "^3.2.2",
103103
"@nuxtjs/robots": "^2.4.2",
@@ -134,7 +134,7 @@
134134
"husky": "^4.3.0",
135135
"improved-yarn-audit": "^2.3.1",
136136
"jest": "^26.6.3",
137-
"lint-staged": "^10.5.1",
137+
"lint-staged": "^10.5.2",
138138
"loader-utils": "^2.0.0",
139139
"lodash": "^4.17.20",
140140
"marked": "^1.2.5",

yarn.lock

Lines changed: 107 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,10 +1277,10 @@
12771277
rc9 "^1.0.0"
12781278
std-env "^2.2.1"
12791279

1280-
"@nuxt/content@^1.11.0":
1281-
version "1.11.0"
1282-
resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-1.11.0.tgz#f869a92d28aa7bc89b13362d9cfb94bf8a27dc7c"
1283-
integrity sha512-amkREZJXPxqxK7401NQH+OOvdHr5MpbKa2v0NFhxFoH/SOIF5A2TX/ilj7lDnKITnJZ947yMVzcG45JWAhuItQ==
1280+
"@nuxt/content@^1.11.1":
1281+
version "1.11.1"
1282+
resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-1.11.1.tgz#60d850d01d2f946b896ddb8a8736c43cfe2cdd72"
1283+
integrity sha512-aIB1LSJZfTx0cBq+oWi64lvPyX0vnE0D+g0kQCp52RSPWyxPtogrg3rnWQf/NU1JEDHaO8aFuXB/Pk57tjSZMQ==
12841284
dependencies:
12851285
"@lokidb/full-text-search" "^2.1.0"
12861286
"@lokidb/loki" "^2.1.0"
@@ -1313,6 +1313,7 @@
13131313
remark-autolink-headings "^6.0.1"
13141314
remark-external-links "^8.0.0"
13151315
remark-footnotes "^3.0.0"
1316+
remark-gfm "^1.0.0"
13161317
remark-parse "^9.0.0"
13171318
remark-rehype "^8.0.0"
13181319
remark-slug "^6.0.0"
@@ -5800,22 +5801,7 @@ execa@^3.4.0:
58005801
signal-exit "^3.0.2"
58015802
strip-final-newline "^2.0.0"
58025803

5803-
execa@^4.0.0, execa@^4.0.3:
5804-
version "4.0.3"
5805-
resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
5806-
integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==
5807-
dependencies:
5808-
cross-spawn "^7.0.0"
5809-
get-stream "^5.0.0"
5810-
human-signals "^1.1.1"
5811-
is-stream "^2.0.0"
5812-
merge-stream "^2.0.0"
5813-
npm-run-path "^4.0.0"
5814-
onetime "^5.1.0"
5815-
signal-exit "^3.0.2"
5816-
strip-final-newline "^2.0.0"
5817-
5818-
execa@^4.1.0:
5804+
execa@^4.0.0, execa@^4.0.3, execa@^4.1.0:
58195805
version "4.1.0"
58205806
resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
58215807
integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -8600,10 +8586,10 @@ lines-and-columns@^1.1.6:
86008586
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
86018587
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
86028588

8603-
lint-staged@^10.5.1:
8604-
version "10.5.1"
8605-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.1.tgz#901e915c2360072dded0e7d752a0d9a49e079daa"
8606-
integrity sha512-fTkTGFtwFIJJzn/PbUO3RXyEBHIhbfYBE7+rJyLcOXabViaO/h6OslgeK6zpeUtzkDrzkgyAYDTLAwx6JzDTHw==
8589+
lint-staged@^10.5.2:
8590+
version "10.5.2"
8591+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.2.tgz#acfaa0093af3262aee3130b2e22438941530bdd1"
8592+
integrity sha512-e8AYR1TDlzwB8VVd38Xu2lXDZf6BcshVqKVuBQThDJRaJLobqKnpbm4dkwJ2puypQNbLr9KF/9mfA649mAGvjA==
86078593
dependencies:
86088594
chalk "^4.1.0"
86098595
cli-truncate "^2.1.0"
@@ -8975,6 +8961,13 @@ markdown-escapes@^1.0.0:
89758961
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535"
89768962
integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
89778963

8964+
markdown-table@^2.0.0:
8965+
version "2.0.0"
8966+
resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-2.0.0.tgz#194a90ced26d31fe753d8b9434430214c011865b"
8967+
integrity sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==
8968+
dependencies:
8969+
repeat-string "^1.0.0"
8970+
89788971
marked@^1.2.5:
89798972
version "1.2.5"
89808973
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.5.tgz#a44b31f2a0b8b5bfd610f00d55d1952d1ac1dfdb"
@@ -9021,6 +9014,43 @@ mdast-util-from-markdown@^0.8.0:
90219014
micromark "~2.10.0"
90229015
parse-entities "^2.0.0"
90239016

9017+
mdast-util-gfm-autolink-literal@^0.1.0:
9018+
version "0.1.1"
9019+
resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.1.tgz#94675074d725ed7254b3172fa7e7c3252960de39"
9020+
integrity sha512-gJ2xSpqKCetSr22GEWpZH3f5ffb4pPn/72m4piY0v7T/S+O7n7rw+sfoPLhb2b4O7WdnERoYdALRcmD68FMtlw==
9021+
9022+
mdast-util-gfm-strikethrough@^0.2.0:
9023+
version "0.2.2"
9024+
resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.2.tgz#6e9ddd33ce41b06a60463e817f6ef4cf7bfa0655"
9025+
integrity sha512-T37ZbaokJcRbHROXmoVAieWnesPD5N21tv2ifYzaGRLbkh1gknItUGhZzHefUn5Zc/eaO/iTDSAFOBrn/E8kWw==
9026+
dependencies:
9027+
mdast-util-to-markdown "^0.5.0"
9028+
9029+
mdast-util-gfm-table@^0.1.0:
9030+
version "0.1.4"
9031+
resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.4.tgz#5b3d71d16294c6fae1c2c424d3a081ffc7407b83"
9032+
integrity sha512-T4xFSON9kUb/IpYA5N+KGWcsdGczAvILvKiXQwUGind6V9fvjPCR9yhZnIeaLdBWXaz3m/Gq77ZtuLMjtFR4IQ==
9033+
dependencies:
9034+
markdown-table "^2.0.0"
9035+
mdast-util-to-markdown "^0.5.0"
9036+
9037+
mdast-util-gfm-task-list-item@^0.1.0:
9038+
version "0.1.5"
9039+
resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.5.tgz#3179e77f1c881370818302e7b93537d7c281401d"
9040+
integrity sha512-6O0bt34r+e7kYjeSwedhjDPYraspKIYKbhvhQEEioL7gSmXDxhN7WQW2KoxhVMpNzjNc03yC7K5KH6NHlz2jOA==
9041+
dependencies:
9042+
mdast-util-to-markdown "^0.5.0"
9043+
9044+
mdast-util-gfm@^0.1.0:
9045+
version "0.1.0"
9046+
resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-0.1.0.tgz#bac0efe703670d1b40474e6be13dbdd887273a04"
9047+
integrity sha512-HLfygQL6HdhJhFbLta4Ki9hClrzyAxRjyRvpm5caN65QZL+NyHPmqFlnF9vm1Rn58JT2+AbLwNcEDY4MEvkk8Q==
9048+
dependencies:
9049+
mdast-util-gfm-autolink-literal "^0.1.0"
9050+
mdast-util-gfm-strikethrough "^0.2.0"
9051+
mdast-util-gfm-table "^0.1.0"
9052+
mdast-util-gfm-task-list-item "^0.1.0"
9053+
90249054
mdast-util-to-hast@^10.0.0, mdast-util-to-hast@^10.0.1:
90259055
version "10.0.1"
90269056
resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb"
@@ -9178,6 +9208,51 @@ micromark-extension-footnote@^0.3.0:
91789208
dependencies:
91799209
micromark "~2.10.1"
91809210

9211+
micromark-extension-gfm-autolink-literal@~0.5.0:
9212+
version "0.5.1"
9213+
resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.1.tgz#5326fc86f3ae0fbba57bb0bfc2f158c9456528ce"
9214+
integrity sha512-j30923tDp0faCNDjwqe4cMi+slegbGfc3VEAExEU8d54Q/F6pR6YxCVH+6xV0ItRoj3lCn1XkUWcy6FC3S9BOw==
9215+
dependencies:
9216+
micromark "~2.10.0"
9217+
9218+
micromark-extension-gfm-strikethrough@~0.6.0:
9219+
version "0.6.2"
9220+
resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.2.tgz#754788bdd13046e7f69edaa0d3f3d555d23128d6"
9221+
integrity sha512-aehEEqtTn3JekJNwZZxa7ZJVfzmuaWp4ew6x6sl3VAKIwdDZdqYeYSQIrNKwNgH7hX0g56fAwnSDLusJggjlCQ==
9222+
dependencies:
9223+
micromark "~2.10.0"
9224+
9225+
micromark-extension-gfm-table@~0.4.0:
9226+
version "0.4.1"
9227+
resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.1.tgz#79cc37da82d6ae0cc3901c1c6264b97a72372fbd"
9228+
integrity sha512-xVpqOnfFaa2OtC/Y7rlt4tdVFlUHdoLH3RXAZgb/KP3DDyKsAOx6BRS3UxiiyvmD/p2l6VUpD4bMIniuP4o4JA==
9229+
dependencies:
9230+
micromark "~2.10.0"
9231+
9232+
micromark-extension-gfm-tagfilter@~0.3.0:
9233+
version "0.3.0"
9234+
resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz#d9f26a65adee984c9ccdd7e182220493562841ad"
9235+
integrity sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==
9236+
9237+
micromark-extension-gfm-task-list-item@~0.3.0:
9238+
version "0.3.2"
9239+
resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.2.tgz#74dbcf473276e762d2062baa0764b53c19205797"
9240+
integrity sha512-cm8lYS10YAqeXE9B27TK3u1Ihumo3H9p/3XumT+jp8vSuSbSpFIJe0bDi2kq4YAAIxtcTzUOxhEH4ko2/NYDkQ==
9241+
dependencies:
9242+
micromark "~2.10.0"
9243+
9244+
micromark-extension-gfm@^0.3.0:
9245+
version "0.3.1"
9246+
resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-0.3.1.tgz#30b8706bd2a3f7fd31aa37873d743946a9e856c3"
9247+
integrity sha512-lJlhcOqzoJdjQg+LMumVHdUQ61LjtqGdmZtrAdfvatRUnJTqZlRwXXHdLQgNDYlFw4mycZ4NSTKlya5QcQXl1A==
9248+
dependencies:
9249+
micromark "~2.10.0"
9250+
micromark-extension-gfm-autolink-literal "~0.5.0"
9251+
micromark-extension-gfm-strikethrough "~0.6.0"
9252+
micromark-extension-gfm-table "~0.4.0"
9253+
micromark-extension-gfm-tagfilter "~0.3.0"
9254+
micromark-extension-gfm-task-list-item "~0.3.0"
9255+
91819256
micromark@~2.10.0, micromark@~2.10.1:
91829257
version "2.10.1"
91839258
resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.10.1.tgz#cd73f54e0656f10e633073db26b663a221a442a7"
@@ -11801,6 +11876,14 @@ remark-footnotes@^3.0.0:
1180111876
mdast-util-footnote "^0.1.0"
1180211877
micromark-extension-footnote "^0.3.0"
1180311878

11879+
remark-gfm@^1.0.0:
11880+
version "1.0.0"
11881+
resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-1.0.0.tgz#9213643001be3f277da6256464d56fd28c3b3c0d"
11882+
integrity sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==
11883+
dependencies:
11884+
mdast-util-gfm "^0.1.0"
11885+
micromark-extension-gfm "^0.3.0"
11886+
1180411887
remark-parse@^5.0.0:
1180511888
version "5.0.0"
1180611889
resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"

0 commit comments

Comments
 (0)