Merge branch 'dont-show-error-overlay-for-not-found' of github.com:ti…

…mneutkens/next.js into dont-show-error-overlay-for-not-found
vercel · Oct 15, 2022 · 83958cb · 83958cb
2 parents ffaee68 + 4b13e7b
commit 83958cb
Show file tree

Hide file tree

Showing 40 changed files with 469 additions and 330 deletions.
diff --git a/.github/actions/next-stats-action/src/prepare/load-stats-config.js b/.github/actions/next-stats-action/src/prepare/load-stats-config.js
@@ -16,7 +16,10 @@ function loadStatsConfig() {
         'stats-config.js'
       ))
       break
-    } catch (_) {
+    } catch (err) {
+      if (err.code !== 'MODULE_NOT_FOUND') {
+        console.error('Failed to load stats-config at', configPath, err)
+      }
       /* */
     }
   }

diff --git a/.github/actions/next-stats-action/src/run/index.js b/.github/actions/next-stats-action/src/run/index.js
@@ -169,55 +169,6 @@ async function runConfigs(
         )
       )
       curStats.General.buildDurationCached = Date.now() - secondBuildStart
-
-      if (statsConfig.appDevCommand) {
-        const port = await getPort()
-        const startTime = Date.now()
-        const child = exec.spawn(statsConfig.appDevCommand, {
-          cwd: statsAppDir,
-          env: {
-            PORT: port,
-          },
-          stdio: 'pipe',
-        })
-
-        let serverReadyResolve
-        let serverReadyResolved = false
-        const serverReadyPromise = new Promise((resolve) => {
-          serverReadyResolve = resolve
-        })
-
-        child.stdout.on('data', (data) => {
-          if (
-            data.toString().includes('started server') &&
-            !serverReadyResolved
-          ) {
-            serverReadyResolved = true
-            serverReadyResolve()
-          }
-          process.stdout.write(data)
-        })
-        child.stderr.on('data', (data) => process.stderr.write(data))
-
-        child.on('exit', (code) => {
-          if (!serverReadyResolved) {
-            serverReadyResolve()
-            serverReadyResolved = true
-          }
-          exitCode = code
-        })
-
-        setTimeout(() => {
-          if (!serverReadyResolved) {
-            child.kill()
-          }
-        }, 3 * 1000)
-
-        await serverReadyPromise
-        child.kill()
-
-        curStats['General']['nextDevReadyDuration'] = Date.now() - startTime
-      }
     }
 
     logger(`Finished running: ${config.title}`)

diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "@babel/plugin-proposal-object-rest-spread": "7.14.7",
     "@babel/preset-flow": "7.14.5",
     "@babel/preset-react": "7.14.5",
-    "@edge-runtime/jest-environment": "1.1.0-beta.34",
+    "@edge-runtime/jest-environment": "1.1.0-beta.35",
     "@fullhuman/postcss-purgecss": "1.3.0",
     "@mdx-js/loader": "0.18.0",
     "@next/bundle-analyzer": "workspace:*",