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