Merge branch 'canary' into hrmny/rename-turbo-binding

vercel · May 15, 2023 · 67b09a8 · 67b09a8
2 parents ca3711a + f6f07c0
commit 67b09a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/next-swc/crates/next-core/src/next_client/context.rs b/packages/next-swc/crates/next-core/src/next_client/context.rs
@@ -218,10 +218,17 @@ pub async fn get_client_module_options_context(
         },
     ));
 
+    let postcss_transform_options = Some(PostCssTransformOptions {
+        postcss_package: Some(get_postcss_package_mapping(project_path)),
+        ..Default::default()
+    });
+
     let module_options_context = ModuleOptionsContext {
         preset_env_versions: Some(env),
         execution_context: Some(execution_context),
         custom_ecma_transform_plugins,
+        // NOTE(WEB-1016) PostCSS transforms should also apply to foreign code.
+        enable_postcss_transform: postcss_transform_options.clone(),
         ..Default::default()
     };
 
@@ -236,10 +243,7 @@ pub async fn get_client_module_options_context(
         enable_react_refresh,
         enable_styled_components,
         enable_styled_jsx: true,
-        enable_postcss_transform: Some(PostCssTransformOptions {
-            postcss_package: Some(get_postcss_package_mapping(project_path)),
-            ..Default::default()
-        }),
+        enable_postcss_transform: postcss_transform_options,
         enable_webpack_loaders,
         enable_typescript_transform: Some(tsconfig),
         enable_mdx_rs: mdx_rs_options,

diff --git a/packages/next-swc/crates/next-dev-tests/tests-manifest.json b/packages/next-swc/crates/next-dev-tests/tests-manifest.json
@@ -2,5 +2,6 @@
   "test/development/acceptance-app/dynamic-error.test.ts",
   "test/development/basic/legacy-decorators.test.ts",
   "test/integration/plugin-mdx-rs/test/index.test.js",
-  "test/e2e/app-dir/underscore-ignore-app-paths/underscore-ignore-app-paths.test.ts"
+  "test/e2e/app-dir/underscore-ignore-app-paths/underscore-ignore-app-paths.test.ts",
+  "test/e2e/postcss-config-cjs/index.test.ts"
 ]