Commit 277cfed1 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig

fix default imports

parent bb6c6867
......@@ -11,8 +11,12 @@ mod module_asset;
pub(crate) mod process;
pub(crate) mod references;
use std::borrow::Cow;
use bincode::{Decode, Encode};
use turbo_rcstr::rcstr;
use turbo_tasks::{NonLocalValue, TaskInput, trace::TraceRawVcs};
use turbopack_core::module_graph::binding_usage_info::ModuleExportUsageInfo;
use crate::references::import::ImportAssetReference;
pub use crate::{asset::CssModule, module_asset::EcmascriptCssModule, process::*};
......@@ -51,3 +55,16 @@ pub struct LightningCssFeatureFlags {
pub include: u32,
pub exclude: u32,
}
fn normalize_module_export_usage_for_css_module(
export_usage_info: &'_ ModuleExportUsageInfo,
) -> Cow<'_, ModuleExportUsageInfo> {
if let ModuleExportUsageInfo::Exports(exports) = export_usage_info
&& exports.contains(&rcstr!("default"))
{
// Deopt, some module might have done `import styles from ...`.
Cow::Owned(ModuleExportUsageInfo::All)
} else {
Cow::Borrowed(export_usage_info)
}
}
......@@ -28,7 +28,7 @@ use turbopack_ecmascript::{
};
use crate::{
CssModule,
CssModule, normalize_module_export_usage_for_css_module,
process::{CssWithPlaceholderResult, ProcessCss},
references::{compose::CssModuleComposeReference, internal::InternalCssAssetReference},
};
......@@ -293,6 +293,7 @@ impl EcmascriptChunkPlaceable for EcmascriptCssModule {
.module_export_usage(Vc::upcast(self))
.await?;
let export_usage_info = export_usage.export_usage.await?;
let export_usage_info = normalize_module_export_usage_for_css_module(&export_usage_info);
let mut code = format!("{TURBOPACK_EXPORT_VALUE}({{\n");
for (export_name, class_names) in &*classes {
......
......@@ -43,6 +43,7 @@ use turbopack_core::{
use crate::{
CssModuleType, LightningCssFeatureFlags,
lifetime_util::stylesheet_into_static,
normalize_module_export_usage_for_css_module,
references::{
analyze_references,
url::{UrlAssetReference, replace_url_references, resolve_url_reference},
......@@ -319,9 +320,11 @@ pub async fn finalize_css(
.module_export_usage(*ecmascript_module)
.await?;
let export_usage_info = export_usage.export_usage.await?;
let export_usage_info =
normalize_module_export_usage_for_css_module(&export_usage_info);
let unused_symbols: HashSet<String> = match &*export_usage_info {
// All exports used, or unknown — keep every class.
// All exports used — keep every class.
ModuleExportUsageInfo::All => Default::default(),
// Some or no exports used — collect hashed names of unused classes.
ModuleExportUsageInfo::Evaluation | ModuleExportUsageInfo::Exports(_) => {
......
import * as styles from './style.module.css'
import styles2 from './default.module.css'
console.log(styles.green)
console.log(styles2.used)
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push(["output/0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_0hzk-no._.js",
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push(["output/0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_0-t3weg._.js",
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/style.module.css [test] (css module)", ((__turbopack_context__) => {
__turbopack_context__.v({
"green": "style-module__o6j6Ba__green",
});
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/default.module.css [test] (css module)", ((__turbopack_context__) => {
__turbopack_context__.v({
"default": "default-module__3W_8-a__default",
"used": "default-module__3W_8-a__used",
});
}),
"[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/index.js [test] (ecmascript)", ((__turbopack_context__) => {
"use strict";
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$css$2f$css$2d$modules$2d$remove$2d$unused$2f$input$2f$style$2e$module$2e$css__$5b$test$5d$__$28$css__module$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/style.module.css [test] (css module)");
var __TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$css$2f$css$2d$modules$2d$remove$2d$unused$2f$input$2f$default$2e$module$2e$css__$5b$test$5d$__$28$css__module$29$__ = __turbopack_context__.i("[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/default.module.css [test] (css module)");
;
;
console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$css$2f$css$2d$modules$2d$remove$2d$unused$2f$input$2f$style$2e$module$2e$css__$5b$test$5d$__$28$css__module$29$__["green"]);
console.log(__TURBOPACK__imported__module__$5b$project$5d2f$turbopack$2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$css$2f$css$2d$modules$2d$remove$2d$unused$2f$input$2f$default$2e$module$2e$css__$5b$test$5d$__$28$css__module$29$__["default"].used);
__turbopack_context__.s([]);
}),
]);
//# sourceMappingURL=0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_0hzk-no._.js.map
\ No newline at end of file
//# sourceMappingURL=0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_0-t3weg._.js.map
\ No newline at end of file
......@@ -3,5 +3,6 @@
"sources": [],
"sections": [
{"offset": {"line": 3, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/style.module.css [test] (css module)"],"sourcesContent":["__turbopack_context__.v({\n \"green\": \"style-module__o6j6Ba__green\",\n});\n"],"names":[],"mappings":"AAAA;AACA;AACA"}},
{"offset": {"line": 10, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/index.js"],"sourcesContent":["import * as styles from './style.module.css'\n\nconsole.log(styles.green)\n"],"names":["console","log"],"mappings":"AAAA;;AAEAA,QAAQC,GAAG,CAAC,4OAAY"}}]
{"offset": {"line": 9, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/default.module.css [test] (css module)"],"sourcesContent":["__turbopack_context__.v({\n \"default\": \"default-module__3W_8-a__default\",\n \"used\": \"default-module__3W_8-a__used\",\n});\n"],"names":[],"mappings":"AAAA;AACA;AACA;AACA"}},
{"offset": {"line": 17, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/index.js"],"sourcesContent":["import * as styles from './style.module.css'\nimport styles2 from './default.module.css'\n\nconsole.log(styles.green)\nconsole.log(styles2.used)\n"],"names":["console","log","used"],"mappings":"AAAA;AACA;;;AAEAA,QAAQC,GAAG,CAAC,4OAAY;AACxBD,QAAQC,GAAG,CAAC,gPAAO,CAACC,IAAI"}}]
}
\ No newline at end of file
......@@ -3,4 +3,13 @@
color: green;
}
/*# sourceMappingURL=1jsg_tests_snapshot_css_css-modules-remove-unused_input_style_module_1ee6vwx.css.map*/
\ No newline at end of file
/* [project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/default.module.css [test] (css) */
.default-module__3W_8-a__default {
color: green;
}
.default-module__3W_8-a__used {
color: #0f0;
}
/*# sourceMappingURL=0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_1r_q45_._.css.map*/
\ No newline at end of file
......@@ -2,5 +2,6 @@
"version": 3,
"sources": [],
"sections": [
{"offset": {"line": 1, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/style.module.css"],"sourcesContent":[".green {\n color: green;\n}\n\n.unused {\n color: red;\n\n animation-name: unused-slide-in;\n animation-duration: 2s;\n}\n\n@keyframes unused-slide-in {\n from {\n transform: translateX(0%);\n }\n\n to {\n transform: translateX(100%);\n }\n}\n"],"names":[],"mappings":"AAAA"}}]
{"offset": {"line": 1, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/style.module.css"],"sourcesContent":[".green {\n color: green;\n}\n\n.unused {\n color: red;\n\n animation-name: unused-slide-in;\n animation-duration: 2s;\n}\n\n@keyframes unused-slide-in {\n from {\n transform: translateX(0%);\n }\n\n to {\n transform: translateX(100%);\n }\n}\n"],"names":[],"mappings":"AAAA"}},
{"offset": {"line": 6, "column": 0}, "map": {"version":3,"sources":["turbopack:///[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/default.module.css"],"sourcesContent":[".default {\n color: green;\n}\n\n.used {\n color: lime;\n}\n"],"names":[],"mappings":"AAAA;;;;AAIA"}}]
}
\ No newline at end of file
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
"output/1ece_tests_snapshot_css_css-modules-remove-unused_input_index_03orf36.js",
{"otherChunks":["output/1jsg_tests_snapshot_css_css-modules-remove-unused_input_style_module_1ee6vwx.css","output/0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_0hzk-no._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/index.js [test] (ecmascript)"]}
]);
// Dummy runtime
\ No newline at end of file
(globalThis["TURBOPACK"] || (globalThis["TURBOPACK"] = [])).push([
"output/1ece_tests_snapshot_css_css-modules-remove-unused_input_index_1-4f82v.js",
{"otherChunks":["output/0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_1r_q45_._.css","output/0_9x_turbopack-tests_tests_snapshot_css_css-modules-remove-unused_input_0-t3weg._.js"],"runtimeModuleIds":["[project]/turbopack/crates/turbopack-tests/tests/snapshot/css/css-modules-remove-unused/input/index.js [test] (ecmascript)"]}
]);
// Dummy runtime
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment