Revert "feat(next/image)!: remove squoosh in favor of sharp as op…

…tional dep" (#61810) Reverts #61696 Closes NEXT-2401
vercel · Feb 8, 2024 · feb27ad · feb27ad
1 parent b387842
commit feb27ad
Show file tree

Hide file tree

Showing 63 changed files with 12,988 additions and 976 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -22,6 +22,7 @@
 /**/*image*/**                                @timneutkens @ijjk @shuding @styfle @huozhi @ztanner @vercel/devex
 /**/*img*                                     @timneutkens @ijjk @shuding @styfle @huozhi @ztanner @vercel/devex
 /packages/next/client/use-intersection.tsx    @timneutkens @ijjk @shuding @styfle
+/packages/next/server/lib/squoosh/            @timneutkens @ijjk @shuding @styfle
 /packages/next/server/serve-static.ts         @timneutkens @ijjk @shuding @styfle @huozhi @ztanner
 /packages/next/server/config.ts               @timneutkens @ijjk @shuding @styfle @huozhi @ztanner
 

diff --git a/docs/03-pages/02-api-reference/01-components/image-legacy.mdx b/docs/03-pages/02-api-reference/01-components/image-legacy.mdx
@@ -443,6 +443,8 @@ If you need a different provider, you can use the [`loader`](#loader) prop with
 
 > Images can not be optimized at build time using [`output: 'export'`](/docs/pages/building-your-application/deploying/static-exports), only on-demand. To use `next/legacy/image` with `output: 'export'`, you will need to use a different loader than the default. [Read more in the discussion.](https://github.com/vercel/next.js/discussions/19065)
 
+> The `next/legacy/image` component's default loader uses [`squoosh`](https://www.npmjs.com/package/@squoosh/lib) because it is quick to install and suitable for a development environment. When using `next start` in your production environment, it is strongly recommended that you install [`sharp`](https://www.npmjs.com/package/sharp) by running `npm i sharp` in your project directory. This is not necessary for Vercel deployments, as `sharp` is installed automatically.
+
 ## Advanced
 
 The following configuration is for advanced use cases and is usually not necessary. If you choose to configure the properties below, you will override any changes to the Next.js defaults in future updates.

diff --git a/package.json b/package.json
@@ -107,6 +107,7 @@
     "@types/react-dom": "18.2.15",
     "@types/relay-runtime": "14.1.13",
     "@types/selenium-webdriver": "4.0.15",
+    "@types/sharp": "0.29.3",
     "@types/string-hash": "1.1.1",
     "@types/trusted-types": "2.0.3",
     "@typescript-eslint/eslint-plugin": "6.14.0",
@@ -157,7 +158,7 @@
     "html-validator": "5.1.18",
     "http-proxy": "1.18.1",
     "husky": "8.0.0",
-    "image-size": "1.1.1",
+    "image-size": "0.9.3",
     "is-animated": "2.0.2",
     "isomorphic-unfetch": "3.0.0",
     "jest": "29.7.0",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -114,9 +114,6 @@
       "optional": true
     }
   },
-  "optionalDependencies": {
-    "sharp": "^0.33.2"
-  },
   "devDependencies": {
     "@ampproject/toolbox-optimizer": "2.8.3",
     "@babel/code-frame": "7.22.5",
@@ -232,6 +229,7 @@
     "events": "3.3.0",
     "find-up": "4.1.0",
     "fresh": "0.5.2",
+    "get-orientation": "1.1.2",
     "glob": "7.1.7",
     "gzip-size": "5.1.1",
     "http-proxy": "1.18.1",
@@ -240,7 +238,7 @@
     "https-proxy-agent": "5.0.1",
     "icss-utils": "5.1.0",
     "ignore-loader": "0.1.2",
-    "image-size": "1.1.1",
+    "image-size": "1.0.0",
     "is-docker": "2.0.0",
     "is-wsl": "2.2.0",
     "jest-worker": "27.5.1",

diff --git a/packages/next/src/build/collect-build-traces.ts b/packages/next/src/build/collect-build-traces.ts
@@ -310,6 +310,7 @@ export async function collectBuildTraces({
               // only ignore image-optimizer code when
               // this is being handled outside of next-server
               '**/next/dist/server/image-optimizer.js',
+              '**/next/dist/server/lib/squoosh/**/*.wasm',
             ]
           : []),
 

diff --git a/packages/next/src/build/webpack/loaders/next-image-loader/index.ts b/packages/next/src/build/webpack/loaders/next-image-loader/index.ts
@@ -33,7 +33,7 @@ function nextImageLoader(this: any, content: Buffer) {
 
     const imageSizeSpan = imageLoaderSpan.traceChild('image-size-calculation')
     const imageSize = await imageSizeSpan.traceAsyncFn(() =>
-      getImageSize(content).catch((err) => err)
+      getImageSize(content, extension).catch((err) => err)
     )
 
     if (imageSize instanceof Error) {

diff --git a/packages/next/src/build/webpack/loaders/next-metadata-image-loader.ts b/packages/next/src/build/webpack/loaders/next-metadata-image-loader.ts
@@ -160,7 +160,8 @@ async function nextMetadataImageLoader(
   }
 
   const imageSize: { width?: number; height?: number } = await getImageSize(
-    content
+    content,
+    extension as 'avif' | 'webp' | 'png' | 'jpeg'
   ).catch((err) => err)
 
   if (imageSize instanceof Error) {

diff --git a/packages/next/src/compiled/get-orientation/LICENSE b/packages/next/src/compiled/get-orientation/LICENSE
@@ -0,0 +1,21 @@
+
+The MIT License (MIT)
+Copyright © 2019 MooYeol Prescott Lee, http://debug.so <mooyoul@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/packages/next/src/compiled/get-orientation/index.js b/packages/next/src/compiled/get-orientation/index.js
diff --git a/packages/next/src/compiled/get-orientation/package.json b/packages/next/src/compiled/get-orientation/package.json
@@ -0,0 +1 @@
+{"name":"get-orientation","main":"index.js","author":"MooYeol Prescott Lee <mooyoul@gmail.com>","license":"MIT"}
diff --git a/packages/next/src/compiled/image-size/LICENSE b/packages/next/src/compiled/image-size/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2013-Present Aditya Yadav, http://netroy.in
+Copyright © 2017 Aditya Yadav, http://netroy.in
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/packages/next/src/compiled/image-size/index.js b/packages/next/src/compiled/image-size/index.js