From 411b9aa977015599e1f8537e03de5ebc50e6196d Mon Sep 17 00:00:00 2001 From: Armano Date: Tue, 23 Nov 2021 06:59:28 +0100 Subject: [PATCH] chore: cleanup dependency declaration in package.json (#5985) * deps: add/move dependencies and treat types as dev * chore: fix merge conflict * Update package.json Co-authored-by: Joshua Chen --- packages/docusaurus-mdx-loader/package.json | 1 + .../package.json | 1 - .../package.json | 5 +-- packages/docusaurus-plugin-debug/package.json | 4 ++- .../package.json | 2 +- .../docusaurus-theme-classic/package.json | 5 ++- packages/docusaurus-theme-common/package.json | 2 +- packages/docusaurus-utils-common/package.json | 4 ++- packages/docusaurus-utils/package.json | 1 - packages/docusaurus/package.json | 4 +-- website/package.json | 2 +- yarn.lock | 34 ++----------------- 12 files changed, 19 insertions(+), 46 deletions(-) diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json index 49f537ea10..98046eae16 100644 --- a/packages/docusaurus-mdx-loader/package.json +++ b/packages/docusaurus-mdx-loader/package.json @@ -40,6 +40,7 @@ "devDependencies": { "@docusaurus/types": "2.0.0-beta.9", "@types/escape-html": "^1.0.1", + "@types/github-slugger": "^1.3.0", "@types/mdast": "^3.0.7", "@types/stringify-object": "^3.3.1", "@types/unist": "^2.0.6", diff --git a/packages/docusaurus-plugin-client-redirects/package.json b/packages/docusaurus-plugin-client-redirects/package.json index 396b3dba90..a86b71664e 100644 --- a/packages/docusaurus-plugin-client-redirects/package.json +++ b/packages/docusaurus-plugin-client-redirects/package.json @@ -26,7 +26,6 @@ "chalk": "^4.1.2", "eta": "^1.12.3", "fs-extra": "^10.0.0", - "globby": "^11.0.2", "lodash": "^4.17.20", "tslib": "^2.3.1" }, diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json index d300663868..93b6026358 100644 --- a/packages/docusaurus-plugin-content-pages/package.json +++ b/packages/docusaurus-plugin-content-pages/package.json @@ -20,15 +20,16 @@ "dependencies": { "@docusaurus/core": "2.0.0-beta.9", "@docusaurus/mdx-loader": "2.0.0-beta.9", - "@docusaurus/types": "2.0.0-beta.9", "@docusaurus/utils": "2.0.0-beta.9", "@docusaurus/utils-validation": "2.0.0-beta.9", "globby": "^11.0.2", - "lodash": "^4.17.20", "remark-admonitions": "^1.2.1", "tslib": "^2.3.1", "webpack": "^5.61.0" }, + "devDependencies": { + "@docusaurus/types": "2.0.0-beta.9" + }, "peerDependencies": { "react": "^16.8.4 || ^17.0.0", "react-dom": "^16.8.4 || ^17.0.0" diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json index 2cefc20714..d441ed77fb 100644 --- a/packages/docusaurus-plugin-debug/package.json +++ b/packages/docusaurus-plugin-debug/package.json @@ -19,12 +19,14 @@ "license": "MIT", "dependencies": { "@docusaurus/core": "2.0.0-beta.9", - "@docusaurus/types": "2.0.0-beta.9", "@docusaurus/utils": "2.0.0-beta.9", "fs-extra": "^10.0.0", "react-json-view": "^1.21.3", "tslib": "^2.3.1" }, + "devDependencies": { + "@docusaurus/types": "2.0.0-beta.9" + }, "peerDependencies": { "react": "^16.8.4 || ^17.0.0", "react-dom": "^16.8.4 || ^17.0.0" diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json index 7b6c8e7f0f..7c3af83054 100644 --- a/packages/docusaurus-plugin-ideal-image/package.json +++ b/packages/docusaurus-plugin-ideal-image/package.json @@ -21,13 +21,13 @@ }, "license": "MIT", "devDependencies": { + "@docusaurus/types": "2.0.0-beta.9", "fs-extra": "^10.0.0" }, "dependencies": { "@docusaurus/core": "2.0.0-beta.9", "@docusaurus/lqip-loader": "2.0.0-beta.9", "@docusaurus/responsive-loader": "1.4.0", - "@docusaurus/types": "2.0.0-beta.9", "@endiliey/react-ideal-image": "^0.0.11", "react-waypoint": "^10.1.0", "sharp": "^0.29.1", diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json index b870604c0c..6645c006da 100644 --- a/packages/docusaurus-theme-classic/package.json +++ b/packages/docusaurus-theme-classic/package.json @@ -29,7 +29,6 @@ "@docusaurus/plugin-content-pages": "2.0.0-beta.9", "@docusaurus/theme-common": "2.0.0-beta.9", "@docusaurus/theme-translations": "2.0.0-beta.9", - "@docusaurus/types": "2.0.0-beta.9", "@docusaurus/utils": "2.0.0-beta.9", "@docusaurus/utils-validation": "2.0.0-beta.9", "@mdx-js/mdx": "^1.6.21", @@ -37,22 +36,22 @@ "chalk": "^4.1.2", "clsx": "^1.1.1", "copy-text-to-clipboard": "^3.0.1", - "fs-extra": "^10.0.0", "globby": "^11.0.2", "infima": "0.2.0-alpha.34", "lodash": "^4.17.20", "postcss": "^8.3.7", "prism-react-renderer": "^1.2.1", "prismjs": "^1.23.0", - "prop-types": "^15.7.2", "react-router-dom": "^5.2.0", "rtlcss": "^3.3.0" }, "devDependencies": { "@docusaurus/module-type-aliases": "2.0.0-beta.9", + "@docusaurus/types": "2.0.0-beta.9", "@types/mdx-js__react": "^1.5.4", "@types/parse-numeric-range": "^0.0.1", "@types/rtlcss": "^3.1.1", + "fs-extra": "^10.0.0", "react-test-renderer": "^17.0.2", "utility-types": "^3.10.0" }, diff --git a/packages/docusaurus-theme-common/package.json b/packages/docusaurus-theme-common/package.json index 0a89ad5de8..4f30871331 100644 --- a/packages/docusaurus-theme-common/package.json +++ b/packages/docusaurus-theme-common/package.json @@ -22,7 +22,6 @@ "@docusaurus/plugin-content-blog": "2.0.0-beta.9", "@docusaurus/plugin-content-docs": "2.0.0-beta.9", "@docusaurus/plugin-content-pages": "2.0.0-beta.9", - "@docusaurus/types": "2.0.0-beta.9", "clsx": "^1.1.1", "fs-extra": "^10.0.0", "parse-numeric-range": "^1.3.0", @@ -31,6 +30,7 @@ }, "devDependencies": { "@docusaurus/module-type-aliases": "2.0.0-beta.9", + "@docusaurus/types": "2.0.0-beta.9", "lodash": "^4.17.20" }, "peerDependencies": { diff --git a/packages/docusaurus-utils-common/package.json b/packages/docusaurus-utils-common/package.json index 6d8d82e6d5..76639b7505 100644 --- a/packages/docusaurus-utils-common/package.json +++ b/packages/docusaurus-utils-common/package.json @@ -18,9 +18,11 @@ }, "license": "MIT", "dependencies": { - "@docusaurus/types": "2.0.0-beta.9", "tslib": "^2.3.1" }, + "devDependencies": { + "@docusaurus/types": "2.0.0-beta.9" + }, "engines": { "node": ">=14" } diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json index 8f3febb9b8..2f311bd33b 100644 --- a/packages/docusaurus-utils/package.json +++ b/packages/docusaurus-utils/package.json @@ -20,7 +20,6 @@ "dependencies": { "@docusaurus/types": "2.0.0-beta.9", "@mdx-js/runtime": "^1.6.22", - "@types/github-slugger": "^1.3.0", "chalk": "^4.1.2", "escape-string-regexp": "^4.0.0", "fs-extra": "^10.0.0", diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json index 4000e8996b..a8c6f575f0 100644 --- a/packages/docusaurus/package.json +++ b/packages/docusaurus/package.json @@ -32,9 +32,11 @@ }, "devDependencies": { "@docusaurus/module-type-aliases": "2.0.0-beta.9", + "@docusaurus/types": "2.0.0-beta.9", "@types/copy-webpack-plugin": "^8.0.1", "@types/css-minimizer-webpack-plugin": "^3.0.2", "@types/detect-port": "^1.3.0", + "@types/github-slugger": "^1.3.0", "@types/mini-css-extract-plugin": "^1.4.3", "@types/nprogress": "^0.2.0", "@types/react-dom": "^17.0.9", @@ -56,7 +58,6 @@ "@babel/traverse": "^7.12.13", "@docusaurus/cssnano-preset": "2.0.0-beta.9", "@docusaurus/react-loadable": "5.5.2", - "@docusaurus/types": "2.0.0-beta.9", "@docusaurus/utils": "2.0.0-beta.9", "@docusaurus/utils-common": "2.0.0-beta.9", "@docusaurus/utils-validation": "2.0.0-beta.9", @@ -109,7 +110,6 @@ "semver": "^7.3.4", "serve-handler": "^6.1.3", "shelljs": "^0.8.4", - "std-env": "^2.2.1", "strip-ansi": "^6.0.0", "terser-webpack-plugin": "^5.2.4", "tslib": "^2.3.1", diff --git a/website/package.json b/website/package.json index 06b8981408..176f2a2279 100644 --- a/website/package.json +++ b/website/package.json @@ -68,7 +68,7 @@ }, "devDependencies": { "@tsconfig/docusaurus": "^1.0.4", - "@types/jest": "^25.2.1", + "@types/jest": "^26.0.20", "cross-env": "^7.0.3", "fs-extra": "^10.0.0", "image-size": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index c1ffe7ab44..fe9afb453c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4231,14 +4231,6 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/jest@^25.2.1": - version "25.2.3" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.2.3.tgz#33d27e4c4716caae4eced355097a47ad363fdcaf" - integrity sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw== - dependencies: - jest-diff "^25.2.1" - pretty-format "^25.2.1" - "@types/jest@^26.0.20": version "26.0.24" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" @@ -6674,7 +6666,7 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.0.0, ci-info@^3.1.1, ci-info@^3.2.0: +ci-info@^3.0.0, ci-info@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6" integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A== @@ -8369,11 +8361,6 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" -diff-sequences@^25.2.6: - version "25.2.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" - integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== - diff-sequences@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" @@ -12159,16 +12146,6 @@ jest-config@^26.6.3: micromatch "^4.0.2" pretty-format "^26.6.2" -jest-diff@^25.2.1: - version "25.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" - integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.6" - jest-get-type "^25.2.6" - pretty-format "^25.5.0" - jest-diff@^26.0.0, jest-diff@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" @@ -16447,7 +16424,7 @@ pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -pretty-format@^25.2.1, pretty-format@^25.5.0: +pretty-format@^25.5.0: version "25.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== @@ -18642,13 +18619,6 @@ statsd-client@0.4.7: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -std-env@^2.2.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" - integrity sha512-eOsoKTWnr6C8aWrqJJ2KAReXoa7Vn5Ywyw6uCXgA/xDhxPoaIsBa5aNJmISY04dLwXPBnDHW4diGM7Sn5K4R/g== - dependencies: - ci-info "^3.1.1" - std-env@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182"