From e7ed470520ae76e22166847f756adbef487a0e21 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 14:12:51 +0100 Subject: [PATCH 01/20] cpy-cli --- packages/gatsby-legacy-polyfills/package.json | 2 +- .../gatsby-plugin-gatsby-cloud/package.json | 1 - packages/gatsby-plugin-offline/package.json | 2 +- yarn.lock | 115 ++++++++++-------- 4 files changed, 69 insertions(+), 51 deletions(-) diff --git a/packages/gatsby-legacy-polyfills/package.json b/packages/gatsby-legacy-polyfills/package.json index 03b890dc040ea..c4a13f534877f 100644 --- a/packages/gatsby-legacy-polyfills/package.json +++ b/packages/gatsby-legacy-polyfills/package.json @@ -35,7 +35,7 @@ "chokidar-cli": "^3.0.0", "codegen.macro": "^4.1.0", "core-js": "3.9.0", - "cpy-cli": "^3.1.1", + "cpy-cli": "^4.2.0", "cross-env": "^7.0.3", "event-target-polyfill": "^0.0.3", "execa": "^5.1.1", diff --git a/packages/gatsby-plugin-gatsby-cloud/package.json b/packages/gatsby-plugin-gatsby-cloud/package.json index 22886b70f1b68..9704f38687344 100644 --- a/packages/gatsby-plugin-gatsby-cloud/package.json +++ b/packages/gatsby-plugin-gatsby-cloud/package.json @@ -19,7 +19,6 @@ "@babel/cli": "^7.20.7", "@babel/core": "^7.20.7", "babel-preset-gatsby-package": "^3.4.0-next.1", - "cpy-cli": "^3.1.1", "cross-env": "^7.0.3", "del-cli": "^3.0.1", "msw": "^0.49.2", diff --git a/packages/gatsby-plugin-offline/package.json b/packages/gatsby-plugin-offline/package.json index cf9a3d1464920..cf53d23e5a7bb 100644 --- a/packages/gatsby-plugin-offline/package.json +++ b/packages/gatsby-plugin-offline/package.json @@ -19,7 +19,7 @@ "@babel/cli": "^7.20.7", "@babel/core": "^7.20.7", "babel-preset-gatsby-package": "^3.4.0-next.1", - "cpy-cli": "^3.1.1", + "cpy-cli": "^4.2.0", "cross-env": "^7.0.3", "gatsby-plugin-utils": "^4.4.0-next.2", "rewire": "^6.0.0" diff --git a/yarn.lock b/yarn.lock index aa3cb829a4233..62476d94adb38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5920,6 +5920,11 @@ arrify@^2.0.1: resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug== +arrify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/arrify/-/arrify-3.0.0.tgz#ccdefb8eaf2a1d2ab0da1ca2ce53118759fd46bc" + integrity sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw== + asap@^2.0.0, asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -8337,38 +8342,37 @@ counteraction@^1.3.0: resolved "https://registry.yarnpkg.com/counteraction/-/counteraction-1.3.0.tgz#a12fa46a6815c4e39bef6610111ec77753c59fa7" integrity sha512-NzT5asTvOpoZ4MEfVaiqJKudPD2n1b4yfr4sAnwFhX/+4MNclakGOutK44iY7DlGNUtAOPCiHLVx9b81b6l9kA== -cp-file@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-7.0.0.tgz#b9454cfd07fe3b974ab9ea0e5f29655791a9b8cd" - integrity sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw== +cp-file@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-9.1.0.tgz#e98e30db72d57d47b5b1d444deb70d05e5684921" + integrity sha512-3scnzFj/94eb7y4wyXRWwvzLFaQp87yyfTnChIjlfYrVqp5lVO3E2hIJMeQIltUT0K2ZAB3An1qXcBmwGyvuwA== dependencies: graceful-fs "^4.1.2" make-dir "^3.0.0" nested-error-stacks "^2.0.0" p-event "^4.1.0" -cpy-cli@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/cpy-cli/-/cpy-cli-3.1.1.tgz#2adb06544102c948ce098e522d5b8ddcf4f7c0b4" - integrity sha512-HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg== +cpy-cli@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/cpy-cli/-/cpy-cli-4.2.0.tgz#d60bf9ac776486af20aac2fa4fb95f8f10b35ce8" + integrity sha512-b04b+cbdr29CdpREPKw/itrfjO43Ty0Aj7wRM6M6LoE4GJxZJCk9Xp+Eu1IqztkKh3LxIBt1tDplENsa6KYprg== dependencies: - cpy "^8.0.0" - meow "^6.1.1" + cpy "^9.0.0" + meow "^10.1.2" -cpy@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/cpy/-/cpy-8.1.0.tgz#e8ac07f3caeb0113bd55326e5cda052c19fa6c60" - integrity sha512-XwlImkjPxMr01qXqC564VD4rfcDQ2eKtYmFlCy0ixsLRJ1cwYVUBh+v47jsQTO1IrmvdjqO813VpDQ0JiTuOdA== +cpy@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/cpy/-/cpy-9.0.1.tgz#7f3ad0ad5bafe0bc70645c4bb567969927cadb9f" + integrity sha512-D9U0DR5FjTCN3oMTcFGktanHnAG5l020yvOCR1zKILmAyPP7I/9pl6NFgRbDcmSENtbK1sQLBz1p9HIOlroiNg== dependencies: - arrify "^2.0.1" - cp-file "^7.0.0" - globby "^9.2.0" - has-glob "^1.0.0" - junk "^3.1.0" + arrify "^3.0.0" + cp-file "^9.1.0" + globby "^13.1.1" + junk "^4.0.0" + micromatch "^4.0.4" nested-error-stacks "^2.1.0" - p-all "^2.1.0" - p-filter "^2.1.0" - p-map "^3.0.0" + p-filter "^3.0.0" + p-map "^5.3.0" crc-32@~1.2.0, crc-32@~1.2.1: version "1.2.1" @@ -11885,6 +11889,17 @@ globby@^11.0.1, globby@^11.0.3, globby@^11.0.4, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" +globby@^13.1.1: + version "13.1.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff" + integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw== + dependencies: + dir-glob "^3.0.1" + fast-glob "^3.2.11" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^4.0.0" + globby@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515" @@ -12207,13 +12222,6 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-glob/-/has-glob-1.0.0.tgz#9aaa9eedbffb1ba3990a7b0010fb678ee0081207" - integrity sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc= - dependencies: - is-glob "^3.0.0" - has-property-descriptors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" @@ -13423,7 +13431,7 @@ is-glob@^2.0.0: dependencies: is-extglob "^1.0.0" -is-glob@^3.0.0, is-glob@^3.1.0: +is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" dependencies: @@ -14723,10 +14731,10 @@ jsprim@^1.2.2: array-includes "^3.1.5" object.assign "^4.1.2" -junk@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" - integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ== +junk@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/junk/-/junk-4.0.0.tgz#9b1104ddf5281cd24ffa3c8a7443d19ce192b37f" + integrity sha512-ojtSU++zLJ3jQG9bAYjg94w+/DOJtRyD7nPaerMFrBhmdVmiV5/exYH5t4uHga4G/95nT6hr1OJoKIFbYbrW5w== jwa@^1.4.1: version "1.4.1" @@ -16108,6 +16116,24 @@ memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" +meow@^10.1.2: + version "10.1.5" + resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f" + integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw== + dependencies: + "@types/minimist" "^1.2.2" + camelcase-keys "^7.0.0" + decamelize "^5.0.0" + decamelize-keys "^1.1.0" + hard-rejection "^2.1.0" + minimist-options "4.1.0" + normalize-package-data "^3.0.2" + read-pkg-up "^8.0.0" + redent "^4.0.0" + trim-newlines "^4.0.2" + type-fest "^1.2.2" + yargs-parser "^20.2.9" + meow@^10.1.3: version "10.1.3" resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.3.tgz#21689959a7d00e8901aff30d208acb2122eb8088" @@ -17748,13 +17774,6 @@ override-require@^1.1.1: resolved "https://registry.yarnpkg.com/override-require/-/override-require-1.1.1.tgz#6ae22fadeb1f850ffb0cf4c20ff7b87e5eb650df" integrity sha1-auIvresfhQ/7DPTCD/e4fl62UN8= -p-all@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-all/-/p-all-2.1.0.tgz#91419be56b7dee8fe4c5db875d55e0da084244a0" - integrity sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA== - dependencies: - p-map "^2.0.0" - p-any@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-any/-/p-any-3.0.0.tgz#79847aeed70b5d3a10ea625296c0c3d2e90a87b9" @@ -17794,12 +17813,12 @@ p-event@^4.1.0: dependencies: p-timeout "^3.1.0" -p-filter@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-2.1.0.tgz#1b1472562ae7a0f742f0f3d3d3718ea66ff9c09c" - integrity sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw== +p-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-filter/-/p-filter-3.0.0.tgz#ce50e03b24b23930e11679ab8694bd09a2d7ed35" + integrity sha512-QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg== dependencies: - p-map "^2.0.0" + p-map "^5.1.0" p-finally@^1.0.0: version "1.0.0" @@ -17856,7 +17875,7 @@ p-map-series@^1.0.0: dependencies: p-reduce "^1.0.0" -p-map@^2.0.0, p-map@^2.1.0: +p-map@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== @@ -17875,7 +17894,7 @@ p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-map@^5.5.0: +p-map@^5.1.0, p-map@^5.3.0, p-map@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715" integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg== From 864e6456157e152759e237260e06f3f017ab2f65 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 14:25:14 +0100 Subject: [PATCH 02/20] boxen --- packages/gatsby-telemetry/package.json | 2 +- yarn.lock | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/packages/gatsby-telemetry/package.json b/packages/gatsby-telemetry/package.json index a5849b39f1129..33a9632267faf 100644 --- a/packages/gatsby-telemetry/package.json +++ b/packages/gatsby-telemetry/package.json @@ -11,7 +11,7 @@ "@babel/runtime": "^7.20.7", "@turist/fetch": "^7.2.0", "@turist/time": "^0.0.2", - "boxen": "^4.2.0", + "boxen": "^5.1.2", "configstore": "^5.0.1", "fs-extra": "^10.1.0", "gatsby-core-utils": "^4.4.0-next.2", diff --git a/yarn.lock b/yarn.lock index 62476d94adb38..8905a9f25eda9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6657,20 +6657,6 @@ boxen@^1.2.1: term-size "^1.2.0" widest-line "^2.0.0" -boxen@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" - integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^5.3.1" - chalk "^3.0.0" - cli-boxes "^2.2.0" - string-width "^4.1.0" - term-size "^2.1.0" - type-fest "^0.8.1" - widest-line "^3.1.0" - boxen@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" @@ -22727,11 +22713,6 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" -term-size@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.1.0.tgz#3aec444c07a7cf936e157c1dc224b590c3c7eef2" - integrity sha512-I42EWhJ+2aeNQawGx1VtpO0DFI9YcfuvAMNIdKyf/6sRbHJ4P+ZQ/zIT87tE+ln1ymAGcCJds4dolfSAS0AcNg== - terminal-link@^2.0.0, terminal-link@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" From acf7abacdd7098d637db2343778a405bae6287e4 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 14:30:35 +0100 Subject: [PATCH 03/20] fs-extra Co-authored-by: Adam Schay --- packages/create-gatsby/package.json | 2 +- packages/gatsby-cli/package.json | 2 +- packages/gatsby-core-utils/package.json | 2 +- packages/gatsby-dev-cli/package.json | 2 +- packages/gatsby-legacy-polyfills/package.json | 2 +- packages/gatsby-plugin-feed/package.json | 2 +- packages/gatsby-plugin-gatsby-cloud/package.json | 2 +- packages/gatsby-plugin-image/package.json | 2 +- packages/gatsby-plugin-mdx/package.json | 2 +- packages/gatsby-plugin-page-creator/package.json | 2 +- packages/gatsby-plugin-preload-fonts/package.json | 2 +- packages/gatsby-plugin-sharp/package.json | 2 +- packages/gatsby-plugin-utils/package.json | 2 +- packages/gatsby-remark-copy-linked-files/package.json | 2 +- packages/gatsby-source-contentful/package.json | 2 +- packages/gatsby-source-filesystem/package.json | 2 +- packages/gatsby-source-wordpress/package.json | 2 +- packages/gatsby-telemetry/package.json | 2 +- packages/gatsby-transformer-sharp/package.json | 2 +- packages/gatsby-transformer-sqip/package.json | 2 +- packages/gatsby-worker/package.json | 2 +- packages/gatsby/package.json | 2 +- yarn.lock | 9 +++++++++ 23 files changed, 31 insertions(+), 22 deletions(-) diff --git a/packages/create-gatsby/package.json b/packages/create-gatsby/package.json index bbda78afd2d26..f5ca9540e6a90 100644 --- a/packages/create-gatsby/package.json +++ b/packages/create-gatsby/package.json @@ -25,7 +25,7 @@ "common-tags": "^1.8.2", "enquirer": "^2.3.6", "execa": "^5.1.1", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-plugin-utils": "^4.4.0-next.2", "joi": "^17.7.0", "microbundle": "^0.15.1", diff --git a/packages/gatsby-cli/package.json b/packages/gatsby-cli/package.json index 054006b664bd0..181da3db7042c 100644 --- a/packages/gatsby-cli/package.json +++ b/packages/gatsby-cli/package.json @@ -30,7 +30,7 @@ "envinfo": "^7.8.1", "execa": "^5.1.1", "fs-exists-cached": "^1.0.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-telemetry": "^4.4.0-next.2", "hosted-git-info": "^3.0.8", diff --git a/packages/gatsby-core-utils/package.json b/packages/gatsby-core-utils/package.json index eeba20b7593f8..fe574b4c0fa57 100644 --- a/packages/gatsby-core-utils/package.json +++ b/packages/gatsby-core-utils/package.json @@ -66,7 +66,7 @@ "configstore": "^5.0.1", "fastq": "^1.13.0", "file-type": "^16.5.3", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "got": "^11.8.5", "import-from": "^4.0.0", "lmdb": "2.5.3", diff --git a/packages/gatsby-dev-cli/package.json b/packages/gatsby-dev-cli/package.json index 0946c89e5fe0c..51530ee2b4410 100644 --- a/packages/gatsby-dev-cli/package.json +++ b/packages/gatsby-dev-cli/package.json @@ -16,7 +16,7 @@ "del": "^6.1.1", "execa": "^5.1.1", "find-yarn-workspace-root": "^2.0.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "got": "^11.8.6", "is-absolute": "^1.0.0", "lodash": "^4.17.21", diff --git a/packages/gatsby-legacy-polyfills/package.json b/packages/gatsby-legacy-polyfills/package.json index c4a13f534877f..f1a33ccb04415 100644 --- a/packages/gatsby-legacy-polyfills/package.json +++ b/packages/gatsby-legacy-polyfills/package.json @@ -39,7 +39,7 @@ "cross-env": "^7.0.3", "event-target-polyfill": "^0.0.3", "execa": "^5.1.1", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "microbundle": "^0.15.1", "npm-run-all": "^4.1.5", "object-assign": "^4.1.1", diff --git a/packages/gatsby-plugin-feed/package.json b/packages/gatsby-plugin-feed/package.json index bb14023f83f7f..158a0e5592ccc 100644 --- a/packages/gatsby-plugin-feed/package.json +++ b/packages/gatsby-plugin-feed/package.json @@ -10,7 +10,7 @@ "@babel/runtime": "^7.20.7", "@hapi/joi": "^15.1.1", "common-tags": "^1.8.2", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-plugin-utils": "^4.4.0-next.2", "lodash.merge": "^4.6.2", "rss": "^1.2.2" diff --git a/packages/gatsby-plugin-gatsby-cloud/package.json b/packages/gatsby-plugin-gatsby-cloud/package.json index 9704f38687344..278e80acc8141 100644 --- a/packages/gatsby-plugin-gatsby-cloud/package.json +++ b/packages/gatsby-plugin-gatsby-cloud/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@babel/runtime": "^7.20.7", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-telemetry": "^4.4.0-next.2", "kebab-hash": "^0.1.2", diff --git a/packages/gatsby-plugin-image/package.json b/packages/gatsby-plugin-image/package.json index 534835f00d669..f9664d428f814 100644 --- a/packages/gatsby-plugin-image/package.json +++ b/packages/gatsby-plugin-image/package.json @@ -91,7 +91,7 @@ "camelcase": "^5.3.1", "chokidar": "^3.5.3", "common-tags": "^1.8.2", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-plugin-utils": "^4.4.0-next.2", "objectFitPolyfill": "^2.3.5", diff --git a/packages/gatsby-plugin-mdx/package.json b/packages/gatsby-plugin-mdx/package.json index 8241d63dcc3cc..27c7b7be9a34b 100644 --- a/packages/gatsby-plugin-mdx/package.json +++ b/packages/gatsby-plugin-mdx/package.json @@ -33,7 +33,7 @@ "astring": "^1.8.3", "deepmerge": "^4.2.2", "estree-util-build-jsx": "^2.2.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-plugin-utils": "^4.4.0-next.2", "gray-matter": "^4.0.3", diff --git a/packages/gatsby-plugin-page-creator/package.json b/packages/gatsby-plugin-page-creator/package.json index 1d7e39df490b7..35af0e86a416c 100644 --- a/packages/gatsby-plugin-page-creator/package.json +++ b/packages/gatsby-plugin-page-creator/package.json @@ -29,7 +29,7 @@ "@sindresorhus/slugify": "^1.1.2", "chokidar": "^3.5.3", "fs-exists-cached": "^1.0.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-page-utils": "^3.4.0-next.2", "gatsby-plugin-utils": "^4.4.0-next.2", diff --git a/packages/gatsby-plugin-preload-fonts/package.json b/packages/gatsby-plugin-preload-fonts/package.json index 149cde5f83030..25029fd03d0a1 100644 --- a/packages/gatsby-plugin-preload-fonts/package.json +++ b/packages/gatsby-plugin-preload-fonts/package.json @@ -14,7 +14,7 @@ "@babel/runtime": "^7.20.7", "chalk": "^4.1.2", "date-fns": "^2.28.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "graphql-request": "^1.8.2", "progress": "^2.0.3", diff --git a/packages/gatsby-plugin-sharp/package.json b/packages/gatsby-plugin-sharp/package.json index d1a1c88c0621f..98b6008fe532a 100644 --- a/packages/gatsby-plugin-sharp/package.json +++ b/packages/gatsby-plugin-sharp/package.json @@ -12,7 +12,7 @@ "bluebird": "^3.7.2", "debug": "^4.3.4", "filenamify": "^4.3.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-plugin-utils": "^4.4.0-next.2", "lodash": "^4.17.21", diff --git a/packages/gatsby-plugin-utils/package.json b/packages/gatsby-plugin-utils/package.json index 63435cf70c5db..603c764c4ff54 100644 --- a/packages/gatsby-plugin-utils/package.json +++ b/packages/gatsby-plugin-utils/package.json @@ -48,7 +48,7 @@ "dependencies": { "@babel/runtime": "^7.20.7", "fastq": "^1.13.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-sharp": "^1.4.0-next.1", "graphql-compose": "^9.0.10", diff --git a/packages/gatsby-remark-copy-linked-files/package.json b/packages/gatsby-remark-copy-linked-files/package.json index 9f64ebf33b509..8ba982683f457 100644 --- a/packages/gatsby-remark-copy-linked-files/package.json +++ b/packages/gatsby-remark-copy-linked-files/package.json @@ -9,7 +9,7 @@ "dependencies": { "@babel/runtime": "^7.20.7", "cheerio": "^1.0.0-rc.10", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "is-relative-url": "^3.0.0", "lodash": "^4.17.21", "path-is-inside": "^1.0.2", diff --git a/packages/gatsby-source-contentful/package.json b/packages/gatsby-source-contentful/package.json index 8e3b8c3807227..4b6d3e047b737 100644 --- a/packages/gatsby-source-contentful/package.json +++ b/packages/gatsby-source-contentful/package.json @@ -15,7 +15,7 @@ "chalk": "^4.1.2", "common-tags": "^1.8.2", "contentful": "^9.2.14", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-plugin-utils": "^4.4.0-next.2", "gatsby-source-filesystem": "^5.4.0-next.2", diff --git a/packages/gatsby-source-filesystem/package.json b/packages/gatsby-source-filesystem/package.json index 5824529dac3ec..3ce10bbc4f32a 100644 --- a/packages/gatsby-source-filesystem/package.json +++ b/packages/gatsby-source-filesystem/package.json @@ -10,7 +10,7 @@ "@babel/runtime": "^7.20.7", "chokidar": "^3.5.3", "file-type": "^16.5.4", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "md5-file": "^5.0.0", "mime": "^2.6.0", diff --git a/packages/gatsby-source-wordpress/package.json b/packages/gatsby-source-wordpress/package.json index 151d91cb457c0..247420c4c829b 100644 --- a/packages/gatsby-source-wordpress/package.json +++ b/packages/gatsby-source-wordpress/package.json @@ -26,7 +26,7 @@ "fast-json-stable-stringify": "^2.1.0", "file-type": "^15.0.1", "filesize": "^6.4.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-plugin-catch-links": "^5.4.0-next.1", "gatsby-plugin-utils": "^4.4.0-next.2", diff --git a/packages/gatsby-telemetry/package.json b/packages/gatsby-telemetry/package.json index 33a9632267faf..24da294b2f24f 100644 --- a/packages/gatsby-telemetry/package.json +++ b/packages/gatsby-telemetry/package.json @@ -13,7 +13,7 @@ "@turist/time": "^0.0.2", "boxen": "^5.1.2", "configstore": "^5.0.1", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "git-up": "^7.0.0", "is-docker": "^2.2.1", diff --git a/packages/gatsby-transformer-sharp/package.json b/packages/gatsby-transformer-sharp/package.json index 9339e1f98cec0..8a638408943fb 100644 --- a/packages/gatsby-transformer-sharp/package.json +++ b/packages/gatsby-transformer-sharp/package.json @@ -10,7 +10,7 @@ "@babel/runtime": "^7.20.7", "bluebird": "^3.7.2", "common-tags": "^1.8.2", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-plugin-utils": "^4.4.0-next.2", "probe-image-size": "^7.2.3", "semver": "^7.3.8", diff --git a/packages/gatsby-transformer-sqip/package.json b/packages/gatsby-transformer-sqip/package.json index 6279bc19b26f5..9ddc9e97ec384 100644 --- a/packages/gatsby-transformer-sqip/package.json +++ b/packages/gatsby-transformer-sqip/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@babel/runtime": "^7.20.7", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-plugin-sharp": "^5.4.0-next.2", "md5-file": "^5.0.0", diff --git a/packages/gatsby-worker/package.json b/packages/gatsby-worker/package.json index b2348c5ca8ffd..72604e3950e8c 100644 --- a/packages/gatsby-worker/package.json +++ b/packages/gatsby-worker/package.json @@ -9,7 +9,7 @@ "dependencies": { "@babel/core": "^7.20.7", "@babel/runtime": "^7.20.7", - "fs-extra": "^10.0.0", + "fs-extra": "^11.1.0", "signal-exit": "^3.0.7" }, "devDependencies": { diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 34544c5960368..3d83870587294 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -89,7 +89,7 @@ "file-loader": "^6.2.0", "find-cache-dir": "^3.3.2", "fs-exists-cached": "1.0.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "gatsby-cli": "^5.4.0-next.2", "gatsby-core-utils": "^4.4.0-next.2", "gatsby-graphiql-explorer": "^3.4.0-next.1", diff --git a/yarn.lock b/yarn.lock index 8905a9f25eda9..915d7a18097ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11368,6 +11368,15 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" +fs-extra@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed" + integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" From a7ae9fae94db121d1636bdadf2d207a48fe8d19a Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 14:40:41 +0100 Subject: [PATCH 04/20] jscodeshift --- packages/gatsby-codemods/package.json | 2 +- yarn.lock | 56 ++++++++++++++++++--------- 2 files changed, 39 insertions(+), 19 deletions(-) diff --git a/packages/gatsby-codemods/package.json b/packages/gatsby-codemods/package.json index 396c6dc780791..70135274b8d80 100644 --- a/packages/gatsby-codemods/package.json +++ b/packages/gatsby-codemods/package.json @@ -31,7 +31,7 @@ "@babel/runtime": "^7.20.7", "execa": "^5.1.1", "graphql": "^16.6.0", - "jscodeshift": "^0.12.0", + "jscodeshift": "^0.14.0", "recast": "^0.20.5" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 915d7a18097ff..031cfcd5d55e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6030,6 +6030,13 @@ ast-types@0.14.2, ast-types@^0.14.1, ast-types@^0.14.2: dependencies: tslib "^2.0.1" +ast-types@0.15.2: + version "0.15.2" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d" + integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg== + dependencies: + tslib "^2.0.1" + ast-types@^0.7.0: version "0.7.8" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9" @@ -14477,10 +14484,10 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jscodeshift@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.12.0.tgz#de7302f3d3e1f4b3b36f9e484f451ba4ab7cc1f4" - integrity sha512-LEgr+wklbtEQD6SptyVYox+YZ7v+4NQeWHgqASedxl2LxQ+/kSQs6Nhs/GX+ymVOu84Hsz9/C2hQfDY89dKZ6A== +jscodeshift@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881" + integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA== dependencies: "@babel/core" "^7.13.16" "@babel/parser" "^7.13.16" @@ -14492,14 +14499,14 @@ jscodeshift@^0.12.0: "@babel/preset-typescript" "^7.13.0" "@babel/register" "^7.13.16" babel-core "^7.0.0-bridge.0" - colors "^1.1.2" + chalk "^4.1.2" flow-parser "0.*" graceful-fs "^4.2.4" - micromatch "^3.1.10" + micromatch "^4.0.4" neo-async "^2.5.0" node-dir "^0.1.17" - recast "^0.20.4" - temp "^0.8.1" + recast "^0.21.0" + temp "^0.8.4" write-file-atomic "^2.3.0" jsdom@^15.0.0: @@ -20092,7 +20099,7 @@ readline-sync@^1.4.9: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda" integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No= -recast@^0.20.3, recast@^0.20.4, recast@^0.20.5: +recast@^0.20.3, recast@^0.20.5: version "0.20.5" resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae" integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ== @@ -20102,6 +20109,16 @@ recast@^0.20.3, recast@^0.20.4, recast@^0.20.5: source-map "~0.6.1" tslib "^2.0.1" +recast@^0.21.0: + version "0.21.5" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495" + integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg== + dependencies: + ast-types "0.15.2" + esprima "~4.0.0" + source-map "~0.6.1" + tslib "^2.0.1" + rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" @@ -20925,16 +20942,19 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" -rimraf@~2.2.6: - version "2.2.8" - resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" - rimraf@~2.4.0: version "2.4.5" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da" dependencies: glob "^6.0.1" +rimraf@~2.6.2: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + rollup-plugin-auto-external@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/rollup-plugin-auto-external/-/rollup-plugin-auto-external-2.0.0.tgz#98fd137d66c1cbe0f4e245b31560a72dbde896aa" @@ -22709,12 +22729,12 @@ temp-write@^3.4.0: temp-dir "^1.0.0" uuid "^3.0.1" -temp@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" +temp@^0.8.4: + version "0.8.4" + resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2" + integrity sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg== dependencies: - os-tmpdir "^1.0.0" - rimraf "~2.2.6" + rimraf "~2.6.2" term-size@^1.2.0: version "1.2.0" From 9020fdb0ccff75ccac61495cf491edcc43dd9dae Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 14:43:00 +0100 Subject: [PATCH 05/20] recast --- packages/gatsby-codemods/package.json | 2 +- yarn.lock | 38 +++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/packages/gatsby-codemods/package.json b/packages/gatsby-codemods/package.json index 70135274b8d80..b372041eb1ac7 100644 --- a/packages/gatsby-codemods/package.json +++ b/packages/gatsby-codemods/package.json @@ -32,7 +32,7 @@ "execa": "^5.1.1", "graphql": "^16.6.0", "jscodeshift": "^0.14.0", - "recast": "^0.20.5" + "recast": "^0.22.0" }, "devDependencies": { "@babel/cli": "^7.20.7", diff --git a/yarn.lock b/yarn.lock index 031cfcd5d55e7..073620ff9c131 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5955,6 +5955,16 @@ assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" +assert@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32" + integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A== + dependencies: + es6-object-assign "^1.1.0" + is-nan "^1.2.1" + object-is "^1.0.1" + util "^0.12.0" + assetgraph@^6.5.0: version "6.5.0" resolved "https://registry.yarnpkg.com/assetgraph/-/assetgraph-6.5.0.tgz#a138b29346763648536f98b9d699788f98be188e" @@ -9929,6 +9939,11 @@ es6-iterator@2.0.3, es6-iterator@^2.0.3, es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" +es6-object-assign@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" + integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw== + es6-promise@^4.0.3, es6-promise@^4.0.5, es6-promise@^4.1.1: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" @@ -13496,6 +13511,14 @@ is-module@^1.0.0: resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= +is-nan@^1.2.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" + integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + is-negated-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" @@ -20099,7 +20122,7 @@ readline-sync@^1.4.9: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda" integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No= -recast@^0.20.3, recast@^0.20.5: +recast@^0.20.3: version "0.20.5" resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae" integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ== @@ -20119,6 +20142,17 @@ recast@^0.21.0: source-map "~0.6.1" tslib "^2.0.1" +recast@^0.22.0: + version "0.22.0" + resolved "https://registry.yarnpkg.com/recast/-/recast-0.22.0.tgz#1dd3bf1b86e5eb810b044221a1a734234ed3e9c0" + integrity sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ== + dependencies: + assert "^2.0.0" + ast-types "0.15.2" + esprima "~4.0.0" + source-map "~0.6.1" + tslib "^2.0.1" + rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" @@ -24006,7 +24040,7 @@ util.promisify@~1.0.0: has-symbols "^1.0.1" object.getownpropertydescriptors "^2.1.0" -util@^0.12.3: +util@^0.12.0, util@^0.12.3: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== From 89e76a21969e9a60913e362638987eee3af23153 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 14:52:25 +0100 Subject: [PATCH 06/20] webpack-virtual-modules --- packages/gatsby/package.json | 2 +- yarn.lock | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 3d83870587294..90ade6dd1734b 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -172,7 +172,7 @@ "webpack-dev-middleware": "^4.3.0", "webpack-merge": "^5.8.0", "webpack-stats-plugin": "^1.1.1", - "webpack-virtual-modules": "^0.3.2", + "webpack-virtual-modules": "^0.5.0", "xstate": "^4.35.1", "yaml-loader": "^0.6.0" }, diff --git a/yarn.lock b/yarn.lock index 073620ff9c131..253a8cfe49262 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8985,7 +8985,7 @@ debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, de dependencies: ms "2.1.2" -debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7: +debug@^3.0.1, debug@^3.1.0, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -24562,12 +24562,10 @@ webpack-stats-plugin@^1.1.1: resolved "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-1.1.1.tgz#11aabf6ad536fd2843eb2e11a58d3485dc111b3e" integrity sha512-aWwE/YuO2W7VCOyWwyDJ7BRSYRYjeXat+X31YiasMM3FS6/4X9W4Mb9Q0g+jIdVgArr1Mb08sHBJKMT5M9+gVA== -webpack-virtual-modules@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.3.2.tgz#b7baa30971a22d99451f897db053af48ec29ad2c" - integrity sha512-RXQXioY6MhzM4CNQwmBwKXYgBs6ulaiQ8bkNQEl2J6Z+V+s7lgl/wGvaI/I0dLnYKB8cKsxQc17QOAVIphPLDw== - dependencies: - debug "^3.0.0" +webpack-virtual-modules@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz#362f14738a56dae107937ab98ea7062e8bdd3b6c" + integrity sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw== webpack@^5.75.0: version "5.75.0" From ef97cd6e5ddb174f3405bec683c18d9a5b47da88 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:01:19 +0100 Subject: [PATCH 07/20] mime --- packages/gatsby-source-filesystem/package.json | 2 +- packages/gatsby/package.json | 2 +- yarn.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gatsby-source-filesystem/package.json b/packages/gatsby-source-filesystem/package.json index 3ce10bbc4f32a..7b64545c866c8 100644 --- a/packages/gatsby-source-filesystem/package.json +++ b/packages/gatsby-source-filesystem/package.json @@ -13,7 +13,7 @@ "fs-extra": "^11.1.0", "gatsby-core-utils": "^4.4.0-next.2", "md5-file": "^5.0.0", - "mime": "^2.6.0", + "mime": "^3.0.0", "pretty-bytes": "^5.6.0", "valid-url": "^1.0.9", "xstate": "^4.34.0" diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 90ade6dd1734b..8d8fda3f80051 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -124,7 +124,7 @@ "meant": "^1.0.3", "memoizee": "^0.4.15", "micromatch": "^4.0.5", - "mime": "^2.6.0", + "mime": "^3.0.0", "mini-css-extract-plugin": "1.6.2", "mitt": "^1.2.0", "moment": "^2.29.4", diff --git a/yarn.lock b/yarn.lock index 253a8cfe49262..7a0098f457083 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16727,7 +16727,7 @@ mime@3.0.0, mime@^3.0.0: resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A== -mime@^2.0.3, mime@^2.2.0, mime@^2.4.4, mime@^2.6.0: +mime@^2.0.3, mime@^2.2.0, mime@^2.4.4: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== From d64f25fc97533f0ac1b87d1e8b8b52398004591d Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:07:26 +0100 Subject: [PATCH 08/20] babel-plugin-macros --- packages/gatsby-plugin-emotion/package.json | 2 +- packages/gatsby-plugin-image/package.json | 2 +- yarn.lock | 122 ++++++++++---------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/packages/gatsby-plugin-emotion/package.json b/packages/gatsby-plugin-emotion/package.json index 7e7dfd9e4ad22..4f870f71c129c 100644 --- a/packages/gatsby-plugin-emotion/package.json +++ b/packages/gatsby-plugin-emotion/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@babel/runtime": "^7.20.7", - "@emotion/babel-preset-css-prop": "^11.2.0" + "@emotion/babel-preset-css-prop": "^11.10.0" }, "devDependencies": { "@babel/cli": "^7.20.7", diff --git a/packages/gatsby-plugin-image/package.json b/packages/gatsby-plugin-image/package.json index f9664d428f814..28141705b6e57 100644 --- a/packages/gatsby-plugin-image/package.json +++ b/packages/gatsby-plugin-image/package.json @@ -52,7 +52,7 @@ "@types/react": "^18.0.26", "@types/react-dom": "^18.0.10", "ast-pretty-print": "^2.0.1", - "babel-plugin-macros": "^2.8.0", + "babel-plugin-macros": "^3.1.0", "cross-env": "^7.0.3", "cssnano": "^4.1.11", "del-cli": "^3.0.1", diff --git a/yarn.lock b/yarn.lock index 7a0098f457083..fda62a30c55fc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -415,7 +415,7 @@ dependencies: "@babel/types" "^7.20.7" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6": +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.0.0-beta.49", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== @@ -921,7 +921,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.12.1", "@babel/plugin-syntax-jsx@^7.12.13", "@babel/plugin-syntax-jsx@^7.18.6", "@babel/plugin-syntax-jsx@^7.2.0": +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.12.1", "@babel/plugin-syntax-jsx@^7.17.12", "@babel/plugin-syntax-jsx@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== @@ -1212,7 +1212,7 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.18.6" -"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.12.11", "@babel/plugin-transform-react-jsx@^7.18.6": +"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.11", "@babel/plugin-transform-react-jsx@^7.17.12", "@babel/plugin-transform-react-jsx@^7.18.6": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz#025d85a1935fd7e19dfdcb1b1d4df34d4da484f7" integrity sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ== @@ -1472,7 +1472,7 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.7", "@babel/runtime@^7.3.4", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.7", "@babel/runtime@^7.3.4", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.20.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd" integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ== @@ -1545,71 +1545,71 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@emotion/babel-plugin-jsx-pragmatic@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@emotion/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-0.1.5.tgz#27debfe9c27c4d83574d509787ae553bf8a34d7e" - integrity sha512-y+3AJ0SItMDaAgGPVkQBC/S/BaqaPACkQ6MyCI2CUlrjTxKttTVfD3TMtcs7vLEcLxqzZ1xiG0vzwCXjhopawQ== - dependencies: - "@babel/plugin-syntax-jsx" "^7.2.0" - -"@emotion/babel-plugin@^11.2.0": - version "11.3.0" - resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.3.0.tgz#3a16850ba04d8d9651f07f3fb674b3436a4fb9d7" - integrity sha512-UZKwBV2rADuhRp+ZOGgNWg2eYgbzKzQXfQPtJbu/PLy8onurxlNCLvxMQEvlr1/GudguPI5IU9qIY1+2z1M5bA== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/plugin-syntax-jsx" "^7.12.13" - "@babel/runtime" "^7.13.10" - "@emotion/hash" "^0.8.0" - "@emotion/memoize" "^0.7.5" - "@emotion/serialize" "^1.0.2" - babel-plugin-macros "^2.6.1" +"@emotion/babel-plugin-jsx-pragmatic@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-0.2.0.tgz#6fdd78600417973fa2610704693158181d8505b7" + integrity sha512-VPfKAtb/bVyu5y+HzCPj9bb2nHnj9yX5mMAU7N0pIDcrFZo8aqDyHXLYF8BD7tY4pNL09N87dygVLKIkQvshJw== + dependencies: + "@babel/plugin-syntax-jsx" "^7.17.12" + +"@emotion/babel-plugin@^11.10.0": + version "11.10.5" + resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c" + integrity sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA== + dependencies: + "@babel/helper-module-imports" "^7.16.7" + "@babel/plugin-syntax-jsx" "^7.17.12" + "@babel/runtime" "^7.18.3" + "@emotion/hash" "^0.9.0" + "@emotion/memoize" "^0.8.0" + "@emotion/serialize" "^1.1.1" + babel-plugin-macros "^3.1.0" convert-source-map "^1.5.0" escape-string-regexp "^4.0.0" find-root "^1.1.0" source-map "^0.5.7" - stylis "^4.0.3" + stylis "4.1.3" -"@emotion/babel-preset-css-prop@^11.2.0": - version "11.2.0" - resolved "https://registry.yarnpkg.com/@emotion/babel-preset-css-prop/-/babel-preset-css-prop-11.2.0.tgz#c7e945f56b2610b438f0dc8ae5253fc55488de0e" - integrity sha512-9XLQm2eLPYTho+Cx1LQTDA1rATjoAaB4O+ds55XDvoAa+Z16Hhg8y5Vihj3C8E6+ilDM8SV5A9Z6z+yj0YIRBg== +"@emotion/babel-preset-css-prop@^11.10.0": + version "11.10.0" + resolved "https://registry.yarnpkg.com/@emotion/babel-preset-css-prop/-/babel-preset-css-prop-11.10.0.tgz#23922787561d8376782b0e9006323512fe797275" + integrity sha512-oN2lCP0NJTEt80IIeFM1RbmapeEVNYzKXYk2pYirAuom9WvV9Oz/aJQN5Hn3RyBMPaY+Of1OZYpTVMle2jUm4g== dependencies: - "@babel/plugin-transform-react-jsx" "^7.12.1" - "@babel/runtime" "^7.7.2" - "@emotion/babel-plugin" "^11.2.0" - "@emotion/babel-plugin-jsx-pragmatic" "^0.1.5" + "@babel/plugin-transform-react-jsx" "^7.17.12" + "@babel/runtime" "^7.18.3" + "@emotion/babel-plugin" "^11.10.0" + "@emotion/babel-plugin-jsx-pragmatic" "^0.2.0" -"@emotion/hash@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" - integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== +"@emotion/hash@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.0.tgz#c5153d50401ee3c027a57a177bc269b16d889cb7" + integrity sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ== -"@emotion/memoize@^0.7.4", "@emotion/memoize@^0.7.5": - version "0.7.5" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" - integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== +"@emotion/memoize@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f" + integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA== -"@emotion/serialize@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.0.2.tgz#77cb21a0571c9f68eb66087754a65fa97bfcd965" - integrity sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A== +"@emotion/serialize@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.1.tgz#0595701b1902feded8a96d293b26be3f5c1a5cf0" + integrity sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA== dependencies: - "@emotion/hash" "^0.8.0" - "@emotion/memoize" "^0.7.4" - "@emotion/unitless" "^0.7.5" - "@emotion/utils" "^1.0.0" + "@emotion/hash" "^0.9.0" + "@emotion/memoize" "^0.8.0" + "@emotion/unitless" "^0.8.0" + "@emotion/utils" "^1.2.0" csstype "^3.0.2" -"@emotion/unitless@^0.7.5": - version "0.7.5" - resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" - integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== +"@emotion/unitless@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db" + integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw== -"@emotion/utils@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.0.0.tgz#abe06a83160b10570816c913990245813a2fd6af" - integrity sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA== +"@emotion/utils@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561" + integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw== "@eslint/eslintrc@^0.4.3": version "0.4.3" @@ -6300,7 +6300,7 @@ babel-plugin-lodash@^3.3.4: lodash "^4.17.10" require-package-name "^2.0.1" -babel-plugin-macros@^2.6.1, babel-plugin-macros@^2.8.0: +babel-plugin-macros@^2.8.0: version "2.8.0" resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== @@ -22437,10 +22437,10 @@ styletron-standard@^3.1.0: csstype "^3.0.0" inline-style-prefixer "^5.1.0" -stylis@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.3.tgz#0d714765f3f694a685550f0c45411ebf90a9bded" - integrity sha512-iAxdFyR9cHKp4H5M2dJlDnvcb/3TvPprzlKjvYVbH7Sh+y8hjY/mUu/ssdcvVz6Z4lKI3vsoS0jAkMYmX7ozfA== +stylis@4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7" + integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA== stylus-loader@^3.0.2: version "3.0.2" From cd1c098162c9d6336c7e88303d474a7b82b5e4bf Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:11:53 +0100 Subject: [PATCH 09/20] debug --- packages/gatsby/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 8d8fda3f80051..9c6de36c787b3 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -65,7 +65,7 @@ "css-minimizer-webpack-plugin": "^2.0.0", "css.escape": "^1.5.1", "date-fns": "^2.29.3", - "debug": "^3.2.7", + "debug": "^4.3.4", "deepmerge": "^4.2.2", "detect-port": "^1.5.1", "devcert": "^1.2.2", From 277aa08ab98160709581eb4adbb3918a6073281c Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:16:49 +0100 Subject: [PATCH 10/20] partytown --- packages/gatsby/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 9c6de36c787b3..321f47b008c62 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -18,7 +18,7 @@ "@babel/runtime": "^7.20.7", "@babel/traverse": "^7.20.10", "@babel/types": "^7.20.7", - "@builder.io/partytown": "^0.5.2", + "@builder.io/partytown": "^0.7.3", "@gatsbyjs/reach-router": "^2.0.0", "@gatsbyjs/webpack-hot-middleware": "^2.25.3", "@graphql-codegen/add": "^3.2.3", diff --git a/yarn.lock b/yarn.lock index fda62a30c55fc..f6af9d3da2377 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1518,10 +1518,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@builder.io/partytown@^0.5.2": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@builder.io/partytown/-/partytown-0.5.4.tgz#1a89069978734e132fa4a59414ddb64e4b94fde7" - integrity sha512-qnikpQgi30AS01aFlNQV6l8/qdZIcP76mp90ti+u4rucXHsn4afSKivQXApqxvrQG9+Ibv45STyvHizvxef/7A== +"@builder.io/partytown@^0.7.3": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@builder.io/partytown/-/partytown-0.7.3.tgz#879052ca7175757eaa3e0a85b735f7231bc7c32f" + integrity sha512-hA6WYBFD/exyrEvs0JSvQIILfH0/Jlr5amqE3lt1nPehCus+eQm4ob3LBMRkSaFDWz9clHSLtsGwG52dUjGy3g== "@contentful/rich-text-react-renderer@^15.16.2": version "15.16.2" From a074f25643cc6f7e35c2e9bb210ed1ae27c6638b Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:19:17 +0100 Subject: [PATCH 11/20] cookie --- packages/gatsby/package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 321f47b008c62..06c16e5008db9 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -58,7 +58,7 @@ "chokidar": "^3.5.3", "common-tags": "^1.8.2", "compression": "^1.7.4", - "cookie": "^0.4.1", + "cookie": "^0.5.0", "core-js": "^3.22.3", "cors": "^2.8.5", "css-loader": "^5.2.7", diff --git a/yarn.lock b/yarn.lock index f6af9d3da2377..768c35a1b592d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8196,12 +8196,12 @@ cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" -cookie@0.5.0: +cookie@0.5.0, cookie@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== -cookie@^0.4.1, cookie@^0.4.2, cookie@~0.4.1: +cookie@^0.4.2, cookie@~0.4.1: version "0.4.2" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== From d9fc2a98e1326f483b6a533c8440a224a504d3ff Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:21:58 +0100 Subject: [PATCH 12/20] misc --- packages/gatsby-transformer-screenshot/lambda/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby-transformer-screenshot/lambda/package.json b/packages/gatsby-transformer-screenshot/lambda/package.json index 8e791df5ec232..ea413f1dbe053 100644 --- a/packages/gatsby-transformer-screenshot/lambda/package.json +++ b/packages/gatsby-transformer-screenshot/lambda/package.json @@ -1,7 +1,7 @@ { "dependencies": { "chrome-aws-lambda": "^2.1.1", - "gatsby-core-utils": "^2.14.0-next.0", + "gatsby-core-utils": "^4.4.0-next.2", "puppeteer-core": "^3.3.0" }, "devDependencies": { From d5341cb65bf468434c77e1043e2e272c332c186a Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:33:25 +0100 Subject: [PATCH 13/20] glob --- packages/gatsby-page-utils/package.json | 2 +- packages/gatsby-plugin-offline/package.json | 2 +- packages/gatsby-source-wordpress/package.json | 2 +- packages/gatsby/package.json | 2 +- yarn.lock | 18 ++++++++++++++++++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/gatsby-page-utils/package.json b/packages/gatsby-page-utils/package.json index 3a7cbd2b63859..f9c7c9660d364 100644 --- a/packages/gatsby-page-utils/package.json +++ b/packages/gatsby-page-utils/package.json @@ -31,7 +31,7 @@ "chokidar": "^3.5.3", "fs-exists-cached": "^1.0.0", "gatsby-core-utils": "^4.4.0-next.2", - "glob": "^7.2.3", + "glob": "^8.0.3", "lodash": "^4.17.21", "micromatch": "^4.0.5" }, diff --git a/packages/gatsby-plugin-offline/package.json b/packages/gatsby-plugin-offline/package.json index cf53d23e5a7bb..98784630a1c8a 100644 --- a/packages/gatsby-plugin-offline/package.json +++ b/packages/gatsby-plugin-offline/package.json @@ -10,7 +10,7 @@ "@babel/runtime": "^7.20.7", "cheerio": "^1.0.0-rc.10", "gatsby-core-utils": "^4.4.0-next.2", - "glob": "^7.2.3", + "glob": "^8.0.3", "idb-keyval": "^3.2.0", "lodash": "^4.17.21", "workbox-build": "^4.3.1" diff --git a/packages/gatsby-source-wordpress/package.json b/packages/gatsby-source-wordpress/package.json index 247420c4c829b..095cb1ed8ca5f 100644 --- a/packages/gatsby-source-wordpress/package.json +++ b/packages/gatsby-source-wordpress/package.json @@ -31,7 +31,7 @@ "gatsby-plugin-catch-links": "^5.4.0-next.1", "gatsby-plugin-utils": "^4.4.0-next.2", "gatsby-source-filesystem": "^5.4.0-next.2", - "glob": "^7.2.3", + "glob": "^8.0.3", "got": "^11.8.6", "lodash": "^4.17.21", "node-fetch": "^2.6.7", diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 06c16e5008db9..cc64ae8c28647 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -104,7 +104,7 @@ "gatsby-script": "^2.4.0-next.0", "gatsby-telemetry": "^4.4.0-next.2", "gatsby-worker": "^2.4.0-next.1", - "glob": "^7.2.3", + "glob": "^8.0.3", "globby": "^11.1.0", "got": "^11.8.6", "graphql": "^16.6.0", diff --git a/yarn.lock b/yarn.lock index 768c35a1b592d..3225cb7f5c915 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11829,6 +11829,17 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -16805,6 +16816,13 @@ minimatch@5.1.1: dependencies: brace-expansion "^2.0.1" +minimatch@^5.0.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" + integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0, minimist-options@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" From 2279b161187ab0240d478ed933c9df1928c7c93c Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 15:35:08 +0100 Subject: [PATCH 14/20] camelcase --- packages/gatsby-plugin-image/package.json | 2 +- yarn.lock | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/gatsby-plugin-image/package.json b/packages/gatsby-plugin-image/package.json index 28141705b6e57..bcac2ca46d401 100644 --- a/packages/gatsby-plugin-image/package.json +++ b/packages/gatsby-plugin-image/package.json @@ -88,7 +88,7 @@ "@babel/traverse": "^7.20.10", "babel-jsx-utils": "^1.1.0", "babel-plugin-remove-graphql-queries": "^5.4.0-next.2", - "camelcase": "^5.3.1", + "camelcase": "^6.3.0", "chokidar": "^3.5.3", "common-tags": "^1.8.2", "fs-extra": "^11.1.0", diff --git a/yarn.lock b/yarn.lock index 3225cb7f5c915..2f99b2880ddd4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7103,6 +7103,11 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== +camelcase@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== + caniuse-api@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" From 46bf51fa8e66302cec98a9703870a5a3d90e430d Mon Sep 17 00:00:00 2001 From: LekoArts Date: Wed, 4 Jan 2023 16:06:58 +0100 Subject: [PATCH 15/20] js-yaml --- packages/gatsby-transformer-yaml/package.json | 5 ++--- yarn.lock | 10 +--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/gatsby-transformer-yaml/package.json b/packages/gatsby-transformer-yaml/package.json index 19327b706d5b7..3ac588d1f98d8 100644 --- a/packages/gatsby-transformer-yaml/package.json +++ b/packages/gatsby-transformer-yaml/package.json @@ -8,9 +8,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.7", - "js-yaml": "^3.14.1", - "lodash": "^4.17.21", - "unist-util-select": "^1.5.0" + "js-yaml": "^4.1.0", + "lodash": "^4.17.21" }, "devDependencies": { "@babel/cli": "^7.20.7", diff --git a/yarn.lock b/yarn.lock index 2f99b2880ddd4..7a4861dcb7c5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8601,7 +8601,7 @@ css-select@^4.1.3, css-select@^4.2.1: domutils "^2.8.0" nth-check "^2.0.1" -css-selector-parser@^1.0.0, css-selector-parser@^1.1.0: +css-selector-parser@^1.0.0: version "1.4.1" resolved "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.4.1.tgz#03f9cb8a81c3e5ab2c51684557d5aaf6d2569759" integrity sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g== @@ -23746,14 +23746,6 @@ unist-util-remove-position@^4.0.0: "@types/unist" "^2.0.0" unist-util-visit "^4.0.0" -unist-util-select@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/unist-util-select/-/unist-util-select-1.5.0.tgz#a93c2be8c0f653827803b81331adec2aa24cd933" - dependencies: - css-selector-parser "^1.1.0" - debug "^2.2.0" - nth-check "^1.0.1" - unist-util-select@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/unist-util-select/-/unist-util-select-3.0.4.tgz#702c9dc1db1b2bbbfe27f796fce99e43f25edc60" From 070a09ba5aaa4445f2d4eed5f5b8971e08bf057e Mon Sep 17 00:00:00 2001 From: LekoArts Date: Thu, 5 Jan 2023 09:29:10 +0100 Subject: [PATCH 16/20] trigger ci From 5d065b2ae5cacd079ab24850fff025968e5cb39f Mon Sep 17 00:00:00 2001 From: LekoArts Date: Thu, 5 Jan 2023 09:40:55 +0100 Subject: [PATCH 17/20] fix cpy commands --- packages/gatsby-legacy-polyfills/package.json | 2 +- packages/gatsby-plugin-offline/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gatsby-legacy-polyfills/package.json b/packages/gatsby-legacy-polyfills/package.json index f1a33ccb04415..a7ae31531ea4f 100644 --- a/packages/gatsby-legacy-polyfills/package.json +++ b/packages/gatsby-legacy-polyfills/package.json @@ -16,7 +16,7 @@ "license": "MIT", "scripts": { "build": "npm-run-all --npm-path npm -p build:*", - "build:exclude": "cpy \"src/exclude.js\" \"./dist\"", + "build:exclude": "cpy 'exclude.js' '../dist' --cwd=./src", "build:polyfills": "microbundle -f iife -i src/polyfills.js --no-sourcemap --external=none", "prepare": "cross-env NODE_ENV=production npm run build", "watch": "npm-run-all --npm-path npm -p watch:*", diff --git a/packages/gatsby-plugin-offline/package.json b/packages/gatsby-plugin-offline/package.json index 98784630a1c8a..b4a5a2d5e5d37 100644 --- a/packages/gatsby-plugin-offline/package.json +++ b/packages/gatsby-plugin-offline/package.json @@ -47,7 +47,7 @@ "scripts": { "build": "npm run build:src && npm run build:sw-append", "build:src": "babel src --out-dir . --ignore \"**/__tests__,src/sw-append.js\"", - "build:sw-append": "cpy src/sw-append.js .", + "build:sw-append": "cpy 'sw-append.js' '../' --cwd=./src", "prepare": "cross-env NODE_ENV=production npm run build", "watch": "npm run build:sw-append -- --watch & npm run build:src -- --watch" }, From 7a639b884f93e11ae961cbe9d65fc9bc0b7d2e2b Mon Sep 17 00:00:00 2001 From: LekoArts Date: Thu, 5 Jan 2023 10:29:03 +0100 Subject: [PATCH 18/20] revert codemods change --- packages/gatsby-codemods/package.json | 4 +- yarn.lock | 67 ++++----------------------- 2 files changed, 10 insertions(+), 61 deletions(-) diff --git a/packages/gatsby-codemods/package.json b/packages/gatsby-codemods/package.json index b372041eb1ac7..b9548a2b0f340 100644 --- a/packages/gatsby-codemods/package.json +++ b/packages/gatsby-codemods/package.json @@ -31,8 +31,8 @@ "@babel/runtime": "^7.20.7", "execa": "^5.1.1", "graphql": "^16.6.0", - "jscodeshift": "^0.14.0", - "recast": "^0.22.0" + "jscodeshift": "0.13.1", + "recast": "0.20.5" }, "devDependencies": { "@babel/cli": "^7.20.7", diff --git a/yarn.lock b/yarn.lock index 7a4861dcb7c5c..da7b1ee72db80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5955,16 +5955,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" -assert@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32" - integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A== - dependencies: - es6-object-assign "^1.1.0" - is-nan "^1.2.1" - object-is "^1.0.1" - util "^0.12.0" - assetgraph@^6.5.0: version "6.5.0" resolved "https://registry.yarnpkg.com/assetgraph/-/assetgraph-6.5.0.tgz#a138b29346763648536f98b9d699788f98be188e" @@ -6040,13 +6030,6 @@ ast-types@0.14.2, ast-types@^0.14.1, ast-types@^0.14.2: dependencies: tslib "^2.0.1" -ast-types@0.15.2: - version "0.15.2" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d" - integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg== - dependencies: - tslib "^2.0.1" - ast-types@^0.7.0: version "0.7.8" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz#902d2e0d60d071bdcd46dc115e1809ed11c138a9" @@ -9944,11 +9927,6 @@ es6-iterator@2.0.3, es6-iterator@^2.0.3, es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" -es6-object-assign@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" - integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw== - es6-promise@^4.0.3, es6-promise@^4.0.5, es6-promise@^4.1.1: version "4.2.8" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" @@ -13527,14 +13505,6 @@ is-module@^1.0.0: resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= -is-nan@^1.2.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" - integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - is-negated-glob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" @@ -14523,10 +14493,10 @@ jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" -jscodeshift@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.14.0.tgz#7542e6715d6d2e8bde0b4e883f0ccea358b46881" - integrity sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA== +jscodeshift@0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.13.1.tgz#69bfe51e54c831296380585c6d9e733512aecdef" + integrity sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ== dependencies: "@babel/core" "^7.13.16" "@babel/parser" "^7.13.16" @@ -14541,10 +14511,10 @@ jscodeshift@^0.14.0: chalk "^4.1.2" flow-parser "0.*" graceful-fs "^4.2.4" - micromatch "^4.0.4" + micromatch "^3.1.10" neo-async "^2.5.0" node-dir "^0.1.17" - recast "^0.21.0" + recast "^0.20.4" temp "^0.8.4" write-file-atomic "^2.3.0" @@ -20145,7 +20115,7 @@ readline-sync@^1.4.9: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.9.tgz#3eda8e65f23cd2a17e61301b1f0003396af5ecda" integrity sha1-PtqOZfI80qF+YTAbHwADOWr17No= -recast@^0.20.3: +recast@0.20.5, recast@^0.20.3, recast@^0.20.4: version "0.20.5" resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.5.tgz#8e2c6c96827a1b339c634dd232957d230553ceae" integrity sha512-E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ== @@ -20155,27 +20125,6 @@ recast@^0.20.3: source-map "~0.6.1" tslib "^2.0.1" -recast@^0.21.0: - version "0.21.5" - resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495" - integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg== - dependencies: - ast-types "0.15.2" - esprima "~4.0.0" - source-map "~0.6.1" - tslib "^2.0.1" - -recast@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/recast/-/recast-0.22.0.tgz#1dd3bf1b86e5eb810b044221a1a734234ed3e9c0" - integrity sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ== - dependencies: - assert "^2.0.0" - ast-types "0.15.2" - esprima "~4.0.0" - source-map "~0.6.1" - tslib "^2.0.1" - rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" @@ -24055,7 +24004,7 @@ util.promisify@~1.0.0: has-symbols "^1.0.1" object.getownpropertydescriptors "^2.1.0" -util@^0.12.0, util@^0.12.3: +util@^0.12.3: version "0.12.5" resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc" integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA== From 7f42e8ec22ebc335f6dff0eb2d1e3810c4eba43c Mon Sep 17 00:00:00 2001 From: LekoArts Date: Thu, 5 Jan 2023 11:54:34 +0100 Subject: [PATCH 19/20] Revert "glob" This reverts commit d5341cb65bf468434c77e1043e2e272c332c186a. --- packages/gatsby-page-utils/package.json | 2 +- packages/gatsby-plugin-offline/package.json | 2 +- packages/gatsby-source-wordpress/package.json | 2 +- packages/gatsby/package.json | 2 +- yarn.lock | 18 ------------------ 5 files changed, 4 insertions(+), 22 deletions(-) diff --git a/packages/gatsby-page-utils/package.json b/packages/gatsby-page-utils/package.json index f9c7c9660d364..3a7cbd2b63859 100644 --- a/packages/gatsby-page-utils/package.json +++ b/packages/gatsby-page-utils/package.json @@ -31,7 +31,7 @@ "chokidar": "^3.5.3", "fs-exists-cached": "^1.0.0", "gatsby-core-utils": "^4.4.0-next.2", - "glob": "^8.0.3", + "glob": "^7.2.3", "lodash": "^4.17.21", "micromatch": "^4.0.5" }, diff --git a/packages/gatsby-plugin-offline/package.json b/packages/gatsby-plugin-offline/package.json index b4a5a2d5e5d37..40c17720c9138 100644 --- a/packages/gatsby-plugin-offline/package.json +++ b/packages/gatsby-plugin-offline/package.json @@ -10,7 +10,7 @@ "@babel/runtime": "^7.20.7", "cheerio": "^1.0.0-rc.10", "gatsby-core-utils": "^4.4.0-next.2", - "glob": "^8.0.3", + "glob": "^7.2.3", "idb-keyval": "^3.2.0", "lodash": "^4.17.21", "workbox-build": "^4.3.1" diff --git a/packages/gatsby-source-wordpress/package.json b/packages/gatsby-source-wordpress/package.json index 095cb1ed8ca5f..247420c4c829b 100644 --- a/packages/gatsby-source-wordpress/package.json +++ b/packages/gatsby-source-wordpress/package.json @@ -31,7 +31,7 @@ "gatsby-plugin-catch-links": "^5.4.0-next.1", "gatsby-plugin-utils": "^4.4.0-next.2", "gatsby-source-filesystem": "^5.4.0-next.2", - "glob": "^8.0.3", + "glob": "^7.2.3", "got": "^11.8.6", "lodash": "^4.17.21", "node-fetch": "^2.6.7", diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index cc64ae8c28647..06c16e5008db9 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -104,7 +104,7 @@ "gatsby-script": "^2.4.0-next.0", "gatsby-telemetry": "^4.4.0-next.2", "gatsby-worker": "^2.4.0-next.1", - "glob": "^8.0.3", + "glob": "^7.2.3", "globby": "^11.1.0", "got": "^11.8.6", "graphql": "^16.6.0", diff --git a/yarn.lock b/yarn.lock index da7b1ee72db80..b0a2b98ea5da1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11812,17 +11812,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.3: - version "8.0.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" - integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - global-dirs@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -16791,13 +16780,6 @@ minimatch@5.1.1: dependencies: brace-expansion "^2.0.1" -minimatch@^5.0.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" - integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== - dependencies: - brace-expansion "^2.0.1" - minimist-options@4.1.0, minimist-options@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" From de26bd27cc430dbed4b16a73af172ed52e6984ee Mon Sep 17 00:00:00 2001 From: LekoArts Date: Fri, 6 Jan 2023 09:43:59 +0100 Subject: [PATCH 20/20] update more fs-extra --- integration-tests/artifacts/package.json | 2 +- integration-tests/esm-in-gatsby-files/package.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/artifacts/package.json b/integration-tests/artifacts/package.json index 536babbff865d..5391d51f56c37 100644 --- a/integration-tests/artifacts/package.json +++ b/integration-tests/artifacts/package.json @@ -18,7 +18,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "jest": "^27.2.1" } } diff --git a/integration-tests/esm-in-gatsby-files/package.json b/integration-tests/esm-in-gatsby-files/package.json index 3bb2320f48f58..55830b5e237fc 100644 --- a/integration-tests/esm-in-gatsby-files/package.json +++ b/integration-tests/esm-in-gatsby-files/package.json @@ -19,7 +19,7 @@ "@types/react-dom": "^18.0.8", "babel-preset-gatsby-package": "^2.4.0", "execa": "^4.0.1", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "jest": "^27.2.1", "node-fetch": "^2.6.0", "typescript": "^4.8.4" diff --git a/package.json b/package.json index 3544ba7799aa6..017d95bcd37df 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "eslint-plugin-jsx-a11y": "^6.6.1", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.31.11", - "fs-extra": "^10.1.0", + "fs-extra": "^11.1.0", "glob": "^7.2.3", "husky": "3.1.0", "ignore": "^5.2.4",