From 096468277f7ce04447b61ef4fc1b08c55829fc3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 13 Oct 2023 10:17:38 +0900 Subject: [PATCH 1/5] sync --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 232f377add99b..e3b0864b6199f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -434,9 +434,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", @@ -3961,9 +3961,9 @@ dependencies = [ [[package]] name = "libwebp-sys" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c94b08ea3ec9eedea0fa779848e7fa183dc52aa60882488828883503faf630f" +checksum = "3e0df0a0f9444d52aee6335cd724d21a2ee3285f646291799a72be518ec8ee3c" dependencies = [ "cc", "glob", From e4c1bb248e6a04f36b331749b820cbe39c9f84f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 13 Oct 2023 10:18:58 +0900 Subject: [PATCH 2/5] Update swc crates --- Cargo.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f279068317311..ae9a802a28600 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,17 +77,17 @@ async-recursion = "1.0.2" # Keep consistent with preset_env_base through swc_core browserslist-rs = { version = "0.12.2" } -mdxjs = "0.1.17" -modularize_imports = { version = "0.48.0" } -styled_components = { version = "0.75.0" } -styled_jsx = { version = "0.52.0" } -swc_core = { version = "0.83.28", features = [ +mdxjs = "0.1.18" +modularize_imports = { version = "0.49.0" } +styled_components = { version = "0.76.0" } +styled_jsx = { version = "0.53.0" } +swc_core = { version = "0.85.6", features = [ "ecma_loader_lru", "ecma_loader_parking_lot", ] } -swc_emotion = { version = "0.51.0" } -swc_relay = { version = "0.23.0" } -testing = { version = "0.34.1" } +swc_emotion = { version = "0.52.0" } +swc_relay = { version = "0.24.0" } +testing = { version = "0.35.0" } auto-hash-map = { path = "crates/turbo-tasks-auto-hash-map" } node-file-trace = { path = "crates/node-file-trace", default-features = false } From 88da46a211ddb08c6bc4e0543ab0a9d9afc12d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 13 Oct 2023 10:19:03 +0900 Subject: [PATCH 3/5] cargo lockfile --- Cargo.lock | 360 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 222 insertions(+), 138 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3b0864b6199f..c8f775f5f9773 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -745,9 +745,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.57.26" +version = "0.59.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6caf54b6448f05c25096a528c2a3b292e38fb59298c118edcf9da45ff05515" +checksum = "d5fd22c41e75675b15a04bb3bbb18d094082ba084ad3f12f18a87042da9fc836" dependencies = [ "anyhow", "console_error_panic_hook", @@ -1878,19 +1878,24 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.29.6" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" +checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "matches", "phf", - "proc-macro2", - "quote", "smallvec", - "syn 1.0.109", +] + +[[package]] +name = "cssparser-color" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f" +dependencies = [ + "cssparser", ] [[package]] @@ -3983,14 +3988,15 @@ dependencies = [ [[package]] name = "lightningcss" -version = "1.0.0-alpha.46" +version = "1.0.0-alpha.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfe5176488bc25fda36d65ef3570d378a7c48d5ae22a63c030b443e9943b8eb" +checksum = "06476660ee1e593a2672e4a342a1289708fd9936dcdf3e74433ad078145e9e3d" dependencies = [ "ahash 0.7.6", "bitflags 2.4.0", "const-str", "cssparser", + "cssparser-color", "dashmap", "data-encoding", "itertools", @@ -4003,13 +4009,14 @@ dependencies = [ "rayon", "serde", "smallvec", + "static-self", ] [[package]] name = "lightningcss-derive" -version = "1.0.0-alpha.40" +version = "1.0.0-alpha.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcce94c3a34f43e83e1f92a81eca61697c298149a56489bba1b02ebb93fa607" +checksum = "8f02a09f0b79d31f1ee13ea55e2f7021037c6b72e0a3ab6c1cb0e9bd7ac8a295" dependencies = [ "proc-macro2", "quote", @@ -4155,9 +4162,9 @@ dependencies = [ [[package]] name = "mdxjs" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c73de74452171e35ed9d82961e403b8b197dcf752b45a51072d83e4813d42d53" +checksum = "03a14df3f7188cc868ed50d415ac9527660f761ce2c392b27dc8b18b33cd7525" dependencies = [ "markdown", "serde", @@ -4406,9 +4413,9 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1070d9027b5d1eb4e54d81c86dfd26fd1e1370916ce5881c498361799e9a14" +checksum = "3b09eaf97a63c51a23bf8c58555d2294a73e60857f97ce5b07f902e4e5dd0507" dependencies = [ "convert_case 0.5.0", "handlebars", @@ -4961,9 +4968,9 @@ dependencies = [ [[package]] name = "parcel_selectors" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1aa68e6c4bf7a49302b9c711c880c1cc2a7dc5c5184042cc724e4124e0d95f" +checksum = "0f000cdd23df6cebe999cf2b02a3bf40d55758f74883d7fd43a33690565618c8" dependencies = [ "bitflags 2.4.0", "cssparser", @@ -4973,6 +4980,7 @@ dependencies = [ "phf_codegen", "precomputed-hash", "smallvec", + "static-self", ] [[package]] @@ -6325,9 +6333,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -6364,9 +6372,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -6458,7 +6466,7 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.26", + "time 0.3.29", ] [[package]] @@ -6836,6 +6844,27 @@ dependencies = [ "syn 2.0.32", ] +[[package]] +name = "static-self" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2978fa810a31711d7162d0bb843df1f36d84e393e335ce31ec2c485b2464c44" +dependencies = [ + "smallvec", + "static-self-derive", +] + +[[package]] +name = "static-self-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc53c080b79432d9babd26457df68fb4b002cc7d2ce36a1a5195091cf9fecc14" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -6956,9 +6985,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "styled_components" -version = "0.75.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93b77bf37c113d7401b11d87ec48d264b6200c8167e647c9f2bf5f7368d2abf" +checksum = "336559b30b4e909e7f522fcfa8a6f84e27af6319db4ea2424423abe43b1f4556" dependencies = [ "Inflector", "once_cell", @@ -6974,9 +7003,9 @@ dependencies = [ [[package]] name = "styled_jsx" -version = "0.52.0" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "786d784207110496555ca76ee3a29bfea8fd24c2e8a7669ae1796bddd7f50e2b" +checksum = "ccdca09d1f4719f7b0185b9309033fc947451c56e5ab020f0f2c743579e25d93" dependencies = [ "easy-error", "lightningcss", @@ -6984,9 +7013,9 @@ dependencies = [ "serde", "swc_common", "swc_css_ast", - "swc_css_codegen", + "swc_css_codegen 0.150.0", "swc_css_minifier", - "swc_css_parser", + "swc_css_parser 0.149.0", "swc_css_prefixer", "swc_css_visit", "swc_ecma_ast", @@ -7042,14 +7071,14 @@ dependencies = [ "byteorder", "getrandom", "serde", - "time 0.3.26", + "time 0.3.29", ] [[package]] name = "swc" -version = "0.266.26" +version = "0.268.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518128b65105b48a58bf81e718a915ad60daebb89ccdf966d11cc616bfd0fd28" +checksum = "25189fa10dcde0d2bfe75908d9a8094d6243ee804e5d22e602269d00a2cf6925" dependencies = [ "anyhow", "base64 0.13.1", @@ -7071,6 +7100,7 @@ dependencies = [ "swc_atoms", "swc_cached", "swc_common", + "swc_compiler_base", "swc_config", "swc_ecma_ast", "swc_ecma_codegen", @@ -7109,9 +7139,9 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f54563d7dcba626d4acfe14ed12def7ecc28e004debe3ecd2c3ee07cc47e449" +checksum = "ebf7a12229f0c0efb654a6a0f8cbfd94fbd320a57c764857a82d8abe9342b450" dependencies = [ "bytecheck", "once_cell", @@ -7125,9 +7155,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.220.20" +version = "0.221.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1ddf4d7fc3c4da744561ca2a984f537888fe65ce9e8d2d207372e054c351e2" +checksum = "1478026b8f1a12cc95da26ddfc4e6a5686b3da9cef130d5fe021c0a9e6a3be0c" dependencies = [ "anyhow", "crc", @@ -7171,9 +7201,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c84742fc22df1c293da5354c1cc8a5b45a045e9dc941005c1fd9cb4e9bdabc1" +checksum = "490e199e25d2aa3fbef675524fa81408651f4e7178b51110470ddd1b3e3bbe75" dependencies = [ "ahash 0.8.3", "anyhow", @@ -7203,6 +7233,30 @@ dependencies = [ "url", ] +[[package]] +name = "swc_compiler_base" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4e3e1c4b442aa75ea1d6209aa3e0240e546529be4d438278f8e218c98f24c4" +dependencies = [ + "anyhow", + "base64 0.13.1", + "napi", + "napi-derive", + "pathdiff", + "serde", + "sourcemap", + "swc_atoms", + "swc_common", + "swc_config", + "swc_ecma_ast", + "swc_ecma_codegen", + "swc_ecma_minifier", + "swc_ecma_parser", + "swc_ecma_visit", + "swc_timer", +] + [[package]] name = "swc_config" version = "0.1.7" @@ -7230,9 +7284,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.83.28" +version = "0.85.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e826020b0481212a0ba4f20d5c74bbe71b6cee6949583896788ca8d98039851" +checksum = "007ad20698856e5a3ac1f4614f5c41789f4443e3e4eef5cbde144680748c808b" dependencies = [ "binding_macros", "swc", @@ -7241,10 +7295,10 @@ dependencies = [ "swc_cached", "swc_common", "swc_css_ast", - "swc_css_codegen", + "swc_css_codegen 0.151.0", "swc_css_compat", "swc_css_modules", - "swc_css_parser", + "swc_css_parser 0.150.0", "swc_css_utils", "swc_css_visit", "swc_ecma_ast", @@ -7273,9 +7327,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.139.1" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fab824eff88884673de1d6b84cdb5d3d71c0b903fcef62a3ec1f44f40477433f" +checksum = "fa155c888b70f7a1bc1de995006bda7c4b2c501712d8a88a1d6d9406b04be359" dependencies = [ "is-macro", "serde", @@ -7286,9 +7340,26 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.149.1" +version = "0.150.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2980b7ea23f535be5b4d1acdef995c17cabb31efd1de8c7c5b140e715284051" +dependencies = [ + "auto_impl", + "bitflags 2.4.0", + "rustc-hash", + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", + "swc_css_codegen_macros", + "swc_css_utils", +] + +[[package]] +name = "swc_css_codegen" +version = "0.151.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef989abd4b9ccf3caf6a4ab0ceb9f9e7d6a27c08585a20a7fc7b9db6c73a341" +checksum = "cd94d4f6b939a7643d29fd9322d87a0c6fd9488fd9a508472239e02abcfb3f29" dependencies = [ "auto_impl", "bitflags 2.4.0", @@ -7316,9 +7387,9 @@ dependencies = [ [[package]] name = "swc_css_compat" -version = "0.25.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ee1b2b77e7daaf389237ca2656df01cf8c1a6f2d9b158459921b202a661f8a" +checksum = "b77d8336003883f2590b400bc103c735eaa32d0a16beb3bcc87bc93f9e28065a" dependencies = [ "bitflags 2.4.0", "once_cell", @@ -7333,9 +7404,9 @@ dependencies = [ [[package]] name = "swc_css_minifier" -version = "0.114.1" +version = "0.115.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21db6b6ef607d47d09a7e2fd0b8fd5ec29d05d1182f8d3d5eebef0f1b94c3f4d" +checksum = "0123f0c65744b53864d45b81f7a32356fe5afc68e23a5e1357c07e4ec178bae1" dependencies = [ "serde", "swc_atoms", @@ -7347,25 +7418,38 @@ dependencies = [ [[package]] name = "swc_css_modules" -version = "0.27.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac80e62e3221cb2abc0edd33886c74c7d2a64ca3756adce0047527026dff71ca" +checksum = "0c3c9990c49999331738343387696c6a8d7379af694c3bab4707d9b43f91921c" dependencies = [ "rustc-hash", "serde", "swc_atoms", "swc_common", "swc_css_ast", - "swc_css_codegen", - "swc_css_parser", + "swc_css_codegen 0.151.0", + "swc_css_parser 0.150.0", "swc_css_visit", ] [[package]] name = "swc_css_parser" -version = "0.148.1" +version = "0.149.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b02a3c11508487249aa571a908e673c540191de97d5139bb78ab03188dd57e26" +checksum = "aaf446ed13d660b8a7d4c6ab98f9327212ed87e49a89ed110e36e768a221c74f" +dependencies = [ + "lexical", + "serde", + "swc_atoms", + "swc_common", + "swc_css_ast", +] + +[[package]] +name = "swc_css_parser" +version = "0.150.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04bce69bb9c68681ea4467d7c02906fd01245e9838b70c92dad4512e7ad23b2d" dependencies = [ "lexical", "serde", @@ -7376,9 +7460,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.151.1" +version = "0.152.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274da87a8f0117ef86382b132812aa6a1b700b31c37ef95ce3bbde7e05f8c098" +checksum = "839cd2a13d5886521b5852d05574bdbfb19c5edd70647b3d63c1da426df6b4e3" dependencies = [ "once_cell", "preset_env_base", @@ -7393,9 +7477,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.136.1" +version = "0.137.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eead47672e3c832e2e3fc3e523490c4822d80a7fc8c50e87a66f9ab7003b517" +checksum = "dc71e4976bb516112b6d9d3da37989256e0fc6da84e3fe65c049ea1871515069" dependencies = [ "once_cell", "serde", @@ -7408,9 +7492,9 @@ dependencies = [ [[package]] name = "swc_css_visit" -version = "0.138.1" +version = "0.139.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f01449a09b8a87ab4bd2ea6cbaaf74e39f9bfba3842a2918e998c5f9b428a4" +checksum = "c94eb9e33d88fa3315464660a89873ff021ab940f56902d9961a06f85bdd1886" dependencies = [ "serde", "swc_atoms", @@ -7421,9 +7505,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.109.1" +version = "0.110.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e063a1614daed3ea8be56e5dd8edb17003409088d2fc9ce4aca3378879812607" +checksum = "5cbbf9918976a7e7fbdb4f76fe659d08e291a8b56b524b424183fc67d1189679" dependencies = [ "bitflags 2.4.0", "bytecheck", @@ -7440,9 +7524,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.145.5" +version = "0.146.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "547ed57b827ea4df3e2c27cea153482f8b2ce2d271ae30c456fbb2d5a5ecc19d" +checksum = "1fba119c76654599b71099a0150094f5790f00db63aab6cda1790e731f42c98f" dependencies = [ "memchr", "num-bigint", @@ -7472,9 +7556,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.109.0" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d995f94740b4cde4919e6e03d982230f755f49dac9dac52f0218254a1fd69f2b" +checksum = "49f6968f03dac07897aa44f73237254bd862230f1c1e953746228ab28d688eab" dependencies = [ "phf", "swc_atoms", @@ -7486,9 +7570,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.88.6" +version = "0.89.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300ae29c0fc98ed0364aa2fd4aa7702d6dc67d411dd4894e7e60d40e99c4ef19" +checksum = "c7177da6ccfb0d73c1f5b05d3ad6b81a5044705356099f435e2bb2141e09ee9e" dependencies = [ "auto_impl", "dashmap", @@ -7506,9 +7590,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.44.4" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2b3a3ec38fc9c691b787d32ac2aa5eb6871d1fe74ac4a10638fbd9b9bc407b" +checksum = "a7fe06d942fe20a5a81cc14f4a53e64a5efdc851fa895a869224b2d41df73276" dependencies = [ "anyhow", "dashmap", @@ -7527,9 +7611,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.187.20" +version = "0.188.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8458b755f90a0152a8cbb48b299956ce388eb6d96aa333f9efe243776fefb9c9" +checksum = "99ad6b38ffd3c3a8022b5d6a6239566405bf23001674b7177c25cd31c08ecd77" dependencies = [ "arrayvec 0.7.4", "indexmap 1.9.3", @@ -7562,9 +7646,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.140.0" +version = "0.141.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c968599841fcecfdc2e490188ad93251897a1bb912882547e6889e14a368399" +checksum = "a26e535c623db7beb04ba8ebfa821c287b72a23f9fb523990b54db6c1355c990" dependencies = [ "either", "num-bigint", @@ -7582,9 +7666,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.201.21" +version = "0.202.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aac45044af56b9be44aed5664238b6c1076c5a1c0bf4fd17ae83826f4b19ff1" +checksum = "e94c33f106892045de75f537470a55ec37c15dd33d20cca7c498e8488dcbb8ee" dependencies = [ "anyhow", "dashmap", @@ -7607,9 +7691,9 @@ dependencies = [ [[package]] name = "swc_ecma_quote_macros" -version = "0.51.0" +version = "0.52.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b028b0675ad45b79b163c70e192f25b59d72366a2864c5d369dce707a38a1597" +checksum = "687e5944bd1ccf5729104c2ed11c182b1f679d18d620980da442bfe326391ddf" dependencies = [ "anyhow", "pmutil", @@ -7625,9 +7709,9 @@ dependencies = [ [[package]] name = "swc_ecma_testing" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b776795afd44c8df3977391e239a8dedbe2139c5eeb1ea053c1e29314b6d8a7" +checksum = "57c456e2c330c0049f77780cd412e61d9c9d0ae7ff9b6c0e4f8262270b7c718e" dependencies = [ "anyhow", "hex", @@ -7638,9 +7722,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.224.19" +version = "0.225.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f893871042dbe3eb3f9cb4fb878d24163fd0e568896d68f02a8952d2c9d9a5" +checksum = "665c0b48784d1c439388de25e7662d02e74654bd1911cfde054af03a0bca129d" dependencies = [ "swc_atoms", "swc_common", @@ -7658,9 +7742,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.133.5" +version = "0.134.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496e3957e19c22e61cd7ff020a87e1fe94c9334f4fa11267f08614fd5f85ba67" +checksum = "9cdd180f14b0d468401483d0a9034bc1cb479b4548a5e3e798fff78a6b428c38" dependencies = [ "better_scoped_tls", "bitflags 2.4.0", @@ -7682,9 +7766,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.122.5" +version = "0.123.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "519ffccc874b8bb39db0fceec06c172b1d7a6e812ac6f4b0a000e5d3c295e495" +checksum = "95b258ad9055108f7b597de768f5baf30b6ad9a667e32b233c1ce16f6ee332f8" dependencies = [ "swc_atoms", "swc_common", @@ -7696,9 +7780,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.159.11" +version = "0.160.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83bf11f8c486856ea9c8d24d84e5e8629afbd49919be519fddda67d3d440a9be" +checksum = "a4dbf738679298d62670b5d62b5cf10298c86567b9e1ff3cbd305662e5a5e340" dependencies = [ "arrayvec 0.7.4", "indexmap 1.9.3", @@ -7735,9 +7819,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.176.14" +version = "0.177.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5239cdd86eb8a99d04473dfaceb778ec080be9644ae9d53bc92b6967a3eea60b" +checksum = "5d02949817b6e7af2848747086dec80183f121128e72959b05338dbdedd93fd3" dependencies = [ "Inflector", "anyhow", @@ -7762,9 +7846,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.193.19" +version = "0.194.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47028d59dbb4635f4881393f19644bc3f3808536c901551a73ed0a454160d077" +checksum = "8dce9a9482b492a7d258da12942a57b529b38abec2d9c0a80c8b5d877976110d" dependencies = [ "dashmap", "indexmap 1.9.3", @@ -7787,9 +7871,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.167.13" +version = "0.168.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e896e6d01b1618f4f2061c6ab4c5f74e98b47d93f80bd81731243e880aa721a" +checksum = "04eed2a8ffa91a5595d9420b83d180a0244c351eaa5057133164114773c0adba" dependencies = [ "either", "rustc-hash", @@ -7807,9 +7891,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.179.14" +version = "0.180.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eff59ce7151b51e5eaf0c961cf3a264258f179abe5ca1de6d0c5843020784d" +checksum = "78c6af6af0c2414bc38ac41bc117c52e6df556d85a56e9ed2b021d0d085523c6" dependencies = [ "base64 0.13.1", "dashmap", @@ -7832,9 +7916,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.136.5" +version = "0.137.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef0636ec69f3de36ed0155a05e338b6ee294b115fafa15e13996f1ca7f2af6c3" +checksum = "095467ca72ca9c7051a7d2cf893ae0d2f4e9af79e5e7ed96d8796204deb027ff" dependencies = [ "ansi_term", "anyhow", @@ -7858,9 +7942,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.183.18" +version = "0.184.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705566ab5897223937008a759556d562044a195f2ee8597fa0d9b2af4ca32495" +checksum = "d551c9d4feb5e731fe14e062511ccfc6a2b084ccfc6b32d597718ca84e9e3cb3" dependencies = [ "ryu-js", "serde", @@ -7875,9 +7959,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.19.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71dc9b35f1f137c72badbadb705a2325d161ff603224ab0e07e6834774ea281" +checksum = "64f48eb04f6ec513e9e66b833d14bad0990124185580cbd81c15ae9579e4481b" dependencies = [ "indexmap 1.9.3", "rustc-hash", @@ -7892,9 +7976,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.123.0" +version = "0.124.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6d6b59ebd31b25fe2692ff705c806961e7856de8b7e91fd0942328886cd315" +checksum = "ff63e55fd405696658ef743ea3668a98647f905de7b636918d376e86d4b5d115" dependencies = [ "indexmap 1.9.3", "num_cpus", @@ -7911,9 +7995,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.95.1" +version = "0.96.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2774848b306e17fa280c598ecb192cc2c72a1163942b02d48606514336e9e7c5" +checksum = "47081acd84cdb2d49d6340ed3204e17738b444da10a3e1dd1eb3d7c8e4d47091" dependencies = [ "num-bigint", "serde", @@ -7926,9 +8010,9 @@ dependencies = [ [[package]] name = "swc_emotion" -version = "0.51.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1a13c3241b2812f15e751687924b0458b55ca7c3576a752b939e954cb4b0ba" +checksum = "af06e9c1d8c7d6a3ae0183fc24d978792d338c163b320fec2473d7032918824a" dependencies = [ "base64 0.13.1", "byteorder", @@ -7962,9 +8046,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76b479ad1a69bec65b261354b8e2dec8ed0f9ed43c7b54ab053dc4923e1c90e" +checksum = "015cbdf2b13ccc76eb12d1702a90fb9aae7b3cddacaf2c56a1b1a4a02f9fcd81" dependencies = [ "anyhow", "miette 4.7.1", @@ -7975,9 +8059,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f7297cdefdb54d8d09e0294c1aec3826825b1feefd0c25978365aa7f447a1c" +checksum = "b97e69e9617913611e39284cf724a412ab7fc6081708d0ef2820855774da5357" dependencies = [ "indexmap 1.9.3", "petgraph", @@ -7987,9 +8071,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20a18d45da54ba15698d5ce1f6a0a97684f4035922730393e98e47b44fc3573" +checksum = "0f59cccef405565b041a8fa1fc2e7059856149f7fc658544c4bafd1a001ea483" dependencies = [ "auto_impl", "petgraph", @@ -8022,9 +8106,9 @@ dependencies = [ [[package]] name = "swc_node_comments" -version = "0.19.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b9597573f1ab8bae72329eef550d214ced0955c7a4f1b6b4ae5e216219e710" +checksum = "cf250afa389a40c4856a250d63f5b1f8d46b513446299b72166c870c7641c365" dependencies = [ "dashmap", "swc_atoms", @@ -8058,9 +8142,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.38.1" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76ccadcc63a459e096f332730b2d4e09548fc10e0be63df9f3bacecdf5332fe" +checksum = "55e32ea3aeb4930d0b6fcf1f052d33a4bb115a9d58e32bf3baade3316ef6bdd3" dependencies = [ "better_scoped_tls", "rkyv", @@ -8072,9 +8156,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.102.1" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5626614e11d835b3e8631a7dde4da044d143dc20fd8da3d7ab8d05aaf3cd6b" +checksum = "86c58e6dfbcc59185e9c557d952f431c5140ed546cfebc053ad0b082c4a3e4e4" dependencies = [ "anyhow", "enumset", @@ -8096,9 +8180,9 @@ dependencies = [ [[package]] name = "swc_relay" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b74826cb88703713c9c081f5968324490eed925217813ffa1de22da711a80a9" +checksum = "b649a1cb9d2579ecd8fb91482e38c717c70af303ceaed4f1d6799ec945c1f8b8" dependencies = [ "once_cell", "regex", @@ -8114,9 +8198,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b740ce6b402ed04176bd28dc4f4f92c764fe0defe8437c2f3b6e1b5818b4e10c" +checksum = "77a6e150f91760ccaca6f6b797b95ffb00bbc245a71311c483b84a7bc700e9c4" dependencies = [ "tracing", ] @@ -8393,9 +8477,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.34.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31f7f4a7baef94495386462c2a55caa0f0885b61b28c120f783132d14938ed" +checksum = "e149694212e0152671c616dc21e4029a0f39710085f32705b2fb07fda89e437f" dependencies = [ "ansi_term", "cargo_metadata", @@ -8528,22 +8612,22 @@ dependencies = [ [[package]] name = "time" -version = "0.3.26" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" dependencies = [ "deranged", "itoa", "serde", "time-core", - "time-macros 0.2.12", + "time-macros 0.2.15", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" @@ -8557,9 +8641,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -8875,7 +8959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.26", + "time 0.3.29", "tracing-subscriber", ] @@ -10140,7 +10224,7 @@ dependencies = [ "tempfile", "test-case", "thiserror", - "time 0.3.26", + "time 0.3.29", "tiny-gradient", "tokio", "tokio-stream", @@ -10546,7 +10630,7 @@ dependencies = [ "getset", "rustversion", "thiserror", - "time 0.3.26", + "time 0.3.29", ] [[package]] From dd5709217cfa7fae13add51c50d25565a59a4de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 13 Oct 2023 10:25:28 +0900 Subject: [PATCH 4/5] Fix --- crates/turbopack-ecmascript/src/analyzer/mod.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/crates/turbopack-ecmascript/src/analyzer/mod.rs b/crates/turbopack-ecmascript/src/analyzer/mod.rs index e492a8b6c4bdf..5c464ab5dbeea 100644 --- a/crates/turbopack-ecmascript/src/analyzer/mod.rs +++ b/crates/turbopack-ecmascript/src/analyzer/mod.rs @@ -133,12 +133,6 @@ impl Display for ConstantString { } } -impl From for ConstantString { - fn from(v: JsWord) -> Self { - ConstantString::Word(v) - } -} - impl From for ConstantString { fn from(v: Atom) -> Self { ConstantString::Atom(v) From 3dbc4137131340786597efec44407a70eebe14e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4=20=28Donny=29?= Date: Fri, 13 Oct 2023 11:26:17 +0900 Subject: [PATCH 5/5] fix --- crates/turbopack-css/src/parse.rs | 2 +- crates/turbopack-ecmascript/src/analyzer/mod.rs | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/crates/turbopack-css/src/parse.rs b/crates/turbopack-css/src/parse.rs index b60d028a27f62..25b9556782a3c 100644 --- a/crates/turbopack-css/src/parse.rs +++ b/crates/turbopack-css/src/parse.rs @@ -178,7 +178,7 @@ async fn parse_content( }; let mut errors = Vec::new(); - let mut parsed_stylesheet = match parse_file::(&fm, config, &mut errors) { + let mut parsed_stylesheet = match parse_file::(&fm, None, config, &mut errors) { Ok(stylesheet) => stylesheet, Err(e) => { // TODO report in in a stream diff --git a/crates/turbopack-ecmascript/src/analyzer/mod.rs b/crates/turbopack-ecmascript/src/analyzer/mod.rs index 5c464ab5dbeea..99a5e9e703d45 100644 --- a/crates/turbopack-ecmascript/src/analyzer/mod.rs +++ b/crates/turbopack-ecmascript/src/analyzer/mod.rs @@ -449,12 +449,6 @@ impl From<&'_ str> for JsValue { } } -impl From for JsValue { - fn from(v: JsWord) -> Self { - ConstantValue::Str(ConstantString::Word(v)).into() - } -} - impl From for JsValue { fn from(v: Atom) -> Self { ConstantValue::Str(ConstantString::Atom(v)).into()