Merge branch 'canary' into x-rm-use-deferred-content-hook

docs/testing.md

@@ -325,7 +325,7 @@ module.exports = {
 
  // Handle image imports
  // https://jestjs.io/docs/webpack#handling-static-assets
- '^.+\\.(jpg|jpeg|png|gif|webp|avif|svg)$': `<rootDir>/__mocks__/fileMock.js`,
+ '^.+\\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$/i': `<rootDir>/__mocks__/fileMock.js`,
 
  // Handle module aliases
  '^@/components/(.*)$': '<rootDir>/components/$1',
@@ -354,21 +354,19 @@ Stylesheets and images aren't used in the tests but importing them may cause err
 
 ```js
 // __mocks__/fileMock.js
-module.exports = 'test-file-stub'
+module.exports = {
+ src: '/img.jpg',
+ height: 24,
+ width: 24,
+ blurDataURL: 'data:image/png;base64,imagedata',
+}
 ```
 
 ```js
 // __mocks__/styleMock.js
 module.exports = {}
 ```
 
-If you're running into the issue `"Failed to parse src "test-file-stub" on 'next/image'"`, add a '/' to your fileMock.
-
-```js
-// __mocks__/fileMock.js
-module.exports = '/test-file-stub'
-```
-
 For more information on handling static assets, please refer to the [Jest Docs](https://jestjs.io/docs/webpack#handling-static-assets).
 
 **Optional: Extend Jest with custom matchers**

errors/no-stylesheets-in-head-component.md

@@ -18,7 +18,7 @@ Add the stylesheet in a custom `Document` component.
 
 ```jsx
 // pages/_document.js
-import Document, { Html, Head, Main, NextScript } from 'next/document'
+import { Html, Head, Main, NextScript } from 'next/document'
 
 export default function Document() {
  return (

examples/with-jest-babel/__mocks__/fileMock.js

@@ -1,3 +1,8 @@
 // Read more at "Handling stylesheets and image imports" on https://nextjs.org/docs/testing
 
-module.exports = 'test-file-stub'
+module.exports = {
+ src: '/img.jpg',
+ height: 24,
+ width: 24,
+ blurDataURL: 'data:image/png;base64,imagedata',
+}

examples/with-jest-babel/jest.config.js

@@ -16,7 +16,7 @@ module.exports = {
 
  // Handle image imports
  // https://jestjs.io/docs/webpack#handling-static-assets
- '^.+\\.(jpg|jpeg|png|gif|webp|avif|svg)$': `<rootDir>/__mocks__/fileMock.js`,
+ '^.+\\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$': `<rootDir>/__mocks__/fileMock.js`,
 
  // Handle module aliases
  '^@/components/(.*)$': '<rootDir>/components/$1',

packages/next-swc/.cargo/config.toml

@@ -21,7 +21,7 @@ rustflags = [
 ]
 
 [target.aarch64-unknown-linux-musl]
-linker = "aarch64-linux-gnu-gcc"
+linker = "aarch64-linux-musl-gcc"
 rustflags = [
  "-C",
  "target-feature=-crt-static",

packages/next-swc/crates/napi/npm/android-arm-eabi/README.md

@@ -0,0 +1,3 @@
+# `@next/swc-android-arm-eabi`
+
+This is the **android-arm-eabi** binary for `@next/swc`

packages/next-swc/crates/napi/npm/android-arm-eabi/package.json

@@ -0,0 +1,18 @@
+{
+ "name": "@next/swc-android-arm-eabi",
+ "version": "0.0.0",
+ "os": [
+ "android"
+ ],
+ "cpu": [
+ "arm"
+ ],
+ "main": "next-swc.android-arm-eabi.node",
+ "files": [
+ "next-swc.android-arm-eabi.node"
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">= 10"
+ }
+}

packages/next-swc/package.json

@@ -16,6 +16,7 @@
  "armv7-unknown-linux-gnueabihf",
  "aarch64-apple-darwin",
  "aarch64-linux-android",
+ "arm-linux-androideabi",
  "x86_64-unknown-freebsd",
  "x86_64-unknown-linux-musl",
  "aarch64-unknown-linux-musl",

packages/next/build/index.ts

@@ -1910,6 +1910,9 @@ export default async function build(
  })
  }
 
+ // ensure the worker is not left hanging
+ staticWorkers.close()
+
  const analysisEnd = process.hrtime(analysisBegin)
  telemetry.record(
  eventBuildOptimize(pagePaths, {

packages/next/build/jest/__mocks__/fileMock.js

@@ -1 +1,6 @@
-module.exports = 'test-file-stub'
+module.exports = {
+ src: '/img.jpg',
+ height: 24,
+ width: 24,
+ blurDataURL: 'data:image/png;base64,imagedata',
+}

packages/next/build/jest/jest.ts

@@ -81,7 +81,7 @@ export default function nextJest(options: { dir?: string } = {}) {
  '^.+\\.(css|sass|scss)$': require.resolve('./__mocks__/styleMock.js'),
 
  // Handle image imports
- '^.+\\.(jpg|jpeg|png|gif|webp|avif|svg)$': require.resolve(
+ '^.+\\.(png|jpg|jpeg|gif|webp|avif|ico|bmp|svg)$': require.resolve(
  `./__mocks__/fileMock.js`
  ),
 

packages/next/build/webpack/loaders/next-middleware-loader.ts

@@ -12,6 +12,13 @@ export default function middlewareLoader(this: any) {
  return `
  import { adapter } from 'next/dist/server/web/adapter'
 
+ // The condition is true when the "process" module is provided
+ if (process !== global.process) {
+ // prefer local process but global.process has correct "env"
+ process.env = global.process.env;
+ global.process = process;
+ }
+
  var mod = require(${stringifiedPagePath})
  var handler = mod.middleware || mod.default;
 

packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts

@@ -39,10 +39,6 @@ export default async function middlewareSSRLoader(this: any) {
  const reactLoadableManifest = self.__REACT_LOADABLE_MANIFEST
  const rscManifest = self.__RSC_MANIFEST
 
- if (typeof pageMod.default !== 'function') {
- throw new Error('Your page must export a \`default\` component')
- }
-
  // Set server context
  self.__server_context = {
  page: ${JSON.stringify(page)},

packages/next/lib/worker.ts

@@ -85,4 +85,13 @@ export class Worker {
  this._worker = undefined
  return worker.end()
  }
+
+ /**
+ * Quietly end the worker if it exists
+ */
+ close(): void {
+ if (this._worker) {
+ this._worker.end()
+ }
+ }
 }

packages/next/package.json

@@ -115,7 +115,7 @@
  "@babel/traverse": "7.15.0",
  "@babel/types": "7.15.0",
  "@hapi/accept": "5.0.2",
- "@napi-rs/cli": "1.2.1",
+ "@napi-rs/cli": "2.4.4",
  "@napi-rs/triples": "1.0.3",
  "@next/polyfill-module": "12.1.0",
  "@next/polyfill-nomodule": "12.1.0",

packages/next/server/base-server.ts

@@ -1122,7 +1122,7 @@ export default abstract class Server {
  const isSSG = !!components.getStaticProps
  const hasServerProps = !!components.getServerSideProps
  const hasStaticPaths = !!components.getStaticPaths
- const hasGetInitialProps = !!(components.Component as any).getInitialProps
+ const hasGetInitialProps = !!components.Component?.getInitialProps
 
  // Toggle whether or not this is a Data request
  const isDataReq = !!query._nextDataReq && (isSSG || hasServerProps)

packages/next/server/load-components.ts

@@ -1,11 +1,15 @@
+import type {
+ AppType,
+ DocumentType,
+ NextComponentType,
+} from '../shared/lib/utils'
 import {
  BUILD_MANIFEST,
  REACT_LOADABLE_MANIFEST,
 } from '../shared/lib/constants'
 import { join } from 'path'
 import { requirePage } from './require'
 import { BuildManifest } from './get-page-files'
-import { AppType, DocumentType } from '../shared/lib/utils'
 import { interopDefault } from '../lib/interop-default'
 import {
  PageConfig,
@@ -22,7 +26,7 @@ export type ManifestItem = {
 export type ReactLoadableManifest = { [moduleId: string]: ManifestItem }
 
 export type LoadComponentsReturnType = {
- Component: React.ComponentType
+ Component: NextComponentType
  pageConfig: PageConfig
  buildManifest: BuildManifest
  reactLoadableManifest: ReactLoadableManifest

packages/next/server/render.tsx

@@ -545,7 +545,7 @@ export async function renderToHTML(
  const defaultAppGetInitialProps =
  App.getInitialProps === (App as any).origGetInitialProps
 
- const hasPageGetInitialProps = !!(Component as any).getInitialProps
+ const hasPageGetInitialProps = !!(Component as any)?.getInitialProps
 
  const pageIsDynamic = isDynamicRoute(pathname)
 
@@ -561,7 +561,7 @@ export async function renderToHTML(
  'getServerSideProps',
  'getStaticPaths',
  ]) {
- if ((Component as any)[methodName]) {
+ if ((Component as any)?.[methodName]) {
  throw new Error(
  `page ${pathname} ${methodName} ${GSSP_COMPONENT_MEMBER_ERROR}`
  )

packages/next/server/web/sandbox/context.ts

@@ -202,6 +202,7 @@ function createContext(options: {
  File,
  FormData,
  process: {
+ ...polyfills.process,
  env: buildEnvironmentVariablesFrom(options.env),
  },
  ReadableStream: polyfills.ReadableStream,

packages/next/server/web/sandbox/polyfills.ts

@@ -1,6 +1,7 @@
 import { Crypto as WebCrypto } from 'next/dist/compiled/@peculiar/webcrypto'
 import { CryptoKey } from 'next/dist/compiled/@peculiar/webcrypto'
 import { v4 as uuid } from 'next/dist/compiled/uuid'
+import processPolyfill from 'next/dist/compiled/process'
 import { ReadableStream } from './readable-stream'
 
 import crypto from 'crypto'
@@ -13,7 +14,7 @@ export function btoa(str: string) {
  return Buffer.from(str, 'binary').toString('base64')
 }
 
-export { CryptoKey, ReadableStream }
+export { CryptoKey, ReadableStream, processPolyfill as process }
 
 export class Crypto extends WebCrypto {
  // @ts-ignore Remove once types are updated and we deprecate node 12

packages/next/types/misc.d.ts

@@ -331,6 +331,11 @@ declare module 'next/dist/compiled/comment-json' {
  export = m
 }
 
+declare module 'next/dist/compiled/process' {
+ import m from 'process'
+ export = m
+}
+
 declare module 'pnp-webpack-plugin' {
  import webpack from 'webpack4'
 

scripts/install-native.mjs

@@ -19,6 +19,7 @@ import fs from 'fs-extra'
  version: '1.0.0',
  optionalDependencies: {
  '@next/swc-android-arm64': 'canary',
+ '@next/swc-android-arm-eabi': 'canary',
  '@next/swc-darwin-arm64': 'canary',
  '@next/swc-darwin-x64': 'canary',
  '@next/swc-linux-arm-gnueabihf': 'canary',

test/integration/middleware/core/pages/global/_middleware.js

@@ -0,0 +1,12 @@
+import { NextResponse } from 'next/server'
+
+export async function middleware(request, ev) {
+ console.log(process.env.MIDDLEWARE_TEST)
+
+ return NextResponse.json({
+ process: {
+ env: process.env,
+ nextTick: typeof process.nextTick,
+ },
+ })
+}

test/integration/middleware/core/test/index.test.js

@@ -108,6 +108,30 @@ describe('Middleware base tests', () => {
  }
  })
  })
+
+ describe('global', () => {
+ beforeAll(async () => {
+ context.appPort = await findPort()
+ context.app = await launchApp(context.appDir, context.appPort, {
+ env: {
+ MIDDLEWARE_TEST: 'asdf',
+ },
+ })
+ })
+
+ it('should contains process polyfill', async () => {
+ const res = await fetchViaHTTP(context.appPort, `/global`)
+ const json = await res.json()
+ expect(json).toEqual({
+ process: {
+ env: {
+ MIDDLEWARE_TEST: 'asdf',
+ },
+ nextTick: 'function',
+ },
+ })
+ })
+ })
 })
 
 function urlTests(_log, locale = '') {