Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nuxt/nuxtjs.org
Browse files Browse the repository at this point in the history
  • Loading branch information
debs-obrien committed Jan 29, 2021
2 parents ca15a1c + c279e0e commit 2cbd3b6
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Nuxt.js official website",
"main": "index.js",
"dependencies": {
"@nuxt/content": "^1.11.1",
"@nuxt/content": "^1.12.0",
"@nuxt/http": "^0.6.2",
"@nuxtjs/tailwindcss": "^3.4.2",
"@snackbar/core": "^1.7.0",
Expand Down
31 changes: 15 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1119,15 +1119,15 @@
std-env "^2.2.1"
ufo "^0.5.4"

"@nuxt/content@^1.11.1":
version "1.11.1"
resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-1.11.1.tgz#60d850d01d2f946b896ddb8a8736c43cfe2cdd72"
integrity sha512-aIB1LSJZfTx0cBq+oWi64lvPyX0vnE0D+g0kQCp52RSPWyxPtogrg3rnWQf/NU1JEDHaO8aFuXB/Pk57tjSZMQ==
"@nuxt/content@^1.12.0":
version "1.12.0"
resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-1.12.0.tgz#2e37e31a2cc4c821a7ac350045ead56059cccb54"
integrity sha512-UWVQ1NvUjUHP3dyFlNdrjTT6Nj5F098ChtlW0KrFQ2ObidK/+KKwq7t/nE+7YTsH0hOsuekSHihDIcTkWPR2QA==
dependencies:
"@lokidb/full-text-search" "^2.1.0"
"@lokidb/loki" "^2.1.0"
"@nuxt/types" "^2.14.7"
"@types/js-yaml" "^3.12.5"
"@types/js-yaml" "^4.0.0"
"@types/xml2js" "^0.4.7"
change-case "^4.1.1"
chokidar "^3.4.3"
Expand All @@ -1141,7 +1141,7 @@
hasha "^5.2.2"
hookable "^4.3.1"
html-tags "^3.1.0"
js-yaml "3.14.0"
js-yaml "4.0.0"
mdast-util-to-hast "^10.0.1"
mkdirp "^1.0.4"
node-req "^2.1.2"
Expand Down Expand Up @@ -1913,10 +1913,10 @@
dependencies:
"@types/node" "*"

"@types/js-yaml@^3.12.5":
version "3.12.6"
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.6.tgz#7f10c926aa41e189a2755c4c7fcf8e4573bd7ac1"
integrity sha512-cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ==
"@types/js-yaml@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.0.tgz#d1a11688112091f2c711674df3a65ea2f47b5dfb"
integrity sha512-4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA==

"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
version "7.0.7"
Expand Down Expand Up @@ -7196,13 +7196,12 @@ js-tokens@^4.0.0:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==

js-yaml@3.14.0:
version "3.14.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
js-yaml@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
argparse "^2.0.1"

js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.14.1, js-yaml@^3.9.1, js-yaml@~3.14.1:
version "3.14.1"
Expand Down

0 comments on commit 2cbd3b6

Please sign in to comment.