Unverified Commit 54ca8f41 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

next-swc: Add `displayNameAndId` of `styled-components` (#31189)



## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`




Related to: https://github.com/vercel/next.js/issues/30802
parent 5fc4325a
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
"seedrandom": "3.0.5", "seedrandom": "3.0.5",
"selenium-webdriver": "4.0.0-beta.4", "selenium-webdriver": "4.0.0-beta.4",
"shell-quote": "1.7.3", "shell-quote": "1.7.3",
"styled-components": "5.3.3",
"styled-jsx-plugin-postcss": "3.0.2", "styled-jsx-plugin-postcss": "3.0.2",
"tailwindcss": "1.1.3", "tailwindcss": "1.1.3",
"taskr": "1.1.0", "taskr": "1.1.0",
......
...@@ -746,6 +746,7 @@ dependencies = [ ...@@ -746,6 +746,7 @@ dependencies = [
"backtrace", "backtrace",
"chrono", "chrono",
"easy-error", "easy-error",
"either",
"fxhash", "fxhash",
"napi", "napi",
"napi-build", "napi-build",
...@@ -758,6 +759,7 @@ dependencies = [ ...@@ -758,6 +759,7 @@ dependencies = [
"rustc-hash", "rustc-hash",
"serde", "serde",
"serde_json", "serde_json",
"styled_components",
"swc", "swc",
"swc_atoms", "swc_atoms",
"swc_bundler", "swc_bundler",
...@@ -1623,11 +1625,27 @@ version = "0.9.3" ...@@ -1623,11 +1625,27 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
[[package]]
name = "styled_components"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bead63e50d51304ddf1f938513b5fec3dc66c57b0b742db6e4748ba61192fd5"
dependencies = [
"Inflector",
"once_cell",
"regex",
"serde",
"swc_atoms",
"swc_common",
"swc_ecmascript",
"tracing",
]
[[package]] [[package]]
name = "swc" name = "swc"
version = "0.81.1" version = "0.83.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f877212f3dbeba2fb448192c5045ce50af39da1b54e48fd2894a12753a61a1d" checksum = "0c9dfd3fa9b1e3dc214afe20974a938b1d6c52db137bfe6645234dc6a725e2aa"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",
...@@ -1674,9 +1692,9 @@ dependencies = [ ...@@ -1674,9 +1692,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_bundler" name = "swc_bundler"
version = "0.79.0" version = "0.80.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52993195a4365d22ec362b26b6d5f64d9f51ffe1a2bb93a6b68e64648b1193c6" checksum = "91ec07321d14896d4de4b83af50fa65f1438180f69af056108c060e764ee32e3"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",
...@@ -1706,9 +1724,9 @@ dependencies = [ ...@@ -1706,9 +1724,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_common" name = "swc_common"
version = "0.14.3" version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c96fee6d6608c3022c455fd8a670ecb52f60c3a3ec4ea911ef0b173bd40dd1d" checksum = "2cc7f3a65556dcd305165d2d03068cc114df917435fe4d5220584c21a4d9684d"
dependencies = [ dependencies = [
"ahash", "ahash",
"ast_node", "ast_node",
...@@ -1826,9 +1844,9 @@ dependencies = [ ...@@ -1826,9 +1844,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_ast" name = "swc_ecma_ast"
version = "0.56.0" version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3a8d411060714c3fe2abbb15cddab1f78929d34409f47495eea77490694a52f" checksum = "8b5299a017039d8c6a6aba0ed6aca8bdb9863d113d26af3d7ad54ada5f23281c"
dependencies = [ dependencies = [
"is-macro", "is-macro",
"num-bigint", "num-bigint",
...@@ -1840,9 +1858,9 @@ dependencies = [ ...@@ -1840,9 +1858,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_codegen" name = "swc_ecma_codegen"
version = "0.78.1" version = "0.79.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17f553750c724f1c35169c5821a507e3431e54ef6d60135affab84ca709ba3d6" checksum = "7ef0433372312eda24f69e4718b725de6e9ccfebe7ae8191d904a8b9e4a3670d"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"memchr", "memchr",
...@@ -1872,9 +1890,9 @@ dependencies = [ ...@@ -1872,9 +1890,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_ext_transforms" name = "swc_ecma_ext_transforms"
version = "0.36.1" version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4982906ddf552c3a1fba697fd40319150d3e08102450ef53330a26a17b01650a" checksum = "02351bfbc674fd588c8b40f0b578adf1d34048a5c25d5bf551839d8ceb7be14d"
dependencies = [ dependencies = [
"phf", "phf",
"swc_atoms", "swc_atoms",
...@@ -1887,9 +1905,9 @@ dependencies = [ ...@@ -1887,9 +1905,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_loader" name = "swc_ecma_loader"
version = "0.23.0" version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8175736fa6f87725ee3736bb601d934444bd8b0e3b6b9032842fd0f189368e87" checksum = "79f2110de50f1c2ca0b35e5d1024d77a4ed7008078b96ab646523f7185860eeb"
dependencies = [ dependencies = [
"ahash", "ahash",
"anyhow", "anyhow",
...@@ -1910,9 +1928,9 @@ dependencies = [ ...@@ -1910,9 +1928,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_minifier" name = "swc_ecma_minifier"
version = "0.48.4" version = "0.49.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c079c92a805da29b4272f9846a545231478c8cd02aefa5aedea5eb450a78e70b" checksum = "cc808dc0e5d3e6c5319e02ddac25008ae2ae5dff2baeda1192ba6ede0b75b57f"
dependencies = [ dependencies = [
"ahash", "ahash",
"indexmap", "indexmap",
...@@ -1938,9 +1956,9 @@ dependencies = [ ...@@ -1938,9 +1956,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_parser" name = "swc_ecma_parser"
version = "0.76.3" version = "0.77.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f410fad7848bf376f31b621bde573858325d8127a71fbbe2d5effbe897420bb3" checksum = "a526a6dfb2146ea6337853dac7bd23e049fe9e8a9336d0a2ea8d748aa95a04be"
dependencies = [ dependencies = [
"either", "either",
"enum_kind", "enum_kind",
...@@ -1959,9 +1977,9 @@ dependencies = [ ...@@ -1959,9 +1977,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_preset_env" name = "swc_ecma_preset_env"
version = "0.63.1" version = "0.64.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa3ac0ad38409e19ee9c55120fb20c16311978fa2746d425e21a704f837f6d5f" checksum = "ccdb2668c07a70beb4a0ab9003ee88dc7f8da6e8c0faf47b501b1925077b9711"
dependencies = [ dependencies = [
"ahash", "ahash",
"dashmap", "dashmap",
...@@ -1983,9 +2001,9 @@ dependencies = [ ...@@ -1983,9 +2001,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms" name = "swc_ecma_transforms"
version = "0.92.1" version = "0.93.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20274f70994cacecf98728cffcc29f7e89bf9d72452ac7f912db72230b261451" checksum = "458bee9140196391eb44920c9bd4f5552e0ead3f542702984f5cd6922eda527c"
dependencies = [ dependencies = [
"swc_atoms", "swc_atoms",
"swc_common", "swc_common",
...@@ -2005,9 +2023,9 @@ dependencies = [ ...@@ -2005,9 +2023,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_base" name = "swc_ecma_transforms_base"
version = "0.42.1" version = "0.43.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d47323456ee73ecffa584a3964cc82dbf3daee2c7c72221d1f2130d3e42312d" checksum = "819aa4d767fd0741176d3308f66f1e17900729e4930ebb14073c2027d37b82c6"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"phf", "phf",
...@@ -2025,9 +2043,9 @@ dependencies = [ ...@@ -2025,9 +2043,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_classes" name = "swc_ecma_transforms_classes"
version = "0.28.1" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b26b5cc2e20bc232d366361a52347266b34443ec561bda7f2f00da83801a2e76" checksum = "b91ed59e16a892088dc688895163971924db87eba05f3bd26782d6f4f7f10c2f"
dependencies = [ dependencies = [
"swc_atoms", "swc_atoms",
"swc_common", "swc_common",
...@@ -2039,9 +2057,9 @@ dependencies = [ ...@@ -2039,9 +2057,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_compat" name = "swc_ecma_transforms_compat"
version = "0.49.3" version = "0.50.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aefdc14b1f1a2806c887fdf804f26456bd64844fd6ef0033d4cdd058a01eabeb" checksum = "c6928fa65beebc11e401b4c661bfd4de728807fdfb512e99be58a6563e37b0d4"
dependencies = [ dependencies = [
"ahash", "ahash",
"arrayvec", "arrayvec",
...@@ -2076,9 +2094,9 @@ dependencies = [ ...@@ -2076,9 +2094,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_module" name = "swc_ecma_transforms_module"
version = "0.55.2" version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b650afe12cae3bdb1d56023e1df24327bcb2b47233c7f4573742c42539617ae" checksum = "4e7cdab646c89604c353861e0d687bc750b4ca5ad4f35b2015b005f27d921f8b"
dependencies = [ dependencies = [
"Inflector", "Inflector",
"ahash", "ahash",
...@@ -2098,9 +2116,9 @@ dependencies = [ ...@@ -2098,9 +2116,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_optimization" name = "swc_ecma_transforms_optimization"
version = "0.62.1" version = "0.63.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "804930bf18b7a467a0c309129ecdc7a07f378ffc0c6a963c6a0e592b4eeff53e" checksum = "81dbb2e2ad03aa5e76932d767e7ca81469eb11780cd497bc74f03a7b726fb0f7"
dependencies = [ dependencies = [
"ahash", "ahash",
"dashmap", "dashmap",
...@@ -2122,9 +2140,9 @@ dependencies = [ ...@@ -2122,9 +2140,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_proposal" name = "swc_ecma_transforms_proposal"
version = "0.55.1" version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc9a9d26f33973ebc3f34d78551b3c4444c2bc1eeb89b2b376d08db7f73c649" checksum = "e0d5a54177c17ba9736ac65878fa677e17867de7b8e90dbe27c13e7cf5ff7aa3"
dependencies = [ dependencies = [
"either", "either",
"serde", "serde",
...@@ -2142,9 +2160,9 @@ dependencies = [ ...@@ -2142,9 +2160,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_react" name = "swc_ecma_transforms_react"
version = "0.57.1" version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "174789f88a5df9c6c714eb174bb392d2eb5a0692e310ceca39816536d4157716" checksum = "262b788279078e7d521052e7b14f00a6d2c10aba436c7cde65618b979354dbb7"
dependencies = [ dependencies = [
"ahash", "ahash",
"base64 0.13.0", "base64 0.13.0",
...@@ -2167,9 +2185,9 @@ dependencies = [ ...@@ -2167,9 +2185,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_testing" name = "swc_ecma_transforms_testing"
version = "0.43.1" version = "0.44.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e590950e01356b107a9d4f7c94c474ae2d09a8c63a42e31811600687011957ed" checksum = "b6242dc8f9a0d38ed105e93961b8d960297bcd725740d460676d431360a32cbc"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"anyhow", "anyhow",
...@@ -2190,9 +2208,9 @@ dependencies = [ ...@@ -2190,9 +2208,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_transforms_typescript" name = "swc_ecma_transforms_typescript"
version = "0.58.2" version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071eaf1280a9e874c4d0d4a6e5f862adcb3721d5e0670053d9b2df5f6785083f" checksum = "77be2906b25d4a50dedf1151c3d062a34e86fa41cc7e890295af2e8eebd10eb9"
dependencies = [ dependencies = [
"serde", "serde",
"swc_atoms", "swc_atoms",
...@@ -2207,9 +2225,9 @@ dependencies = [ ...@@ -2207,9 +2225,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_utils" name = "swc_ecma_utils"
version = "0.50.1" version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8762b5fccb1bbb5f4bcb83eb6668a78b3861ae8df692c76e75cc33605d611480" checksum = "11dd67f85fe25b7aa4899ecc63191f50bc9c3bb13ccb8d4aa99800119eb3ff09"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"rayon", "rayon",
...@@ -2222,9 +2240,9 @@ dependencies = [ ...@@ -2222,9 +2240,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecma_visit" name = "swc_ecma_visit"
version = "0.42.0" version = "0.43.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3839eb1dfad16550140d59462187de81fc536c53c53035a25fc40cbf01cc5042" checksum = "45a31547556529dd5310219ace29d2c9c3b9316466d0e489ddaa59f1173c9a06"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"swc_atoms", "swc_atoms",
...@@ -2235,9 +2253,9 @@ dependencies = [ ...@@ -2235,9 +2253,9 @@ dependencies = [
[[package]] [[package]]
name = "swc_ecmascript" name = "swc_ecmascript"
version = "0.84.1" version = "0.85.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca7d514168991ecf5e548ff3eb4af82e810b4f50cfd0031e7ded90357cbfb02" checksum = "baa1b467fae5dc365f1bd533543160bec39beabfe04731213c9cb4dcbdae99f9"
dependencies = [ dependencies = [
"swc_ecma_ast", "swc_ecma_ast",
"swc_ecma_codegen", "swc_ecma_codegen",
......
...@@ -11,6 +11,7 @@ anyhow = "1.0" ...@@ -11,6 +11,7 @@ anyhow = "1.0"
backtrace = "0.3" backtrace = "0.3"
chrono = "0.4" chrono = "0.4"
easy-error = "1.0.0" easy-error = "1.0.0"
either = "1"
fxhash = "0.2.1" fxhash = "0.2.1"
napi = {version = "1", features = ["serde-json"]} napi = {version = "1", features = ["serde-json"]}
napi-derive = "1" napi-derive = "1"
...@@ -22,14 +23,15 @@ retain_mut = "0.1.3" ...@@ -22,14 +23,15 @@ retain_mut = "0.1.3"
rustc-hash = "1.1.0" rustc-hash = "1.1.0"
serde = "1" serde = "1"
serde_json = "1" serde_json = "1"
swc = "0.81.1" styled_components = "0.1.0"
swc = "0.83.1"
swc_atoms = "0.2.7" swc_atoms = "0.2.7"
swc_bundler = {version = "0.79.0", features = ["concurrent"]} swc_bundler = { version = "0.80.0", features = ["concurrent"] }
swc_common = {version = "0.14.2", features = ["concurrent", "sourcemap"]} swc_common = {version = "0.14.2", features = ["concurrent", "sourcemap"]}
swc_css = "0.20.0" swc_css = "0.20.0"
swc_ecma_loader = {version = "0.23.0", features = ["node", "lru"]} swc_ecma_loader = { version = "0.24.0", features = ["node", "lru"] }
swc_ecma_preset_env = "0.63.1" swc_ecma_preset_env = "0.64.0"
swc_ecmascript = {version = "0.84.1", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"]} swc_ecmascript = { version = "0.85.0", features = ["codegen", "minifier", "optimization", "parser", "react", "transforms", "typescript", "utils", "visit"] }
swc_node_base = "0.5.1" swc_node_base = "0.5.1"
swc_stylis = "0.17.0" swc_stylis = "0.17.0"
tracing = {version = "0.1.28", features = ["release_max_level_off"]} tracing = {version = "0.1.28", features = ["release_max_level_off"]}
...@@ -38,7 +40,7 @@ tracing = {version = "0.1.28", features = ["release_max_level_off"]} ...@@ -38,7 +40,7 @@ tracing = {version = "0.1.28", features = ["release_max_level_off"]}
napi-build = "1" napi-build = "1"
[dev-dependencies] [dev-dependencies]
swc_ecma_transforms_testing = "0.43.1" swc_ecma_transforms_testing = "0.44.0"
testing = "0.15.1" testing = "0.15.1"
walkdir = "2.3.2" walkdir = "2.3.2"
......
...@@ -6,6 +6,7 @@ function getBaseSWCOptions({ ...@@ -6,6 +6,7 @@ function getBaseSWCOptions({
development, development,
hasReactRefresh, hasReactRefresh,
globalWindow, globalWindow,
styledComponents,
}) { }) {
const isTSFile = filename.endsWith('.ts') const isTSFile = filename.endsWith('.ts')
const isTypeScript = isTSFile || filename.endsWith('.tsx') const isTypeScript = isTSFile || filename.endsWith('.tsx')
...@@ -42,6 +43,10 @@ function getBaseSWCOptions({ ...@@ -42,6 +43,10 @@ function getBaseSWCOptions({
}, },
}, },
}, },
styledComponents: {
displayName: styledComponents,
ssr: styledComponents,
},
} }
} }
...@@ -78,12 +83,14 @@ export function getLoaderSWCOptions({ ...@@ -78,12 +83,14 @@ export function getLoaderSWCOptions({
pagesDir, pagesDir,
isPageFile, isPageFile,
hasReactRefresh, hasReactRefresh,
styledComponents,
}) { }) {
let baseOptions = getBaseSWCOptions({ let baseOptions = getBaseSWCOptions({
filename, filename,
development, development,
globalWindow: !isServer, globalWindow: !isServer,
hasReactRefresh, hasReactRefresh,
styledComponents,
}) })
const isNextDist = nextDistPath.test(filename) const isNextDist = nextDistPath.test(filename)
......
...@@ -36,13 +36,17 @@ extern crate swc_node_base; ...@@ -36,13 +36,17 @@ extern crate swc_node_base;
use auto_cjs::contains_cjs; use auto_cjs::contains_cjs;
use backtrace::Backtrace; use backtrace::Backtrace;
use either::Either;
use napi::{CallContext, Env, JsObject, JsUndefined}; use napi::{CallContext, Env, JsObject, JsUndefined};
use serde::Deserialize; use serde::Deserialize;
use std::cell::RefCell;
use std::rc::Rc;
use std::{env, panic::set_hook, path::PathBuf, sync::Arc}; use std::{env, panic::set_hook, path::PathBuf, sync::Arc};
use swc::{config::ModuleConfig, Compiler, TransformOutput}; use swc::{config::ModuleConfig, Compiler, TransformOutput};
use swc_common::SourceFile; use swc_common::SourceFile;
use swc_common::{self, chain, pass::Optional, sync::Lazy, FileName, FilePathMapping, SourceMap}; use swc_common::{self, chain, pass::Optional, sync::Lazy, FilePathMapping, SourceMap};
use swc_ecmascript::ast::EsVersion; use swc_ecmascript::ast::EsVersion;
use swc_ecmascript::transforms::pass::noop;
use swc_ecmascript::{ use swc_ecmascript::{
parser::{lexer::Lexer, Parser, StringInput}, parser::{lexer::Lexer, Parser, StringInput},
visit::Fold, visit::Fold,
...@@ -80,15 +84,32 @@ pub struct TransformOptions { ...@@ -80,15 +84,32 @@ pub struct TransformOptions {
#[serde(default)] #[serde(default)]
pub is_development: bool, pub is_development: bool,
#[serde(default)]
pub styled_components: Option<styled_components::Config>,
} }
pub fn custom_before_pass(name: &FileName, opts: &TransformOptions) -> impl Fold { pub fn custom_before_pass(file: Arc<SourceFile>, opts: &TransformOptions) -> impl Fold {
chain!( chain!(
styled_jsx::styled_jsx(), styled_jsx::styled_jsx(),
hook_optimizer::hook_optimizer(), hook_optimizer::hook_optimizer(),
match &opts.styled_components {
Some(config) => {
let config = Rc::new(config.clone());
let state: Rc<RefCell<styled_components::State>> = Default::default();
Either::Left(chain!(
styled_components::analyzer(config.clone(), state.clone()),
styled_components::display_name_and_id(file.clone(), config, state)
))
}
None => {
Either::Right(noop())
}
},
Optional::new(next_ssg::next_ssg(), !opts.disable_next_ssg), Optional::new(next_ssg::next_ssg(), !opts.disable_next_ssg),
amp_attributes::amp_attributes(), amp_attributes::amp_attributes(),
next_dynamic::next_dynamic(name.clone(), opts.pages_dir.clone()), next_dynamic::next_dynamic(file.name.clone(), opts.pages_dir.clone()),
Optional::new( Optional::new(
page_config::page_config(opts.is_development, opts.is_page_file), page_config::page_config(opts.is_development, opts.is_page_file),
!opts.disable_page_config !opts.disable_page_config
......
...@@ -77,13 +77,14 @@ impl Task for TransformTask { ...@@ -77,13 +77,14 @@ impl Task for TransformTask {
let options = options.patch(&fm); let options = options.patch(&fm);
let before_pass = custom_before_pass(&fm.name, &options); let before_pass = custom_before_pass(fm.clone(), &options);
self.c.process_js_with_custom_pass( self.c.process_js_with_custom_pass(
fm.clone(), fm.clone(),
None,
&handler, &handler,
&options.swc, &options.swc,
before_pass, |_| before_pass,
noop(), |_| noop(),
) )
} }
}) })
......
...@@ -56,16 +56,18 @@ fn test(input: &Path, minify: bool) { ...@@ -56,16 +56,18 @@ fn test(input: &Path, minify: bool) {
pages_dir: None, pages_dir: None,
is_page_file: false, is_page_file: false,
is_development: true, is_development: true,
styled_components: Some(assert_json("{}")),
}; };
let options = options.patch(&fm); let options = options.patch(&fm);
match c.process_js_with_custom_pass( match c.process_js_with_custom_pass(
fm.clone(), fm.clone(),
None,
&handler, &handler,
&options.swc, &options.swc,
custom_before_pass(&fm.name, &assert_json(&"{}")), |_| custom_before_pass(fm.clone(), &options),
noop(), |_| noop(),
) { ) {
Ok(v) => { Ok(v) => {
NormalizedOutput::from(v.code) NormalizedOutput::from(v.code)
......
import styled from 'styled-components';
export const foo = styled.input`
color: red;
`;
\ No newline at end of file
import styled from 'styled-components';
function _taggedTemplateLiteral(strings, raw) {
if (!raw) {
raw = strings.slice(0);
}
return Object.freeze(Object.defineProperties(strings, {
raw: {
value: Object.freeze(raw)
}
}));
}
function _templateObject() {
var data = _taggedTemplateLiteral([
"\n color: red;\n"
]);
_templateObject = function _templateObject() {
return data;
};
return data;
}
export var foo = styled.input.withConfig({
displayName: "input__foo",
componentId: "sc-12c52e68-0"
})(_templateObject());
...@@ -469,6 +469,7 @@ export default async function getBaseWebpackConfig( ...@@ -469,6 +469,7 @@ export default async function getBaseWebpackConfig(
isServer: isMiddleware || isServer, isServer: isMiddleware || isServer,
pagesDir, pagesDir,
hasReactRefresh: !isMiddleware && hasReactRefresh, hasReactRefresh: !isMiddleware && hasReactRefresh,
styledComponents: config.experimental.styledComponents,
}, },
} }
: { : {
......
...@@ -35,7 +35,8 @@ async function loaderTransform(parentTrace, source, inputSourceMap) { ...@@ -35,7 +35,8 @@ async function loaderTransform(parentTrace, source, inputSourceMap) {
let loaderOptions = this.getOptions() || {} let loaderOptions = this.getOptions() || {}
const { isServer, pagesDir, hasReactRefresh } = loaderOptions const { isServer, pagesDir, hasReactRefresh, styledComponents } =
loaderOptions
const isPageFile = filename.startsWith(pagesDir) const isPageFile = filename.startsWith(pagesDir)
const swcOptions = getLoaderSWCOptions({ const swcOptions = getLoaderSWCOptions({
...@@ -45,6 +46,7 @@ async function loaderTransform(parentTrace, source, inputSourceMap) { ...@@ -45,6 +46,7 @@ async function loaderTransform(parentTrace, source, inputSourceMap) {
isPageFile, isPageFile,
development: this.mode === 'development', development: this.mode === 'development',
hasReactRefresh, hasReactRefresh,
styledComponents,
}) })
const programmaticOptions = { const programmaticOptions = {
......
...@@ -126,6 +126,7 @@ export type NextConfig = { [key: string]: any } & { ...@@ -126,6 +126,7 @@ export type NextConfig = { [key: string]: any } & {
crossOrigin?: false | 'anonymous' | 'use-credentials' crossOrigin?: false | 'anonymous' | 'use-credentials'
swcMinify?: boolean swcMinify?: boolean
experimental?: { experimental?: {
styledComponents?: boolean
swcMinify?: boolean swcMinify?: boolean
cpus?: number cpus?: number
sharedPool?: boolean sharedPool?: boolean
......
import { join } from 'path'
import webdriver from 'next-webdriver'
import { createNext, FileRef } from 'e2e-utils'
import { NextInstance } from 'test/lib/next-modes/base'
import { fetchViaHTTP } from 'next-test-utils'
describe('styled-components SWC transform', () => {
let next: NextInstance
beforeAll(async () => {
next = await createNext({
files: {
// 'next.config.js': new FileRef(
// join(__dirname, 'styled-components/next.config.js')
// ),
pages: new FileRef(join(__dirname, 'styled-components/pages')),
},
dependencies: {
'styled-components': '5.3.3',
},
})
})
afterAll(() => next.destroy())
async function matchLogs$(browser) {
let foundLog = false
const browserLogs = await browser.log('browser')
browserLogs.forEach((log) => {
console.error({ log })
if (log.message.includes('Warning: Prop `%s` did not match.')) {
foundLog = true
}
})
return foundLog
}
it('should not have hydration mismatch with styled-components transform enabled', async () => {
let browser
try {
browser = await webdriver(next.appPort, '/')
// Compile /_error
await fetchViaHTTP(next.appPort, '/404')
// Try 4 times to be sure there is no mismatch
expect(await matchLogs$(browser)).toBe(false)
await browser.refresh()
expect(await matchLogs$(browser)).toBe(false)
await browser.refresh()
expect(await matchLogs$(browser)).toBe(false)
await browser.refresh()
expect(await matchLogs$(browser)).toBe(false)
} finally {
if (browser) {
await browser.close()
}
}
})
})
module.exports = {
experimental: {
styledComponents: true,
},
}
import { createGlobalStyle, ThemeProvider } from 'styled-components'
const GlobalStyle = createGlobalStyle`
body {
margin: 0;
padding: 0;
box-sizing: border-box;
}
`
const theme = {
colors: {
primary: '#0070f3',
},
}
export default function App({ Component, pageProps }) {
return (
<>
<GlobalStyle />
<ThemeProvider theme={theme}>
<Component {...pageProps} />
</ThemeProvider>
</>
)
}
import Document from 'next/document'
import { ServerStyleSheet } from 'styled-components'
export default class MyDocument extends Document {
static async getInitialProps(ctx) {
const sheet = new ServerStyleSheet()
const originalRenderPage = ctx.renderPage
try {
ctx.renderPage = () =>
originalRenderPage({
enhanceApp: (App) => (props) =>
sheet.collectStyles(<App {...props} />),
})
const initialProps = await Document.getInitialProps(ctx)
return {
...initialProps,
styles: (
<>
{initialProps.styles}
{sheet.getStyleElement()}
</>
),
}
} finally {
sheet.seal()
}
}
}
import styled, { css } from 'styled-components'
const Button = styled.a`
/* This renders the buttons above... Edit me! */
display: inline-block;
border-radius: 3px;
padding: 0.5rem 0;
margin: 0.5rem 1rem;
width: 11rem;
background: transparent;
color: white;
border: 2px solid white;
/* The GitHub button is a primary button
* edit this to target it specifically! */
${(props) =>
props.primary &&
css`
background: white;
color: black;
`}
`
export default function Home() {
return (
<div>
<Button
href="https://github.com/styled-components/styled-components"
target="_blank"
rel="noopener"
primary
>
GitHub
</Button>
<Button href="/docs">Documentation</Button>
</div>
)
}
This diff is collapsed.
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