Unverified Commit 507ac981 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure dev react bundles are not ignored in traces (#30849)

* Ensure dev react bundles are not ignored in traces

* update test

* update lock
parent b2b7e78c
...@@ -1225,9 +1225,6 @@ export default async function build( ...@@ -1225,9 +1225,6 @@ export default async function build(
'**/next/dist/compiled/@ampproject/toolbox-optimizer/**/*', '**/next/dist/compiled/@ampproject/toolbox-optimizer/**/*',
'**/next/dist/server/lib/squoosh/**/*.wasm', '**/next/dist/server/lib/squoosh/**/*.wasm',
'**/next/dist/compiled/webpack/(bundle4|bundle5).js', '**/next/dist/compiled/webpack/(bundle4|bundle5).js',
'**/node_modules/react/**/*.development.js',
'**/node_modules/react-dom/**/*.development.js',
'**/node_modules/use-subscription/**/*.development.js',
'**/node_modules/sharp/**/*', '**/node_modules/sharp/**/*',
'**/node_modules/webpack5/**/*', '**/node_modules/webpack5/**/*',
], ],
......
...@@ -19,8 +19,6 @@ import { NextConfigComplete } from '../../../server/config-shared' ...@@ -19,8 +19,6 @@ import { NextConfigComplete } from '../../../server/config-shared'
const PLUGIN_NAME = 'TraceEntryPointsPlugin' const PLUGIN_NAME = 'TraceEntryPointsPlugin'
const TRACE_IGNORES = [ const TRACE_IGNORES = [
'**/*/node_modules/react/**/*.development.js',
'**/*/node_modules/react-dom/**/*.development.js',
'**/*/next/dist/server/next.js', '**/*/next/dist/server/next.js',
'**/*/next/dist/bin/next', '**/*/next/dist/bin/next',
] ]
......
import { execFile } from 'child_process' import { execFile } from 'child_process'
import fs from 'fs/promises' import fs from 'fs-extra'
import fse from 'fs-extra'
import os from 'os' import os from 'os'
import path from 'path' import path from 'path'
import util from 'util' import util from 'util'
...@@ -10,7 +9,7 @@ const exec = util.promisify(execFile) ...@@ -10,7 +9,7 @@ const exec = util.promisify(execFile)
;(async function () { ;(async function () {
try { try {
let tmpdir = os.tmpdir() + `next-swc-${Date.now()}` let tmpdir = os.tmpdir() + `next-swc-${Date.now()}`
await fse.ensureDir(tmpdir) await fs.ensureDir(tmpdir)
let cwd = process.cwd() let cwd = process.cwd()
let pkgJson = { let pkgJson = {
name: 'dummy-package', name: 'dummy-package',
...@@ -36,18 +35,18 @@ const exec = util.promisify(execFile) ...@@ -36,18 +35,18 @@ const exec = util.promisify(execFile)
let { stdout } = await exec('yarn', ['--force'], { cwd: tmpdir }) let { stdout } = await exec('yarn', ['--force'], { cwd: tmpdir })
console.log(stdout) console.log(stdout)
let pkgs = await fs.readdir(path.join(tmpdir, 'node_modules/@next')) let pkgs = await fs.readdir(path.join(tmpdir, 'node_modules/@next'))
await fse.ensureDir(path.join(cwd, 'node_modules/@next')) await fs.ensureDir(path.join(cwd, 'node_modules/@next'))
await Promise.all( await Promise.all(
pkgs.map((pkg) => pkgs.map((pkg) =>
fse.move( fs.move(
path.join(tmpdir, 'node_modules/@next', pkg), path.join(tmpdir, 'node_modules/@next', pkg),
path.join(cwd, 'node_modules/@next', pkg), path.join(cwd, 'node_modules/@next', pkg),
{ overwrite: true } { overwrite: true }
) )
) )
) )
await fse.remove(tmpdir) await fs.remove(tmpdir)
console.log('Installed the following binary packages:', pkgs) console.log('Installed the following binary packages:', pkgs)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
......
...@@ -72,7 +72,7 @@ describe('prerender native module', () => { ...@@ -72,7 +72,7 @@ describe('prerender native module', () => {
/node_modules\/react\/package\.json/, /node_modules\/react\/package\.json/,
/node_modules\/react\/cjs\/react\.production\.min\.js/, /node_modules\/react\/cjs\/react\.production\.min\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/], notTests: [],
}, },
{ {
page: '/blog/[slug]', page: '/blog/[slug]',
...@@ -86,7 +86,7 @@ describe('prerender native module', () => { ...@@ -86,7 +86,7 @@ describe('prerender native module', () => {
/node_modules\/sqlite\/.*?\.js/, /node_modules\/sqlite\/.*?\.js/,
/\/data\.sqlite/, /\/data\.sqlite/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/], notTests: [],
}, },
] ]
......
...@@ -1833,7 +1833,7 @@ describe('Prerender', () => { ...@@ -1833,7 +1833,7 @@ describe('Prerender', () => {
/node_modules\/react\/package\.json/, /node_modules\/react\/package\.json/,
/node_modules\/react\/cjs\/react\.production\.min\.js/, /node_modules\/react\/cjs\/react\.production\.min\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/], notTests: [],
}, },
{ {
page: '/another', page: '/another',
...@@ -1846,7 +1846,6 @@ describe('Prerender', () => { ...@@ -1846,7 +1846,6 @@ describe('Prerender', () => {
/\/world.txt/, /\/world.txt/,
], ],
notTests: [ notTests: [
/node_modules\/react\/cjs\/react\.development\.js/,
/node_modules\/@firebase\/firestore\/.*?\.js/, /node_modules\/@firebase\/firestore\/.*?\.js/,
/\/server\.js/, /\/server\.js/,
], ],
...@@ -1861,10 +1860,7 @@ describe('Prerender', () => { ...@@ -1861,10 +1860,7 @@ describe('Prerender', () => {
/node_modules\/react\/cjs\/react\.production\.min\.js/, /node_modules\/react\/cjs\/react\.production\.min\.js/,
/node_modules\/@firebase\/firestore\/.*?\.js/, /node_modules\/@firebase\/firestore\/.*?\.js/,
], ],
notTests: [ notTests: [/\/world.txt/],
/node_modules\/react\/cjs\/react\.development\.js/,
/\/world.txt/,
],
}, },
] ]
......
...@@ -117,7 +117,7 @@ describe.skip('Production Usage with swcMinify', () => { ...@@ -117,7 +117,7 @@ describe.skip('Production Usage with swcMinify', () => {
/node_modules\/react\/package\.json/, /node_modules\/react\/package\.json/,
/node_modules\/react\/cjs\/react\.production\.min\.js/, /node_modules\/react\/cjs\/react\.production\.min\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/], notTests: [],
}, },
{ {
page: '/client-error', page: '/client-error',
...@@ -133,7 +133,7 @@ describe.skip('Production Usage with swcMinify', () => { ...@@ -133,7 +133,7 @@ describe.skip('Production Usage with swcMinify', () => {
/next\/dist\/pages\/_error\.js/, /next\/dist\/pages\/_error\.js/,
/next\/error\.js/, /next\/error\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/], notTests: [],
}, },
{ {
page: '/dynamic', page: '/dynamic',
...@@ -147,7 +147,7 @@ describe.skip('Production Usage with swcMinify', () => { ...@@ -147,7 +147,7 @@ describe.skip('Production Usage with swcMinify', () => {
/next\/dist\/client\/link\.js/, /next\/dist\/client\/link\.js/,
/next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/, /next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/], notTests: [],
}, },
{ {
page: '/index', page: '/index',
...@@ -164,7 +164,6 @@ describe.skip('Production Usage with swcMinify', () => { ...@@ -164,7 +164,6 @@ describe.skip('Production Usage with swcMinify', () => {
/node_modules\/nanoid\/url-alphabet\/index\.js/, /node_modules\/nanoid\/url-alphabet\/index\.js/,
], ],
notTests: [ notTests: [
/node_modules\/react\/cjs\/react\.development\.js/,
/node_modules\/nanoid\/index\.cjs/, /node_modules\/nanoid\/index\.cjs/,
/next\/dist\/pages\/_error\.js/, /next\/dist\/pages\/_error\.js/,
/next\/error\.js/, /next\/error\.js/,
...@@ -182,7 +181,7 @@ describe.skip('Production Usage with swcMinify', () => { ...@@ -182,7 +181,7 @@ describe.skip('Production Usage with swcMinify', () => {
/next\/dist\/client\/router\.js/, /next\/dist\/client\/router\.js/,
/next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/, /next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/], notTests: [],
}, },
{ {
page: '/next-import', page: '/next-import',
......
...@@ -109,9 +109,6 @@ describe('Production Usage', () => { ...@@ -109,9 +109,6 @@ describe('Production Usage', () => {
expect( expect(
serverTrace.files.some((file) => file.includes('node_modules/sharp')) serverTrace.files.some((file) => file.includes('node_modules/sharp'))
).toBe(false) ).toBe(false)
expect(
serverTrace.files.some((file) => file.includes('react.development.js'))
).toBe(false)
} }
const checks = [ const checks = [
...@@ -123,7 +120,7 @@ describe('Production Usage', () => { ...@@ -123,7 +120,7 @@ describe('Production Usage', () => {
/node_modules\/react\/package\.json/, /node_modules\/react\/package\.json/,
/node_modules\/react\/cjs\/react\.production\.min\.js/, /node_modules\/react\/cjs\/react\.production\.min\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/, /\0/], notTests: [/\0/],
}, },
{ {
page: '/client-error', page: '/client-error',
...@@ -139,7 +136,7 @@ describe('Production Usage', () => { ...@@ -139,7 +136,7 @@ describe('Production Usage', () => {
/next\/dist\/pages\/_error\.js/, /next\/dist\/pages\/_error\.js/,
/next\/error\.js/, /next\/error\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/, /\0/], notTests: [/\0/],
}, },
{ {
page: '/dynamic', page: '/dynamic',
...@@ -153,7 +150,7 @@ describe('Production Usage', () => { ...@@ -153,7 +150,7 @@ describe('Production Usage', () => {
/next\/dist\/client\/link\.js/, /next\/dist\/client\/link\.js/,
/next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/, /next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/, /\0/], notTests: [/\0/],
}, },
{ {
page: '/index', page: '/index',
...@@ -171,7 +168,6 @@ describe('Production Usage', () => { ...@@ -171,7 +168,6 @@ describe('Production Usage', () => {
/node_modules\/es5-ext\/array\/#\/clear\.js/, /node_modules\/es5-ext\/array\/#\/clear\.js/,
], ],
notTests: [ notTests: [
/node_modules\/react\/cjs\/react\.development\.js/,
/node_modules\/nanoid\/index\.cjs/, /node_modules\/nanoid\/index\.cjs/,
/next\/dist\/pages\/_error\.js/, /next\/dist\/pages\/_error\.js/,
/next\/error\.js/, /next\/error\.js/,
...@@ -186,11 +182,12 @@ describe('Production Usage', () => { ...@@ -186,11 +182,12 @@ describe('Production Usage', () => {
/node_modules\/react\/index\.js/, /node_modules\/react\/index\.js/,
/node_modules\/react\/package\.json/, /node_modules\/react\/package\.json/,
/node_modules\/react\/cjs\/react\.production\.min\.js/, /node_modules\/react\/cjs\/react\.production\.min\.js/,
/node_modules\/react\/cjs\/react\.development\.js/,
/next\/router\.js/, /next\/router\.js/,
/next\/dist\/client\/router\.js/, /next\/dist\/client\/router\.js/,
/next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/, /next\/dist\/shared\/lib\/router\/utils\/resolve-rewrites\.js/,
], ],
notTests: [/node_modules\/react\/cjs\/react\.development\.js/, /\0/], notTests: [/\0/],
}, },
{ {
page: '/next-import', page: '/next-import',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment