detect internal as client, revert changes

Author: huozhi

packages/next/build/webpack-config.ts

@@ -1483,7 +1483,7 @@ export default async function getBaseWebpackConfig(
                     /next[\\/]dist[\\/]client[\\/]/,
                     // To let next/* api entry files passing through flight loader instead
                     //  of the internal implementation files
-                    /next[\\/](link|image|future[\\/]image)/,
+                    // /next[\\/](link|image|future[\\/]image)/,
                   ],
                   issuerLayer: WEBPACK_LAYERS.server,
                   use: {

packages/next/build/webpack/loaders/utils.ts

@@ -7,14 +7,14 @@ const imageRegex = new RegExp(`\\.(${imageExtensions.join('|')})$`)
 const NEXT_API_CLIENT_RSC_REGEX = new RegExp(
   `next[\\\\/]dist[\\\\/]client[\\\\/](${nextClientComponents.join('|')})\\.js$`
 )
-const NEXT_BUILT_IN_CLIENT_RSC_REGEX = new RegExp(
-  `next[\\\\/](${nextClientComponents.join('|')})\\.js$`
-)
+// const NEXT_BUILT_IN_CLIENT_RSC_REGEX = new RegExp(
+//   `next[\\\\/](${nextClientComponents.join('|')})\\.js$`
+// )
 
 // Cover resource paths like `next/*` and `next/dist/client/*`
 export function isNextBuiltInClientComponent(resource: string) {
   return (
-    NEXT_BUILT_IN_CLIENT_RSC_REGEX.test(resource) ||
+    // NEXT_BUILT_IN_CLIENT_RSC_REGEX.test(resource) ||
     NEXT_API_CLIENT_RSC_REGEX.test(resource)
   )
 }

packages/next/build/webpack/plugins/flight-client-entry-plugin.ts

@@ -247,7 +247,9 @@ export class FlightClientEntryPlugin {
 
       // Check if request is for css file.
       if ((!inClientComponentBoundary && isClientComponent) || isCSS) {
-        clientComponentImports.push(modRequest)
+        clientComponentImports.push(
+          isCSS ? modRequest : require.resolve(modRequest)
+        )
         return
       }
 

packages/next/compiled/@edge-runtime/primitives/console.js

@@ -567,8 +567,8 @@ var time = console.time.bind(console);
 var timeEnd = console.timeEnd.bind(console);
 var timeLog = console.timeLog.bind(console);
 var trace = console.trace.bind(console);
-var error = bareError; // /* @__PURE__ */ __name((...args) => bareError(format(...args)), "error");
-var log = bareLog; // /* @__PURE__ */ __name((...args) => bareLog(format(...args)), "log");
+var error = /* @__PURE__ */ __name((...args) => bareError(format(...args)), "error");
+var log = /* @__PURE__ */ __name((...args) => bareLog(format(...args)), "log");
 var konsole = {
   assert: (assertion, ...args) => assert(assertion, format(...args)),
   count: console.count.bind(console),

test/e2e/app-dir/app/app/dashboard/page.js

@@ -12,6 +12,6 @@ export default function DashboardPage(props) {
   )
 }
 
-// export const config = {
-//   runtime: 'experimental-edge',
-// }
+export const config = {
+  runtime: 'experimental-edge',
+}

test/e2e/app-dir/app/app/old-router/Router.js

@@ -1,15 +1,19 @@
 import { useRouter, withRouter } from 'next/router'
-import IsNull from './IsNull'
+import IsNull from './is-null'
+import ServerRouter from './server-router'
+import ClientRouter from './client-router'
 
-function ServerRouter({ router: withRouter }) {
+function SharedRouter({ router: withRouter }) {
   const router = useRouter()
 
   return (
     <>
       <IsNull value={withRouter} />
       <IsNull value={router} />
+      <ServerRouter />
+      <ClientRouter />
     </>
   )
 }
 
-export default withRouter(ServerRouter)
+export default withRouter(SharedRouter)

test/e2e/app-dir/app/app/old-router/Router.client.js renamed to test/e2e/app-dir/app/app/old-router/client-router.js

@@ -1,7 +1,7 @@
 'client'
 
 import { useRouter, withRouter } from 'next/router'
-import IsNull from './IsNull'
+import IsNull from './is-null'
 
 function ClientRouter({ router: withRouter }) {
   const router = useRouter()

test/e2e/app-dir/app/app/old-router/IsNull.js renamed to test/e2e/app-dir/app/app/old-router/is-null.js

@@ -0,0 +1,15 @@
+import { useRouter, withRouter } from 'next/router'
+import IsNull from './is-null'
+
+function ServerRouter({ router: withRouter }) {
+  const router = useRouter()
+
+  return (
+    <>
+      <IsNull value={withRouter} />
+      <IsNull value={router} />
+    </>
+  )
+}
+
+export default withRouter(ServerRouter)

test/e2e/app-dir/app/app/old-router/server-router.js

@@ -11,6 +11,6 @@ export default function SlowPage(props) {
   return <h1 id="slow-page-message">{props.message}</h1>
 }
 
-// export const config = {
-//   runtime: 'experimental-edge',
-// }
+export const config = {
+  runtime: 'experimental-edge',
+}

test/e2e/app-dir/app/app/slow-page-with-loading/page.js

@@ -772,7 +772,7 @@ describe('app dir', () => {
             expect(notNull.length).toBe(0)
 
             const wasNull = await browser.elementsByCss('.was-null')
-            expect(wasNull.length).toBe(2)
+            expect(wasNull.length).toBe(6)
           } finally {
             await browser.close()
           }