vercel · kodiakhq · Oct 6, 2023 · Oct 2, 2023 · Oct 4, 2023 · Oct 4, 2023
diff --git a/packages/next-swc/crates/next-core/src/next_import_map.rs b/packages/next-swc/crates/next-core/src/next_import_map.rs
@@ -29,7 +29,7 @@ use crate::{
         local::{NextFontLocalCssModuleReplacer, NextFontLocalReplacer},
     },
     next_server::context::ServerContextType,
-    util::NextRuntime,
+    util::{load_next_js_templateon, NextRuntime},
 };
 
 // Make sure to not add any external requests here.
@@ -292,6 +292,18 @@ pub async fn get_next_server_import_map(
                 "react-server-dom-webpack/",
                 ImportMapping::External(Some("react-server-dom-turbopack".into())).cell(),
             );
+
+            // Always load these predefined packages as external.
+            let external_packages: Vec<String> = load_next_js_templateon(
+                project_path,
+                "dist/lib/server-external-packages.json".to_string(),
+            )
+            .await?;
+
+            for external_package in external_packages {
+                import_map.insert_exact_alias(&external_package, external);
+                import_map.insert_wildcard_alias(external_package + "/", external);
+            }
         }
         ServerContextType::Middleware => {}
     }

diff --git a/packages/next-swc/crates/next-core/src/util.rs b/packages/next-swc/crates/next-core/src/util.rs
@@ -568,12 +568,12 @@ pub async fn load_next_js_templateon<T: DeserializeOwned>(
     project_path: Vc<FileSystemPath>,
     path: String,
 ) -> Result<T> {
-    let file_path = get_next_package(project_path).join(path);
+    let file_path = get_next_package(project_path).join(path.clone());
 
     let content = &*file_path.read().await?;
 
     let FileContent::Content(file) = content else {
-        bail!("Expected file content for metrics data");
+        bail!("Expected file content at {}", path);
     };
 
     let result: T = parse_json_rope_with_source_context(file.content())?;

diff --git a/test/integration/externals-app-bundle/app/layout.js b/test/integration/externals-app-bundle/app/layout.js
@@ -0,0 +1,12 @@
+export const metadata = {
+  title: 'Next.js',
+  description: 'Generated by Next.js',
+}
+
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/integration/externals-app-bundle/app/page.js b/test/integration/externals-app-bundle/app/page.js
@@ -0,0 +1,5 @@
+import { foo } from 'external-package'
+
+export default function Index() {
+  return <div>{foo}</div>
+}
diff --git a/test/integration/externals-app-bundle/app/predefined/page.js b/test/integration/externals-app-bundle/app/predefined/page.js
@@ -0,0 +1,5 @@
+import { foo } from 'sqlite3'
+
+export default function Predefined() {
+  return <div>{foo}</div>
+}
diff --git a/test/integration/externals-app-bundle/next.config.js b/test/integration/externals-app-bundle/next.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  experimental: {
+    serverComponentsExternalPackages: ['external-package'],
+  },
+}
diff --git a/test/integration/externals-app-bundle/node_modules/external-package/index.js b/test/integration/externals-app-bundle/node_modules/external-package/index.js
diff --git a/test/integration/externals-app-bundle/node_modules/external-package/package.json b/test/integration/externals-app-bundle/node_modules/external-package/package.json
diff --git a/test/integration/externals-app-bundle/node_modules/sqlite3/index.js b/test/integration/externals-app-bundle/node_modules/sqlite3/index.js
diff --git a/test/integration/externals-app-bundle/node_modules/sqlite3/package.json b/test/integration/externals-app-bundle/node_modules/sqlite3/package.json
diff --git a/test/integration/externals-app-bundle/test/index.test.js b/test/integration/externals-app-bundle/test/index.test.js
@@ -0,0 +1,80 @@
+/* eslint-env jest */
+
+import fs from 'fs/promises'
+import { join } from 'path'
+import {
+  killApp,
+  launchApp,
+  findPort,
+  renderViaHTTP,
+  waitFor,
+} from 'next-test-utils'
+
+const appDir = join(__dirname, '../')
+
+describe('app bundle externals ', () => {
+  describe('dev mode', () => {
+    it('should have externals for those in config.experimental.serverComponentsExternalPackages', async () => {
+      const port = await findPort()
+      const app = await launchApp(appDir, port)
+      await renderViaHTTP(port, '/')
+      await waitFor(1000)
+      if (process.env.TURBOPACK) {
+        const appBundles = await getAppPageChunkPaths(appDir)
+        const bundleTexts = await Promise.all(
+          appBundles.map((b) => fs.readFile(b, 'utf8'))
+        )
+        expect(
+          bundleTexts.find((t) =>
+            t.includes(
+              '__turbopack_external_require__("external-package", true)'
+            )
+          )
+        ).not.toBeUndefined()
+      } else {
+        const output = await fs.readFile(
+          join(appDir, '.next/server/app/page.js'),
+          'utf8'
+        )
+        expect(output).toContain('require("external-package")')
+      }
+      await killApp(app)
+    })
+
+    it('uses externals for predefined list in server-external-packages.json', async () => {
+      const port = await findPort()
+      const app = await launchApp(appDir, port)
+      await renderViaHTTP(port, '/predefined')
+      await waitFor(1000)
+      if (process.env.TURBOPACK) {
+        const appBundles = await getAppPageChunkPaths(appDir, 'predefined')
+        const bundleTexts = await Promise.all(
+          appBundles.map((b) => fs.readFile(b, 'utf8'))
+        )
+        expect(
+          bundleTexts.find((t) =>
+            t.includes('__turbopack_external_require__("sqlite3", true)')
+          )
+        ).not.toBeUndefined()
+      } else {
+        const output = await fs.readFile(
+          join(appDir, '.next/server/app/predefined/page.js'),
+          'utf8'
+        )
+        expect(output).toContain('require("sqlite3")')
+      }
+      await killApp(app)
+    })
+  })
+})
+
+async function getAppPageChunkPaths(appDir, pageName) {
+  const rscPath = join(appDir, '.next/server/chunks/rsc')
+  const pageRegex = new RegExp(
+    `app${pageName ? '_' + pageName : ''}_page_[0-9a-f]+.js$`
+  )
+
+  return (await fs.readdir(rscPath))
+    .filter((p) => p.match(pageRegex))
+    .map((basename) => join(rscPath, basename))
+}
diff --git a/test/integration/externals-pages-bundle/test/externals.test.js b/test/integration/externals-pages-bundle/test/externals.test.js
@@ -0,0 +1,49 @@
+/* eslint-env jest */
+
+import fs from 'fs/promises'
+import { join } from 'path'
+import {
+  killApp,
+  launchApp,
+  findPort,
+  File,
+  renderViaHTTP,
+  waitFor,
+} from 'next-test-utils'
+
+const appDir = join(__dirname, '../')
+
+describe('default', () => {
+  it('should use externals for unvendored node_modules reachable from the project', async () => {
+    const port = await findPort()
+    const config = new File(join(appDir, 'next.config.js'))
+    config.delete()
+    try {
+      const app = await launchApp(appDir, port)
+      await renderViaHTTP(port, '/')
+      if (process.env.TURBOPACK) {
+        const ssrPath = join(appDir, '.next/server/chunks/ssr')
+        const pageBundleBasename = (await fs.readdir(ssrPath)).find((p) =>
+          p.match(/pages_index_[0-9a-f]+\.js$/)
+        )
+        expect(pageBundleBasename).not.toBeUndefined()
+        const output = await fs.readFile(
+          join(ssrPath, pageBundleBasename),
+          'utf8'
+        )
+        expect(output).toContain(
+          '__turbopack_external_require__("external-package", true)'
+        )
+      } else {
+        const output = await fs.readFile(
+          join(appDir, '.next/server/pages/index.js'),
+          'utf8'
+        )
+        expect(output).toContain('require("external-package")')
+      }
+      await killApp(app)
+    } finally {
+      config.restore()
+    }
+  })
+})