Merge branch 'main' into no-bundler-for-nothing

Author: orinokai

.github/workflows/add-to-project.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
       - name: Generate token
         id: generate_token
-        uses: tibdex/github-app-token@v1.5.2
+        uses: tibdex/github-app-token@v1.8.0
         with:
           app_id: ${{ secrets.TOKENS_APP_ID }}
           private_key: ${{ secrets.TOKENS_PRIVATE_KEY }}

.nvmrc

@@ -1 +1 @@
-16.20.0
+16.20.1

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.38.0",
-  "packages/next": "1.4.7"
+  "packages/runtime": "4.38.1",
+  "packages/next": "1.4.8"
 }

cypress/e2e/middleware/enhanced.cy.ts

@@ -1,5 +1,25 @@
 describe('Enhanced middleware', () => {
-  it('rewrites the response body', () => {
+  it('rewrites the response body using request.rewrite()', () => {
+    cy.visit('/request-rewrite')
+    cy.get('#message').contains('This was static (& escaping test &) but has been transformed in')
+    cy.contains("This is an ad that isn't shown by default")
+  })
+
+  it('modifies the page props when using request.rewrite()', () => {
+    cy.visit('/request-rewrite')
+    cy.get('script#__NEXT_DATA__').then((element) => {
+      const { props } = JSON.parse(element.text());
+      expect(props.pageProps.message).to.include('This was static (& escaping test &) but has been transformed in')
+    })
+  })
+
+  it('passes in headers within request.rewrite()', () => {
+    cy.request('/request-rewrite').then((response) => {
+      expect(response.headers).to.have.property('x-rewrite-test', 'hello')
+    })
+  })
+
+  it('rewrites the response body using request.next()', () => {
     cy.visit('/static')
     cy.get('#message').contains('This was static (& escaping test &) but has been transformed in')
     cy.contains("This is an ad that isn't shown by default")

cypress/e2e/middleware/standard.cy.ts

@@ -45,6 +45,12 @@ describe('Standard middleware', () => {
       expect(response.headers).to.have.property('x-foo', 'bar')
     })
   })
+
+  it('preserves locale on rewrites (skipMiddlewareUrlNormalize: true)', () => {
+    cy.visit('/de-de/locale-preserving-rewrite')
+    cy.get('div').should('contain', 'Locale: de-DE')
+    cy.url().should('eq', `${Cypress.config().baseUrl}/de-de/locale-preserving-rewrite`)
+  })
 })
 
 describe('Middleware matchers', () => {

demos/middleware/middleware.ts

@@ -21,13 +21,37 @@ export async function middleware(req: NextRequest) {
   }
 
   const request = new MiddlewareRequest(req)
-  if (pathname.startsWith('/static')) {
+
+  // skipMiddlewareUrlNormalize next config option is used so we have to try to match both html path and data blob path
+  if (pathname.startsWith('/static') || pathname.endsWith('/static.json')) {
     // Unlike NextResponse.next(), this actually sends the request to the origin
     const res = await request.next()
     const message = `This was static (& escaping test &) but has been transformed in ${req.geo?.city}`
 
     // Transform the response HTML and props
-    res.replaceText('p[id=message]', message)
+    res.replaceText('#message', message)
+    res.setPageProp('message', message)
+    res.setPageProp('showAd', true)
+
+    res.headers.set('x-modified-edge', 'true')
+    res.headers.set('x-is-deno', 'Deno' in globalThis ? 'true' : 'false')
+    return res
+  }
+
+  // skipMiddlewareUrlNormalize next config option is used so we have to try to match both html path and data blob path
+  if (pathname.startsWith('/request-rewrite') || pathname.endsWith('/request-rewrite.json')) {
+    // request.rewrite() should return the MiddlewareResponse object instead of the Response object.
+    const res = await request.rewrite('/static-rewrite',
+    {
+      headers: {
+        'x-rewrite-test': 'hello',
+        'x-rewrite-test-2': 'hello-2'
+      }
+    })
+    const message = `This was static (& escaping test &) but has been transformed in ${req.geo?.city}`
+
+    // Transform the response HTML and props
+    res.replaceText('#message', message)
     res.setPageProp('message', message)
     res.setPageProp('showAd', true)
 
@@ -85,6 +109,10 @@ export async function middleware(req: NextRequest) {
     return response
   }
 
+  if (pathname.includes('locale-preserving-rewrite')) {
+    return NextResponse.rewrite(new URL('/locale-test', req.url))
+  }
+
   if (pathname.startsWith('/shows')) {
     if (pathname.startsWith('/shows/222')) {
       response = NextResponse.next()
@@ -136,8 +164,10 @@ export const config = {
   matcher: [
     '/api/:all*',
     '/headers',
+    '/:all*/locale-preserving-rewrite',
     '/cookies/:path*',
     { source: '/static' },
+    {source: '/request-rewrite' },
     { source: '/matcher-cookie'},
     { source: '/shows/((?!99|88).*)' },
     {

demos/middleware/next.config.js

@@ -11,6 +11,7 @@ const nextConfig = {
     defaultLocale: 'en',
     locales: ['en', 'de-DE'],
   },
+  skipMiddlewareUrlNormalize: true,
 }
 
 module.exports = nextConfig

demos/middleware/pages/locale-test.js

@@ -0,0 +1,15 @@
+import * as React from 'react'
+
+const Page = ({ pageLocale }) => {
+  return <div>Locale: {pageLocale}</div>
+}
+
+export async function getServerSideProps({ locale }) {
+  return {
+    props: {
+      pageLocale: locale,
+    },
+  }
+}
+
+export default Page

demos/middleware/pages/request-rewrite.js

@@ -0,0 +1,10 @@
+const Rewrite = () => {
+    return (
+      <div>
+        <p>This should have been rewritten</p>
+      </div>
+    )
+  }
+  
+export default Rewrite
+

demos/middleware/pages/static-rewrite.js

@@ -0,0 +1,37 @@
+import * as React from 'react'
+
+const useHydrated = () => {
+  const [hydrated, setHydrated] = React.useState(false)
+  React.useEffect(() => {
+    setHydrated(true)
+  }, [])
+  return hydrated
+}
+
+const Page = ({ message, showAd }) => {
+  const hydrated = useHydrated()
+  return (
+    <div>
+      <p id="message">{message}</p>
+      {hydrated && showAd ? (
+        <div>
+          <p>This is an ad that isn't shown by default on static test 2 page</p>
+          <img src="http://placekitten.com/400/300" />
+        </div>
+      ) : (
+        <p>No ads for me</p>
+      )}
+    </div>
+  )
+}
+
+export async function getStaticProps() {
+  return {
+    props: {
+      message: 'This is a static page',
+      showAd: false,
+    },
+  }
+}
+
+export default Page

demos/nx-next-monorepo-demo/package.json

@@ -30,8 +30,8 @@
     "@testing-library/react": "13.4.0",
     "@types/jest": "28.1.8",
     "@types/node": "16.18.36",
-    "@types/react": "18.0.38",
-    "@types/react-dom": "18.0.11",
+    "@types/react": "18.2.14",
+    "@types/react-dom": "18.2.6",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
     "@typescript-eslint/parser": "^5.36.1",
     "babel-jest": "28.1.3",

demos/turborepo-next-monorepo-demo/apps/docs/package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@types/node": "^17.0.12",
-    "@types/react": "18.0.38",
+    "@types/react": "18.2.14",
     "eslint": "7.32.0",
     "eslint-config-custom": "*",
     "next-transpile-modules": "9.0.0",

demos/turborepo-next-monorepo-demo/apps/web/package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@types/node": "^17.0.12",
-    "@types/react": "18.0.38",
+    "@types/react": "18.2.14",
     "eslint": "7.32.0",
     "eslint-config-custom": "*",
     "next-transpile-modules": "9.0.0",

demos/turborepo-next-monorepo-demo/package.json

@@ -27,5 +27,5 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
-  "packageManager": "npm@8.11.0"
+  "packageManager": "npm@8.19.4"
 }