diff --git a/.circleci/config.yml b/.circleci/config.yml index 6134072533569..e40e3f77dfab2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,22 +128,6 @@ aliases: - notify-status: condition: << parameters.nightly >> - e2e_tests_gatsby-image_alias: &e2e_tests_gatsby-image_alias - <<: *e2e-executor - parameters: - nightly: - type: boolean - default: false - environment: - CYPRESS_PROJECT_ID: ave32k - CYPRESS_RECORD_KEY: fb3cb6e0-a0f9-48b2-aa9a-95e8ef150a85 - steps: - - e2e-test: - test_path: e2e-tests/gatsby-image - skip_file_change_test: << parameters.nightly >> - - notify-status: - condition: << parameters.nightly >> - commands: notify-status: parameters: @@ -379,15 +363,6 @@ jobs: command: 'DEBUG=start-server-and-test yarn start-server-and-test "yarn develop 2>&1 | tee log.txt" :8000 "! cat log.txt | grep -E ''ERROR #|Require stack:''"' working_directory: /tmp/e2e-tests/gatsby-pnp - e2e_tests_gatsby-image: - <<: *e2e_tests_gatsby-image_alias - - e2e_tests_gatsby-image_with_experimental_react: - <<: *e2e_tests_gatsby-image_alias - - e2e_tests_gatsby-image_with_next_react: - <<: *e2e_tests_gatsby-image_alias - e2e_tests_development_runtime: <<: *e2e_tests_development_runtime_alias @@ -603,10 +578,6 @@ workflows: jobs: - bootstrap-with-experimental-react: version: "next" - - e2e_tests_gatsby-image_with_next_react: - nightly: true - requires: - - bootstrap-with-experimental-react - e2e_tests_development_runtime_with_next_react: nightly: true requires: @@ -626,10 +597,6 @@ workflows: jobs: - bootstrap-with-experimental-react: version: "experimental" - - e2e_tests_gatsby-image_with_experimental_react: - nightly: true - requires: - - bootstrap-with-experimental-react - e2e_tests_development_runtime_with_experimental_react: nightly: true requires: @@ -697,8 +664,6 @@ workflows: <<: *e2e-test-workflow - e2e_tests_path-prefix: <<: *e2e-test-workflow - - e2e_tests_gatsby-image: - <<: *e2e-test-workflow - e2e_tests_gatsby-static-image: <<: *e2e-test-workflow - e2e_tests_visual-regression: diff --git a/.eslintignore b/.eslintignore index 0cf3940554934..6a171fd03861b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -22,7 +22,6 @@ integration-tests packages/*/*.js packages/gatsby-source-shopify/**/*.js packages/gatsby-plugin-preload-fonts/prepare/*.js -packages/gatsby-image/withIEPolyfill/index.js packages/gatsby/cache-dir/commonjs/**/* packages/gatsby-admin/public packages/gatsby/gatsby-admin-public diff --git a/packages/gatsby-image/.babelrc b/deprecated-packages/gatsby-image/.babelrc similarity index 100% rename from packages/gatsby-image/.babelrc rename to deprecated-packages/gatsby-image/.babelrc diff --git a/packages/gatsby-image/.eslintrc.yaml b/deprecated-packages/gatsby-image/.eslintrc.yaml similarity index 100% rename from packages/gatsby-image/.eslintrc.yaml rename to deprecated-packages/gatsby-image/.eslintrc.yaml diff --git a/packages/gatsby-image/.gitignore b/deprecated-packages/gatsby-image/.gitignore similarity index 100% rename from packages/gatsby-image/.gitignore rename to deprecated-packages/gatsby-image/.gitignore diff --git a/packages/gatsby-image/.npmignore b/deprecated-packages/gatsby-image/.npmignore similarity index 100% rename from packages/gatsby-image/.npmignore rename to deprecated-packages/gatsby-image/.npmignore diff --git a/packages/gatsby-image/CHANGELOG.md b/deprecated-packages/gatsby-image/CHANGELOG.md similarity index 100% rename from packages/gatsby-image/CHANGELOG.md rename to deprecated-packages/gatsby-image/CHANGELOG.md diff --git a/packages/gatsby-image/README.md b/deprecated-packages/gatsby-image/README.md similarity index 100% rename from packages/gatsby-image/README.md rename to deprecated-packages/gatsby-image/README.md diff --git a/packages/gatsby-image/index.d.ts b/deprecated-packages/gatsby-image/index.d.ts similarity index 100% rename from packages/gatsby-image/index.d.ts rename to deprecated-packages/gatsby-image/index.d.ts diff --git a/packages/gatsby-image/package.json b/deprecated-packages/gatsby-image/package.json similarity index 100% rename from packages/gatsby-image/package.json rename to deprecated-packages/gatsby-image/package.json diff --git a/packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap b/deprecated-packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap similarity index 100% rename from packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap rename to deprecated-packages/gatsby-image/src/__tests__/__snapshots__/index.js.snap diff --git a/packages/gatsby-image/src/__tests__/index.js b/deprecated-packages/gatsby-image/src/__tests__/index.js similarity index 100% rename from packages/gatsby-image/src/__tests__/index.js rename to deprecated-packages/gatsby-image/src/__tests__/index.js diff --git a/packages/gatsby-image/src/index.js b/deprecated-packages/gatsby-image/src/index.js similarity index 100% rename from packages/gatsby-image/src/index.js rename to deprecated-packages/gatsby-image/src/index.js diff --git a/packages/gatsby-image/src/withIEPolyfill/index.js b/deprecated-packages/gatsby-image/src/withIEPolyfill/index.js similarity index 100% rename from packages/gatsby-image/src/withIEPolyfill/index.js rename to deprecated-packages/gatsby-image/src/withIEPolyfill/index.js diff --git a/packages/gatsby-image/tsconfig.json b/deprecated-packages/gatsby-image/tsconfig.json similarity index 100% rename from packages/gatsby-image/tsconfig.json rename to deprecated-packages/gatsby-image/tsconfig.json diff --git a/packages/gatsby-image/withIEPolyfill/index.d.ts b/deprecated-packages/gatsby-image/withIEPolyfill/index.d.ts similarity index 100% rename from packages/gatsby-image/withIEPolyfill/index.d.ts rename to deprecated-packages/gatsby-image/withIEPolyfill/index.d.ts diff --git a/packages/gatsby-source-wordpress/package.json b/packages/gatsby-source-wordpress/package.json index ca5f91524416f..78ef8e5ced96f 100644 --- a/packages/gatsby-source-wordpress/package.json +++ b/packages/gatsby-source-wordpress/package.json @@ -29,7 +29,7 @@ "filesize": "^6.1.0", "fs-extra": "^9.0.1", "gatsby-core-utils": "^2.12.0-next.0", - "gatsby-image": "^3.12.0-next.0", + "gatsby-image": "^3.10.0", "gatsby-plugin-catch-links": "^3.12.0-next.0", "gatsby-source-filesystem": "^3.12.0-next.0", "glob": "^7.1.6", diff --git a/renovate.json5 b/renovate.json5 index 765b0c06bf3ef..dd5bfb1ada2cc 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -3379,250 +3379,6 @@ "commitMessageSuffix": "{{#unless groupName}} for gatsby-graphiql-explorer{{/unless}}", "dependencyDashboardApproval": true }, - { - "matchPaths": [ - "packages/gatsby-image/package.json" - ], - "matchDepTypes": [ - "devDependencies" - ], - "matchUpdateTypes": [ - "patch", - "minor" - ], - "groupName": "[DEV] minor and patch dependencies for gatsby-image", - "groupSlug": "gatsby-image-dev-minor", - "automerge": true, - "excludePackageNames": [ - "eslint", - "prettier", - "cross-env", - "execa", - "mini-css-extract-plugin", - "sharp", - "@types/sharp", - "typescript", - "chalk", - "fs-extra", - "@types/fs-extra", - "cheerio", - "semver", - "@types/semver", - "core-js", - "core-js-compat", - "chokidar" - ], - "excludePackagePatterns": [ - "^@babel", - "^eslint-", - "^@typescript-eslint/", - "^@testing-library/" - ], - "commitMessageSuffix": "{{#unless groupName}} for gatsby-image{{/unless}}" - }, - { - "matchPaths": [ - "packages/gatsby-image/package.json" - ], - "matchDepTypes": [ - "devDependencies" - ], - "matchUpdateTypes": [ - "major" - ], - "groupName": "[DEV] major dependencies for gatsby-image", - "groupSlug": "gatsby-image-dev-major", - "automerge": true, - "dependencyDashboardApproval": false, - "excludePackageNames": [ - "eslint", - "prettier", - "cross-env", - "execa", - "mini-css-extract-plugin", - "sharp", - "@types/sharp", - "typescript", - "chalk", - "fs-extra", - "@types/fs-extra", - "cheerio", - "semver", - "@types/semver", - "core-js", - "core-js-compat", - "chokidar" - ], - "excludePackagePatterns": [ - "^@babel", - "^eslint-", - "^@typescript-eslint/", - "^@testing-library/" - ], - "commitMessageSuffix": "{{#unless groupName}} for gatsby-image{{/unless}}" - }, - { - "matchPaths": [ - "packages/gatsby-image/package.json" - ], - "matchDepTypes": [ - "dependencies" - ], - "matchUpdateTypes": [ - "patch", - "minor" - ], - "groupName": "minor and patch dependencies for gatsby-image", - "groupSlug": "gatsby-image-prod-minor", - "excludePackageNames": [ - "eslint", - "prettier", - "cross-env", - "execa", - "mini-css-extract-plugin", - "sharp", - "@types/sharp", - "typescript", - "chalk", - "fs-extra", - "@types/fs-extra", - "cheerio", - "semver", - "@types/semver", - "core-js", - "core-js-compat", - "chokidar" - ], - "excludePackagePatterns": [ - "^@babel", - "^eslint-", - "^@typescript-eslint/", - "^@testing-library/" - ], - "commitMessageSuffix": "{{#unless groupName}} for gatsby-image{{/unless}}" - }, - { - "matchPaths": [ - "packages/gatsby-image/package.json" - ], - "matchDepTypes": [ - "dependencies" - ], - "matchUpdateTypes": [ - "major" - ], - "groupName": "major dependencies for gatsby-image", - "groupSlug": "gatsby-image-prod-major", - "excludePackageNames": [ - "eslint", - "prettier", - "cross-env", - "execa", - "mini-css-extract-plugin", - "sharp", - "@types/sharp", - "typescript", - "chalk", - "fs-extra", - "@types/fs-extra", - "cheerio", - "semver", - "@types/semver", - "core-js", - "core-js-compat", - "chokidar" - ], - "excludePackagePatterns": [ - "^@babel", - "^eslint-", - "^@typescript-eslint/", - "^@testing-library/" - ], - "commitMessageSuffix": "{{#unless groupName}} for gatsby-image{{/unless}}", - "dependencyDashboardApproval": true - }, - { - "matchPaths": [ - "packages/gatsby-image/package.json" - ], - "matchDepTypes": [ - "dependencies" - ], - "groupName": "minor and patch dependencies for gatsby-image", - "groupSlug": "gatsby-image-prod-minor", - "matchPackageNames": [], - "matchUpdateTypes": [ - "patch" - ], - "excludePackageNames": [ - "eslint", - "prettier", - "cross-env", - "execa", - "mini-css-extract-plugin", - "sharp", - "@types/sharp", - "typescript", - "chalk", - "fs-extra", - "@types/fs-extra", - "cheerio", - "semver", - "@types/semver", - "core-js", - "core-js-compat", - "chokidar" - ], - "excludePackagePatterns": [ - "^@babel", - "^eslint-", - "^@typescript-eslint/", - "^@testing-library/" - ], - "commitMessageSuffix": "{{#unless groupName}} for gatsby-image{{/unless}}" - }, - { - "matchPaths": [ - "packages/gatsby-image/package.json" - ], - "matchDepTypes": [ - "dependencies" - ], - "groupName": "major dependencies for gatsby-image", - "groupSlug": "gatsby-image-prod-major", - "matchPackageNames": [], - "matchUpdateTypes": [ - "major", - "minor" - ], - "excludePackageNames": [ - "eslint", - "prettier", - "cross-env", - "execa", - "mini-css-extract-plugin", - "sharp", - "@types/sharp", - "typescript", - "chalk", - "fs-extra", - "@types/fs-extra", - "cheerio", - "semver", - "@types/semver", - "core-js", - "core-js-compat", - "chokidar" - ], - "excludePackagePatterns": [ - "^@babel", - "^eslint-", - "^@typescript-eslint/", - "^@testing-library/" - ], - "commitMessageSuffix": "{{#unless groupName}} for gatsby-image{{/unless}}", - "dependencyDashboardApproval": true - }, { "matchPaths": [ "packages/gatsby-legacy-polyfills/package.json" diff --git a/yarn.lock b/yarn.lock index 1261326bc467b..1e67c8f54001c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1428,7 +1428,7 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@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.1.2", "@babel/runtime@^7.10.0", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.6", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== @@ -4644,10 +4644,10 @@ opentracing "~0.14.3" prom-client "~11.3.0 || ^12.0.0 || ^13.0.0" -"@types/jest@*", "@types/jest@^26.0.24": - version "26.0.24" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" - integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w== +"@types/jest@*": + version "26.0.23" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.23.tgz#a1b7eab3c503b80451d019efb588ec63522ee4e7" + integrity sha512-ZHLmWMJ9jJ9PTiT58juykZpL7KjwJywFN3Rr2pTSkyQfydf/rk22yS7W8p5DaVUMQ2BQC7oYiU3FjbTM/mYrOA== dependencies: jest-diff "^26.0.0" pretty-format "^26.0.0" @@ -4659,6 +4659,14 @@ dependencies: jest-diff "^24.3.0" +"@types/jest@^26.0.24": + version "26.0.24" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.24.tgz#943d11976b16739185913a1936e0de0c4a7d595a" + integrity sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w== + dependencies: + jest-diff "^26.0.0" + pretty-format "^26.0.0" + "@types/joi@^14.3.4": version "14.3.4" resolved "https://registry.yarnpkg.com/@types/joi/-/joi-14.3.4.tgz#eed1e14cbb07716079c814138831a520a725a1e0" @@ -4751,7 +4759,12 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.6.tgz#7b73cce37352936e628c5ba40326193443cfba25" integrity sha512-sRVq8d+ApGslmkE9e3i+D3gFGk7aZHAT+G4cIpIEdLJYPsWiSPwcAnJEjddLQQDqV3Ra2jOclX/Sv6YrvGYiWA== -"@types/node@^14.10.2", "@types/node@^14.14.10", "@types/node@^14.17.4", "@types/node@^14.17.7": +"@types/node@^14.10.2", "@types/node@^14.14.10": + version "14.17.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d" + integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw== + +"@types/node@^14.17.4", "@types/node@^14.17.7": version "14.17.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.7.tgz#e106997493e617edeba52fdbd965930da494113b" integrity sha512-SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag== @@ -12037,7 +12050,14 @@ fastparse@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" -fastq@^1.10.0, fastq@^1.11.1, fastq@^1.6.0: +fastq@^1.10.0, fastq@^1.6.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" + integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + dependencies: + reusify "^1.0.4" + +fastq@^1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807" integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw== @@ -12785,6 +12805,15 @@ gatsby-design-tokens@^2.0.2: dependencies: hex2rgba "^0.0.1" +gatsby-image@^3.11.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/gatsby-image/-/gatsby-image-3.10.0.tgz#f4013561736c0baef8c0ba2c72b760de78bc1b28" + integrity sha512-bbBqR2sY5wWt0qPAyV0Q2RJwy9Gd9Z+cs/go3XZDl/8XktyWSL2znoUPZfBJ1jnJ6VvbyqhDvmr7vM3zM70Xfw== + dependencies: + "@babel/runtime" "^7.14.6" + object-fit-images "^3.2.4" + prop-types "^15.7.2" + gatsby-interface@^0.0.244: version "0.0.244" resolved "https://registry.yarnpkg.com/gatsby-interface/-/gatsby-interface-0.0.244.tgz#76d07099248f55be55b17d9577326a180fa1136d" @@ -16203,11 +16232,6 @@ jest-matcher-utils@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-matchmedia-mock@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/jest-matchmedia-mock/-/jest-matchmedia-mock-1.1.0.tgz#eaae8c5d1dee4e4f7c59f8cb1b38b5d7ea842552" - integrity sha512-REnJRsOSCMpGAlkxmvVTqEBpregyFVi9MPEH3N83W1yLKzDdNehtCkcdDZduXq74PLtfI+11NyM4zKCK5ynV9g== - jest-message-util@^22.4.0, jest-message-util@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7" @@ -21860,7 +21884,7 @@ postcss@6.0.1: source-map "^0.5.6" supports-color "^3.2.3" -postcss@7.0.36, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5: +postcss@7.0.36: version "7.0.36" resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb" integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw== @@ -21886,6 +21910,15 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.22, postcss@^6.0.23: source-map "^0.6.1" supports-color "^5.4.0" +postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5: + version "7.0.32" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" + integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + postcss@^8.1.4, postcss@^8.1.6, postcss@^8.2.1, postcss@^8.2.2, postcss@^8.2.9, postcss@^8.3.5: version "8.3.5" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" @@ -27439,7 +27472,12 @@ typedarray@^0.0.6, typedarray@~0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^4.1.3, typescript@^4.3.5: +typescript@^4.1.3: + version "4.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805" + integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw== + +typescript@^4.3.5: version "4.3.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==