Merge branch 'canary' into shu/8af8

vercel · Mar 2, 2022 · c70beed · c70beed
2 parents c32f72b + 1b17070
commit c70beed
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 23 deletions.
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.1.1-canary.5"
+  "version": "12.1.1-canary.6"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "12.1.1-canary.5",
+    "@next/eslint-plugin-next": "12.1.1-canary.6",
     "@rushstack/eslint-patch": "1.0.8",
     "@typescript-eslint/parser": "5.0.0",
     "eslint-import-resolver-node": "0.3.4",

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform --cargo-name next_swc_napi native",

diff --git a/packages/next/client/image.tsx b/packages/next/client/image.tsx
@@ -722,7 +722,7 @@ export default function Image({
         ref={imgRef}
         style={{ ...imgStyle, ...blurStyle }}
       />
-      {isLazy && (
+      {(isLazy || placeholder === 'blur') && (
         <noscript>
           <img
             {...rest}

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -69,7 +69,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.1.1-canary.5",
+    "@next/env": "12.1.1-canary.6",
     "caniuse-lite": "^1.0.30001283",
     "postcss": "8.4.5",
     "styled-jsx": "5.0.0",
@@ -117,11 +117,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.4.4",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.1.1-canary.5",
-    "@next/polyfill-nomodule": "12.1.1-canary.5",
-    "@next/react-dev-overlay": "12.1.1-canary.5",
-    "@next/react-refresh-utils": "12.1.1-canary.5",
-    "@next/swc": "12.1.1-canary.5",
+    "@next/polyfill-module": "12.1.1-canary.6",
+    "@next/polyfill-nomodule": "12.1.1-canary.6",
+    "@next/react-dev-overlay": "12.1.1-canary.6",
+    "@next/react-refresh-utils": "12.1.1-canary.6",
+    "@next/swc": "12.1.1-canary.6",
     "@peculiar/webcrypto": "1.1.7",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "12.1.1-canary.5",
+  "version": "12.1.1-canary.6",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/test/unit/image-rendering.test.ts b/test/unit/image-rendering.test.ts
@@ -46,4 +46,37 @@ describe('Image rendering', () => {
     expect($2('noscript').length).toBe(0)
     expect($lazy('noscript').length).toBe(1)
   })
+
+  it('should render noscript element when placeholder=blur', async () => {
+    const element1 = React.createElement(Image, {
+      src: '/test.png',
+      width: 100,
+      height: 100,
+      loading: 'eager',
+      placeholder: 'blur',
+      blurDataURL: 'data:image/png;base64',
+    })
+    const element2 = React.createElement(Image, {
+      src: '/test.png',
+      width: 100,
+      height: 100,
+      placeholder: 'blur',
+      blurDataURL: 'data:image/png;base64',
+      loading: 'eager',
+    })
+    const element3 = React.createElement(Image, {
+      src: '/test.png',
+      width: 100,
+      height: 100,
+      placeholder: 'blur',
+      blurDataURL: 'data:image/png;base64',
+      priority: true,
+    })
+    const $1 = cheerio.load(ReactDOM.renderToString(element1))
+    const $2 = cheerio.load(ReactDOM.renderToString(element2))
+    const $3 = cheerio.load(ReactDOM.renderToString(element3))
+    expect($1('noscript').length).toBe(1)
+    expect($2('noscript').length).toBe(1)
+    expect($3('noscript').length).toBe(1)
+  })
 })