Update _next/data URL handling in serverless-loader (vercel#10261)

ijjk · Timer · Timer · commit 2ff2e9e12c7d · 2020-01-24T23:34:00.000-05:00
Co-authored-by: Joe Haddad &lt;timer150@gmail.com&gt;
diff --git a/packages/next/build/webpack/loaders/next-serverless-loader.ts b/packages/next/build/webpack/loaders/next-serverless-loader.ts
@@ -216,13 +216,14 @@ const nextServerlessLoader: loader.Loader = function() {
       }
       let _nextData = false
 
-      if (req.url.match(/_next\\/data/)) {
+      const parsedUrl = handleRewrites(parse(req.url, true))
+
+      if (parsedUrl.pathname.match(/_next\\/data/)) {
         _nextData = true
-        req.url = req.url
+        parsedUrl.pathname = parsedUrl.pathname
           .replace(new RegExp('/_next/data/${escapedBuildId}/'), '/')
           .replace(/\\.json$/, '')
       }
-      const parsedUrl = handleRewrites(parse(req.url, true))
 
       const renderOpts = Object.assign(
         {
diff --git a/test/integration/prerender/test/index.test.js b/test/integration/prerender/test/index.test.js
@@ -265,6 +265,16 @@ const runTests = (dev = false) => {
     expect(JSON.parse(params)).toEqual({})
   })
 
+  it('should not supply query values to params in /_next/data request', async () => {
+    const data = JSON.parse(
+      await renderViaHTTP(
+        appPort,
+        `/_next/data/${buildId}/something.json?hello=world`
+      )
+    )
+    expect(data.pageProps.params).toEqual({})
+  })
+
   it('should not supply query values to params or useRouter dynamic page SSR', async () => {
     const html = await renderViaHTTP(appPort, '/blog/post-1?hello=world')
     const $ = cheerio.load(html)
@@ -580,7 +590,7 @@ describe('SPR Prerender', () => {
       await nextBuild(appDir)
       stderr = ''
       appPort = await findPort()
-      app = nextStart(appDir, appPort, {
+      app = await nextStart(appDir, appPort, {
         onStderr: msg => {
           stderr += msg
         },

Original file line number	Diff line number	Diff line change
`@@ -216,13 +216,14 @@ const nextServerlessLoader: loader.Loader = function() {`
`216`	`216`	`}`
`217`	`217`	`let _nextData = false`
`218`	`218`
`219`		`- if (req.url.match(/_next\\/data/)) {`
	`219`	`+ const parsedUrl = handleRewrites(parse(req.url, true))`
	`220`	`+`
	`221`	`+ if (parsedUrl.pathname.match(/_next\\/data/)) {`
`220`	`222`	`_nextData = true`
`221`		`- req.url = req.url`
	`223`	`+ parsedUrl.pathname = parsedUrl.pathname`
`222`	`224`	`.replace(new RegExp('/_next/data/${escapedBuildId}/'), '/')`
`223`	`225`	`.replace(/\\.json$/, '')`
`224`	`226`	`}`
`225`		`- const parsedUrl = handleRewrites(parse(req.url, true))`
`226`	`227`
`227`	`228`	`const renderOpts = Object.assign(`
`228`	`229`	`{`