From 3c7fb4ec03e9603768c9b10ee4bbd5acd82a29b7 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Tue, 21 May 2024 16:38:17 +0200 Subject: [PATCH] Upgrade lightningcss, disable grid scoping (vercel/turbo#8176) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### Description Implements https://github.com/parcel-bundler/lightningcss/pull/739/files. Grid scoping in CSS Modules is disabled because Webpack CSS Modules handling doesn't handle grid currently. This ensures moving from Webpack to Turbopack doesn't have mismatching behavior around CSS grid. ### Testing Instructions --- crates/turbopack-css/src/process.rs | 4 ++++ ...tests_tests_snapshot_css_css-modules_input_8abc52._.js | 7 +------ ...s_tests_snapshot_css_css-modules_input_8abc52._.js.map | 8 ++++---- ...snapshot_css_css-modules_input_style_module_71f14f.css | 4 ++-- ...snapshot_css_css-modules_input_style_module_7d7e1c.css | 4 ++-- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/crates/turbopack-css/src/process.rs b/crates/turbopack-css/src/process.rs index 4b1531a0a01ca..66eed9e059a14 100644 --- a/crates/turbopack-css/src/process.rs +++ b/crates/turbopack-css/src/process.rs @@ -547,6 +547,8 @@ async fn process_content( ], }, dashed_idents: false, + grid: false, + ..Default::default() }), _ => None, @@ -1227,6 +1229,8 @@ mod tests { css_modules: Some(lightningcss::css_modules::Config { pattern: Pattern::default(), dashed_idents: false, + grid: false, + ..Default::default() }), ..Default::default() }, diff --git a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js index f35bc3201e0e7..ecb8113caf76b 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js +++ b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js @@ -3,11 +3,6 @@ "[project]/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css module)": (({ r: __turbopack_require__, f: __turbopack_module_context__, i: __turbopack_import__, s: __turbopack_esm__, v: __turbopack_export_value__, n: __turbopack_export_namespace__, c: __turbopack_cache__, M: __turbopack_modules__, l: __turbopack_load__, j: __turbopack_dynamic__, P: __turbopack_resolve_absolute_path__, U: __turbopack_relative_url__, R: __turbopack_resolve_module_id_path__, g: global, __dirname }) => (() => { __turbopack_export_value__({ - "actions": "style-module__mnEziG__actions", - "avatar": "style-module__mnEziG__avatar", - "checkbox": "style-module__mnEziG__checkbox", - "content": "style-module__mnEziG__content", - "menu": "style-module__mnEziG__menu", "module-style": "style-module__mnEziG__module-style", }); @@ -24,4 +19,4 @@ console.log(__TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$ })()), }]); -//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js.map \ No newline at end of file +//# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js.map diff --git a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js.map b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js.map index a2bb8a6258da6..c9a39cf46b0fd 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js.map +++ b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_8abc52._.js.map @@ -2,8 +2,8 @@ "version": 3, "sources": [], "sections": [ - {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack://[project]/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css module)"],"sourcesContent":["__turbopack_export_value__({\n \"actions\": \"style-module__mnEziG__actions\",\n \"avatar\": \"style-module__mnEziG__avatar\",\n \"checkbox\": \"style-module__mnEziG__checkbox\",\n \"content\": \"style-module__mnEziG__content\",\n \"menu\": \"style-module__mnEziG__menu\",\n \"module-style\": \"style-module__mnEziG__module-style\",\n});\n"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA"}}, - {"offset": {"line": 12, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}, - {"offset": {"line": 17, "column": 0}, "map": {"version":3,"sources":["turbopack://[project]/crates/turbopack-tests/tests/snapshot/css/css-modules/input/index.js"],"sourcesContent":["import style from \"./style.module.css\";\n\nconsole.log(style, import(\"./style.module.css\"));\n"],"names":[],"mappings":";;;;AAEA,QAAQ,GAAG,CAAC,kMAAA,CAAA,UAAK"}}, - {"offset": {"line": 22, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] + {"offset": {"line": 4, "column": 0}, "map": {"version":3,"sources":["turbopack://[project]/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css module)"],"sourcesContent":["__turbopack_export_value__({\n \"module-style\": \"style-module__mnEziG__module-style\",\n});\n"],"names":[],"mappings":"AAAA;AACA;AACA"}}, + {"offset": {"line": 7, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}, + {"offset": {"line": 12, "column": 0}, "map": {"version":3,"sources":["turbopack://[project]/crates/turbopack-tests/tests/snapshot/css/css-modules/input/index.js"],"sourcesContent":["import style from \"./style.module.css\";\n\nconsole.log(style, import(\"./style.module.css\"));\n"],"names":[],"mappings":";;;;AAEA,QAAQ,GAAG,CAAC,kMAAA,CAAA,UAAK"}}, + {"offset": {"line": 17, "column": 0}, "map": {"version":3,"sources":[],"names":[],"mappings":"A"}}] } \ No newline at end of file diff --git a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_71f14f.css b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_71f14f.css index b4eb8a959d91a..c3b83f640b96e 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_71f14f.css +++ b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_71f14f.css @@ -1,7 +1,7 @@ /* [project]/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css) */ .style-module__mnEziG__module-style { - grid-template-areas: "style-module__mnEziG__checkbox style-module__mnEziG__avatar style-module__mnEziG__content style-module__mnEziG__actions style-module__mnEziG__menu"; + grid-template-areas: "checkbox avatar content actions menu"; } -/*# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_71f14f.css.map*/ \ No newline at end of file +/*# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_71f14f.css.map*/ diff --git a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css index 4559db88f6b98..bd998c7e0439f 100644 --- a/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css +++ b/crates/turbopack-tests/tests/snapshot/css/css-modules/output/crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css @@ -1,6 +1,6 @@ /* [project]/crates/turbopack-tests/tests/snapshot/css/css-modules/input/style.module.css [test] (css) */ .style-module__mnEziG__module-style { - grid-template-areas: "style-module__mnEziG__checkbox style-module__mnEziG__avatar style-module__mnEziG__content style-module__mnEziG__actions style-module__mnEziG__menu"; + grid-template-areas: "checkbox avatar content actions menu"; } -/*# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css.map*/ \ No newline at end of file +/*# sourceMappingURL=crates_turbopack-tests_tests_snapshot_css_css-modules_input_style_module_7d7e1c.css.map*/