Allow server-only in server targets and client-only in client components targets to be available

packages/next-swc/crates/core/src/lib.rs

@@ -46,7 +46,8 @@ use turbopack_binding::swc::{
             SyntaxContext,
         },
         ecma::{
-            ast::EsVersion, parser::parse_file_as_module, transforms::base::pass::noop, visit::Fold,
+            ast::EsVersion, atoms::JsWord, parser::parse_file_as_module,
+            transforms::base::pass::noop, visit::Fold,
         },
     },
     custom_transform::modularize_imports,
@@ -97,7 +98,7 @@ pub struct TransformOptions {
     pub is_server: bool,
 
     #[serde(default)]
-    pub disable_checks: bool,
+    pub bundle_target: JsWord,
 
     #[serde(default)]
     pub server_components: Option<react_server_components::Config>,
@@ -198,7 +199,7 @@ where
                     config.clone(),
                     comments.clone(),
                     opts.app_dir.clone(),
-                    opts.disable_checks
+                    opts.bundle_target.clone()
                 )),
             _ => Either::Right(noop()),
         },

packages/next-swc/crates/core/src/react_server_components.rs

@@ -50,7 +50,7 @@ struct ReactServerComponents<C: Comments> {
     invalid_client_imports: Vec<JsWord>,
     invalid_server_react_apis: Vec<JsWord>,
     invalid_server_react_dom_apis: Vec<JsWord>,
-    disable_checks: bool,
+    bundle_target: String,
 }
 
 struct ModuleImports {
@@ -67,15 +67,25 @@ impl<C: Comments> VisitMut for ReactServerComponents<C> {
         let is_cjs = contains_cjs(module);
 
         if self.is_server {
-            if !is_client_entry {
-                self.assert_server_graph(&imports, module);
-            } else {
+            if is_client_entry {
                 self.to_module_ref(module, is_cjs);
                 return;
+            } else if self.bundle_target == "server" {
+                // Only assert server graph if file's bundle target is "server", e.g.
+                // * server components pages
+                // * pages bundles on SSR layer
+                // * middleware
+                // * app/pages api routes
+                self.assert_server_graph(&imports, module);
             }
         } else {
-            if !is_action_file {
-                self.assert_client_graph(&imports, module);
+            // Only assert client graph if the file is not an action file,
+            // and bundle target is "client" e.g.
+            // * client components pages
+            // * pages bundles on browser layer
+            if !is_action_file && self.bundle_target == "client" {
+                self.assert_client_graph(&imports);
+                self.assert_invalid_api(module, true);
             }
             if is_client_entry {
                 self.prepend_comment_node(module, is_cjs);
@@ -129,7 +139,7 @@ impl<C: Comments> ReactServerComponents<C> {
                                             if is_action_file {
                                                 panic_both_directives(expr_stmt.span)
                                             }
-                                        } else if !self.disable_checks {
+                                        } else if self.bundle_target != "default" {
                                             HANDLER.with(|handler| {
                                                 handler
                                                     .struct_span_err(
@@ -334,9 +344,6 @@ impl<C: Comments> ReactServerComponents<C> {
     }
 
     fn assert_server_graph(&self, imports: &[ModuleImports], module: &Module) {
-        if self.disable_checks {
-            return;
-        }
         for import in imports {
             let source = import.source.0.clone();
             if self.invalid_server_imports.contains(&source) {
@@ -408,10 +415,7 @@ impl<C: Comments> ReactServerComponents<C> {
         }
     }
 
-    fn assert_client_graph(&self, imports: &[ModuleImports], module: &Module) {
-        if self.disable_checks {
-            return;
-        }
+    fn assert_client_graph(&self, imports: &[ModuleImports]) {
         for import in imports {
             let source = import.source.0.clone();
             if self.invalid_client_imports.contains(&source) {
@@ -425,8 +429,6 @@ impl<C: Comments> ReactServerComponents<C> {
                 })
             }
         }
-
-        self.assert_invalid_api(module, true);
     }
 
     fn assert_invalid_api(&self, module: &Module, is_client_entry: bool) {
@@ -567,17 +569,17 @@ pub fn server_components<C: Comments>(
     config: Config,
     comments: C,
     app_dir: Option<PathBuf>,
-    disable_checks: bool,
+    bundle_target: JsWord,
 ) -> impl Fold + VisitMut {
     let is_server: bool = match &config {
         Config::WithOptions(x) => x.is_server,
         _ => true,
     };
     as_folder(ReactServerComponents {
-        disable_checks,
         is_server,
         comments,
         filepath: filename.to_string(),
+        bundle_target: bundle_target.to_string(),
         app_dir,
         export_names: vec![],
         invalid_server_imports: vec![

packages/next-swc/crates/core/tests/errors.rs

@@ -97,7 +97,7 @@ fn react_server_components_server_graph_errors(input: PathBuf) {
                 ),
                 tr.comments.as_ref().clone(),
                 None,
-                false,
+                String::from("server").into(),
             )
         },
         &input,
@@ -122,7 +122,7 @@ fn react_server_components_client_graph_errors(input: PathBuf) {
                 ),
                 tr.comments.as_ref().clone(),
                 None,
-                false,
+                String::from("client").into(),
             )
         },
         &input,
@@ -169,7 +169,7 @@ fn react_server_actions_server_errors(input: PathBuf) {
                     ),
                     tr.comments.as_ref().clone(),
                     None,
-                    false
+                    String::from("default").into(),
                 ),
                 server_actions(
                     &FileName::Real("/app/item.js".into()),
@@ -205,7 +205,7 @@ fn react_server_actions_client_errors(input: PathBuf) {
                     ),
                     tr.comments.as_ref().clone(),
                     None,
-                    false
+                    String::from("client").into(),
                 ),
                 server_actions(
                     &FileName::Real("/app/item.js".into()),

packages/next-swc/crates/core/tests/fixture.rs

@@ -326,7 +326,7 @@ fn react_server_components_server_graph_fixture(input: PathBuf) {
                 ),
                 tr.comments.as_ref().clone(),
                 None,
-                false,
+                String::from("default").into(),
             )
         },
         &input,
@@ -348,7 +348,7 @@ fn react_server_components_no_checks_server_graph_fixture(input: PathBuf) {
                 ),
                 tr.comments.as_ref().clone(),
                 None,
-                true,
+                String::from("default").into(),
             )
         },
         &input,
@@ -370,7 +370,7 @@ fn react_server_components_client_graph_fixture(input: PathBuf) {
                 ),
                 tr.comments.as_ref().clone(),
                 None,
-                false,
+                String::from("default").into(),
             )
         },
         &input,
@@ -392,7 +392,7 @@ fn react_server_components_no_checks_client_graph_fixture(input: PathBuf) {
                 ),
                 tr.comments.as_ref().clone(),
                 None,
-                true,
+                String::from("default").into(),
             )
         },
         &input,

packages/next-swc/crates/core/tests/full.rs

@@ -81,7 +81,7 @@ fn test(input: &Path, minify: bool) {
                 auto_modularize_imports: None,
                 optimize_barrel_exports: None,
                 optimize_server_react: None,
-                disable_checks: false,
+                bundle_target: String::from("default").into(),
             };
 
             let unresolved_mark = Mark::new();

packages/next/src/build/swc/options.ts

@@ -5,6 +5,8 @@ import type {
   StyledComponentsConfig,
 } from '../../server/config-shared'
 
+type BundleType = 'client' | 'server' | 'default'
+
 const nextDistPath =
   /(next[\\/]dist[\\/]shared[\\/]lib)|(next[\\/]dist[\\/]client)|(next[\\/]dist[\\/]pages)/
 
@@ -42,6 +44,7 @@ function getBaseSWCOptions({
   jsConfig,
   swcCacheDir,
   isServerLayer,
+  bundleTarget,
   hasServerComponents,
   isServerActionsEnabled,
 }: {
@@ -55,6 +58,7 @@ function getBaseSWCOptions({
   compilerOptions: NextConfig['compiler']
   resolvedBaseUrl?: string
   jsConfig: any
+  bundleTarget: BundleType
   swcCacheDir?: string
   isServerLayer?: boolean
   hasServerComponents?: boolean
@@ -184,7 +188,7 @@ function getBaseSWCOptions({
           isServer: !!isServerLayer,
         }
       : undefined,
-    disableChecks: false,
+    bundleTarget,
   }
 }
 
@@ -274,13 +278,14 @@ export function getJestSWCOptions({
     resolvedBaseUrl,
     // Don't apply server layer transformations for Jest
     isServerLayer: false,
+    // Disable server / client graph assertions for Jest
+    bundleTarget: 'default',
   })
 
   const isNextDist = nextDistPath.test(filename)
 
   return {
     ...baseOptions,
-    disableChecks: true,
     env: {
       targets: {
         // Targets the current version of Node.js
@@ -317,6 +322,7 @@ export function getLoaderSWCOptions({
   isServerLayer,
   isServerActionsEnabled,
   optimizeBarrelExports,
+  bundleTarget = 'client',
 }: // This is not passed yet as "paths" resolving is handled by webpack currently.
 // resolvedBaseUrl,
 {
@@ -338,6 +344,7 @@ export function getLoaderSWCOptions({
   supportedBrowsers: string[]
   swcCacheDir: string
   relativeFilePathFromRoot: string
+  bundleTarget: BundleType
   hasServerComponents?: boolean
   isServerLayer: boolean
   isServerActionsEnabled?: boolean
@@ -357,6 +364,7 @@ export function getLoaderSWCOptions({
     hasServerComponents,
     isServerLayer,
     isServerActionsEnabled,
+    bundleTarget,
   })
   baseOptions.fontLoaders = {
     fontLoaders: [

packages/next/src/build/utils.ts

@@ -15,6 +15,7 @@ import type {
   MiddlewareManifest,
 } from './webpack/plugins/middleware-plugin'
 import type { StaticGenerationAsyncStorage } from '../client/components/static-generation-async-storage.external'
+import type { WebpackLayerName } from '../lib/constants'
 
 import '../server/require-hook'
 import '../server/node-polyfill-fetch'
@@ -35,6 +36,7 @@ import {
   SERVER_PROPS_SSG_CONFLICT,
   MIDDLEWARE_FILENAME,
   INSTRUMENTATION_HOOK_FILENAME,
+  WEBPACK_LAYERS,
 } from '../lib/constants'
 import { MODERN_BROWSERSLIST_TARGET } from '../shared/lib/constants'
 import prettyBytes from '../lib/pretty-bytes'
@@ -2116,3 +2118,15 @@ export function getSupportedBrowsers(
   // Uses modern browsers as the default.
   return MODERN_BROWSERSLIST_TARGET
 }
+
+export function isWebpackServerLayer(
+  layer: WebpackLayerName | null | undefined
+): boolean {
+  return Boolean(layer && WEBPACK_LAYERS.GROUP.server.includes(layer as any))
+}
+
+export function isWebpackDefaultLayer(
+  layer: WebpackLayerName | null | undefined
+): boolean {
+  return layer === null || layer === undefined
+}