From b63fe3f35c6dd06059e3d34e566b95ed9ccf2724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sat, 21 Nov 2020 13:17:42 +0100 Subject: [PATCH] upgrade: deno_doc, deno_lint, dprint, swc (#8443) --- Cargo.lock | 252 ++++++++++++++++++--------------- cli/Cargo.toml | 10 +- cli/inspector.rs | 4 +- cli/module_graph.rs | 2 +- cli/tests/bundle/fixture01.out | 4 +- cli/tests/bundle/fixture02.out | 13 +- cli/tests/bundle/fixture03.out | 4 +- cli/tests/bundle/fixture05.out | 3 +- cli/tests/bundle/fixture08.out | 8 +- cli/tests/bundle/fixture09.out | 11 +- cli/tests/bundle/fixture10.out | 5 +- cli/tests/bundle/fixture11.out | 8 +- cli/tests/bundle/fixture14.out | 50 ++++--- cli/tests/lint/file2.ts | 2 +- 14 files changed, 206 insertions(+), 170 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0768d574f4..55c3539b9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,10 +90,10 @@ checksum = "fd6ee2941db3551563d29eaf5214cd3d7b2f322e0c0e3954f5ae020f860bae8c" dependencies = [ "darling", "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -378,10 +378,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "strsim 0.9.3", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -392,7 +392,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -493,15 +493,14 @@ dependencies = [ [[package]] name = "deno_doc" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a0eed03221f7502d8d5febebf1fa45a30e5596602a16edfc3c91048876e1dd" +checksum = "a206053ef6457bbf561fe496006e2a9c07a80667deafcccdc92f2cf80195affc" dependencies = [ "futures", "lazy_static", "regex", "serde", - "serde_derive", "serde_json", "swc_common", "swc_ecmascript", @@ -519,9 +518,9 @@ dependencies = [ [[package]] name = "deno_lint" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3365f8888bbffc7b9b65268bebf4ba6fdaaf808d5a7a06fffe51786b37869a" +checksum = "af2a1d8ea42d6d25747a101a686ba4b9611f78e6b5c0a57c2ac5abd5a0fabfd5" dependencies = [ "derive_more", "log", @@ -550,9 +549,9 @@ version = "0.99.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -613,9 +612,9 @@ dependencies = [ [[package]] name = "dprint-plugin-typescript" -version = "0.32.8" +version = "0.32.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9971ede7622499e842d0e0f6c24992da34815c1438f26d832b603d1fe9589b46" +checksum = "739fd1d2deeb76f21fed5cf63171aeda42dc94b94073b7ac269c78729a71cf2e" dependencies = [ "dprint-core", "serde", @@ -651,9 +650,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e57153e35187d51f08471d5840459ff29093473e7bedd004a1414985aab92f3" dependencies = [ "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -729,9 +728,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "039885ad6579a86b94ad8df696cce8c530da496bf7b07b12fec8d6c4cd654bb9" dependencies = [ "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -777,9 +776,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" dependencies = [ "futures-channel", "futures-core", @@ -792,9 +791,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" dependencies = [ "futures-core", "futures-sink", @@ -802,15 +801,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" +checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" dependencies = [ "futures-core", "futures-task", @@ -819,42 +818,42 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" +checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" dependencies = [ "once_cell", ] [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" dependencies = [ "futures-channel", "futures-core", @@ -863,7 +862,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project 1.0.2", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -1029,7 +1028,7 @@ dependencies = [ "http-body", "httparse", "itoa", - "pin-project", + "pin-project 0.4.23", "socket2", "time", "tokio", @@ -1139,9 +1138,9 @@ checksum = "04807f3dc9e3ea39af3f8469a5297267faf94859637afb836b33f47d9b2650ee" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -1161,9 +1160,9 @@ dependencies = [ [[package]] name = "jsdoc" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd0a45f2fca1d284537158260931c58496103224c3780e40508d0c1e6b9f4e" +checksum = "18e220ced55f8e93f0a3fb6b6f7c5829235299d818dac283535760a4182b5f0a" dependencies = [ "nom", "serde", @@ -1468,9 +1467,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" [[package]] name = "opaque-debug" @@ -1558,9 +1557,9 @@ dependencies = [ "phf_generator", "phf_shared", "proc-macro-hack", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -1578,7 +1577,16 @@ version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" dependencies = [ - "pin-project-internal", + "pin-project-internal 0.4.23", +] + +[[package]] +name = "pin-project" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" +dependencies = [ + "pin-project-internal 1.0.2", ] [[package]] @@ -1587,9 +1595,20 @@ version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" +dependencies = [ + "proc-macro2 1.0.24", + "quote 1.0.7", + "syn 1.0.48", ] [[package]] @@ -1610,9 +1629,9 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -1629,9 +1648,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -1650,9 +1669,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.21" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid 0.2.1", ] @@ -1688,7 +1707,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", ] [[package]] @@ -1871,9 +1890,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" -version = "1.3.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" dependencies = [ "aho-corasick", "memchr", @@ -1883,9 +1902,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" [[package]] name = "relative-path" @@ -2020,7 +2039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54a50e29610a5be68d4a586a5cce3bfb572ed2c2a74227e4168444b7bf4e5235" dependencies = [ "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -2089,29 +2108,29 @@ checksum = "b46e1121e8180c12ff69a742aabc4f310542b6ccb69f1691689ac17fdf8618aa" [[package]] name = "serde" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" +checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" +checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" dependencies = [ "indexmap", "itoa", @@ -2257,7 +2276,7 @@ checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ "phf_generator", "phf_shared", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", ] @@ -2268,10 +2287,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94fdb6536756cfd35ee18b9a9972ab2a699d405cc57e0ad0532022960f30d581" dependencies = [ "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -2298,9 +2317,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2033b99b209c5978f2bc04931073fe18f676c5b95b12bb6a9ec3b618569d806" +checksum = "82147399b2eb2657714b5d9f59fa8fd11ffa0a510953c4eb5593bd7006128cec" dependencies = [ "anyhow", "crc", @@ -2345,9 +2364,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba29ce355bdfb942c0fb29bd1409197fa1a25ba649f13089129484ad0c83282" +checksum = "39d14f5b7769eb53a98276475ca72d188f5fa0fbf1819d3e9241b9e295ae0542" dependencies = [ "enum_kind", "is-macro", @@ -2360,9 +2379,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75213b0e41fb3c9370eed8ff69124b885ef140776909f7ee014819c0d5ac7349" +checksum = "c48486c086354a033f5e5c4a9dc730ad0e7596039dd4d92f70fe56fcfec4f26a" dependencies = [ "bitflags", "num-bigint", @@ -2380,17 +2399,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04378143fd1296af71dd3aea2e096bef6fbf8aa3c25352d44d62d7f28aa9851b" dependencies = [ "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] name = "swc_ecma_dep_graph" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b94a20574227dc19aac1190d951862a6d541a3761bf9245d2c3b3f802452" +checksum = "06d740540964d8ac8d2d2c603223f49b31a1ae9803d2cdcff0796c210085ecc0" dependencies = [ "swc_atoms", "swc_common", @@ -2400,9 +2419,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136f5fddde6d78b5ae532bb0d5a0ce2f1eb1d36caea3e9b9dfcfb70693a7e23d" +checksum = "6d22c8f6cf8f45b8f2c1c09713f5d0d2e007394c1e8a9fe8ce20d8be5b57dc6a" dependencies = [ "either", "enum_kind", @@ -2426,17 +2445,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8798810e2c79b884cf238bcb72b4bd12375121ee91724f1ceeb54b6e38a138e7" dependencies = [ "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] name = "swc_ecma_transforms" -version = "0.29.3" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0958bbaa69e01a45a2268c398a8814014a029c0b4eaecd42f2545fcd642314e8" +checksum = "5b5641f852d0156388ae939cfc9dda3dd7b05787236d1e80b697750815721758" dependencies = [ "Inflector", "arrayvec", @@ -2447,6 +2466,7 @@ dependencies = [ "is-macro", "jsdoc", "log", + "num-bigint", "once_cell", "ordered-float", "phf", @@ -2473,17 +2493,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38c0b511705a737ef07d347f0fe5af22ef11ead65f6be58010d897426a60a70d" dependencies = [ "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] name = "swc_ecma_utils" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e09463bb646ed5f33608bd60153b604f3a894162d14dba481f1032e7d28e80d" +checksum = "64fd3d84ee287900f37fd06a1856f57cd0d65b37bb0557abde2c91d8a9b28155" dependencies = [ "once_cell", "scoped-tls", @@ -2496,9 +2516,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0175b589eaeb5a8e6458592f82efce759c1fa0fb41dfe14f04b74c498f11f50d" +checksum = "ee22eeb8c6987f9e740e1867292bd45785408f62ded95e1dc57b9c6c26e85a96" dependencies = [ "num-bigint", "swc_atoms", @@ -2509,9 +2529,9 @@ dependencies = [ [[package]] name = "swc_ecmascript" -version = "0.13.3" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11d30e16321db6eb94b38ec3dd701bc4e7bd5e146aa49451b049817a250b0f1" +checksum = "616480cdcebbf6e2b91db9eca819281838f46a4c6a48190111f1ee1254aa781c" dependencies = [ "swc_ecma_ast", "swc_ecma_codegen", @@ -2529,9 +2549,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18a9f27d290938370597d363df9a77ba4be8e2bc99f32f69eb5245cdeed3c512" dependencies = [ "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -2552,10 +2572,10 @@ checksum = "d86b27648c524b340cb535375d52a84efdfb7e864082ca5955cea3932e0b8ea4" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "swc_macros_common", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -2571,11 +2591,11 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.41" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", "unicode-xid 0.2.1", ] @@ -2661,9 +2681,9 @@ version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -2722,9 +2742,9 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", ] [[package]] @@ -2747,7 +2767,7 @@ checksum = "6d9e878ad426ca286e4dcae09cbd4e1973a7f8987d97570e2469703dd7f5720c" dependencies = [ "futures-util", "log", - "pin-project", + "pin-project 0.4.23", "tokio", "tungstenite", ] @@ -2807,7 +2827,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" dependencies = [ - "pin-project", + "pin-project 0.4.23", "tracing", ] @@ -2995,7 +3015,7 @@ dependencies = [ "mime", "mime_guess", "multipart", - "pin-project", + "pin-project 0.4.23", "scoped-tls", "serde", "serde_json", @@ -3042,9 +3062,9 @@ dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", "wasm-bindgen-shared", ] @@ -3076,9 +3096,9 @@ version = "0.2.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" dependencies = [ - "proc-macro2 1.0.21", + "proc-macro2 1.0.24", "quote 1.0.7", - "syn 1.0.41", + "syn 1.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 482c6f364a..b691d781dc 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -34,8 +34,8 @@ winapi = "0.3.9" [dependencies] deno_crypto = { path = "../op_crates/crypto", version = "0.2.0" } deno_core = { path = "../core", version = "0.68.0" } -deno_doc = "0.1.15" -deno_lint = "0.2.9" +deno_doc = "0.1.16" +deno_lint = "0.2.11" deno_web = { path = "../op_crates/web", version = "0.19.0" } deno_fetch = { path = "../op_crates/fetch", version = "0.11.0" } @@ -47,7 +47,7 @@ clap = "2.33.3" dissimilar = "1.0.2" dlopen = "0.1.8" encoding_rs = "0.8.24" -dprint-plugin-typescript = "0.32.8" +dprint-plugin-typescript = "0.32.9" filetime = "0.2.12" http = "0.2.1" indexmap = "1.6.0" @@ -65,9 +65,9 @@ serde = { version = "1.0.116", features = ["derive"] } shell-escape = "0.1.5" sys-info = "0.7.0" sourcemap = "6.0.1" -swc_bundler = "=0.16.1" +swc_bundler = "=0.17.1" swc_common = { version = "=0.10.5", features = ["sourcemap"] } -swc_ecmascript = { version = "=0.13.3", features = ["codegen", "dep_graph", "parser", "react", "transforms", "visit"] } +swc_ecmascript = { version = "=0.14.1", features = ["codegen", "dep_graph", "parser", "react", "transforms", "visit"] } tempfile = "3.1.0" termcolor = "1.1.0" tokio = { version = "0.2.22", features = ["full"] } diff --git a/cli/inspector.rs b/cli/inspector.rs index dd1122020b..4da71435f7 100644 --- a/cli/inspector.rs +++ b/cli/inspector.rs @@ -235,9 +235,9 @@ async fn server( pin_mut!(server_handler); select! { - _ = register_inspector_handler => (), + _ = register_inspector_handler => {}, _ = deregister_inspector_handler => unreachable!(), - _ = server_handler => (), + _ = server_handler => {}, } } diff --git a/cli/module_graph.rs b/cli/module_graph.rs index 0bd51251fb..d11dda1cad 100644 --- a/cli/module_graph.rs +++ b/cli/module_graph.rs @@ -2180,7 +2180,7 @@ pub mod tests { assert!(actual.is_some()); let actual = actual.unwrap(); assert!(actual.contains("const b = \"b\";")); - assert!(actual.contains("console.log(b);")); + assert!(actual.contains("console.log(mod);")); } #[tokio::test] diff --git a/cli/tests/bundle/fixture01.out b/cli/tests/bundle/fixture01.out index e29d0d38ac..c6d2bd6d72 100644 --- a/cli/tests/bundle/fixture01.out +++ b/cli/tests/bundle/fixture01.out @@ -1,7 +1,7 @@ -const a = function() { +const mod = function() { const a = "a"; return { a }; }(); -console.log(a); +console.log(mod); diff --git a/cli/tests/bundle/fixture02.out b/cli/tests/bundle/fixture02.out index 41880e73d5..a002891835 100644 --- a/cli/tests/bundle/fixture02.out +++ b/cli/tests/bundle/fixture02.out @@ -1,11 +1,14 @@ -const c = function() { - const c1 = "c"; +const mod = function() { + const c = "c"; + const c1 = c; class C { } return { - c: c1, + c, default: C }; }(); -console.log("b"); -console.log(c); +const c = mod; +const b = "b"; +console.log(b); +console.log(mod); diff --git a/cli/tests/bundle/fixture03.out b/cli/tests/bundle/fixture03.out index d4c79e2ecd..27d0a7a13e 100644 --- a/cli/tests/bundle/fixture03.out +++ b/cli/tests/bundle/fixture03.out @@ -1,4 +1,6 @@ +const a = "a"; +const a1 = a; const d = { - a: "a" + a: a }; console.log(d); diff --git a/cli/tests/bundle/fixture05.out b/cli/tests/bundle/fixture05.out index 7b2a346011..1289cca5f6 100644 --- a/cli/tests/bundle/fixture05.out +++ b/cli/tests/bundle/fixture05.out @@ -1 +1,2 @@ -console.log("a"); +const a = "a"; +console.log(a); diff --git a/cli/tests/bundle/fixture08.out b/cli/tests/bundle/fixture08.out index f9435ab2a5..01d6befb42 100644 --- a/cli/tests/bundle/fixture08.out +++ b/cli/tests/bundle/fixture08.out @@ -1,7 +1,9 @@ -const a = function() { - const a1 = "a"; +const mod = function() { + const a = "a"; + const a1 = a; return { - a: a1 + a }; }(); +const a = mod; export { a }; diff --git a/cli/tests/bundle/fixture09.out b/cli/tests/bundle/fixture09.out index 7f96469467..e7396f493c 100644 --- a/cli/tests/bundle/fixture09.out +++ b/cli/tests/bundle/fixture09.out @@ -1,4 +1,4 @@ -const _i = function() { +const mod = function() { function a(...d) { return d.join(" "); } @@ -6,7 +6,7 @@ const _i = function() { a }; }(); -const _j = function() { +const mod1 = function() { function a(...d) { return d.join("/"); } @@ -14,6 +14,7 @@ const _j = function() { a }; }(); -const k = globalThis.value ? _i : _j; -const { a , } = k; -export { a }; +const k = globalThis.value ? mod : mod1; +const { a: a2 , } = k; +const a1 = a2; +export { a1 as a }; diff --git a/cli/tests/bundle/fixture10.out b/cli/tests/bundle/fixture10.out index 7436722b56..5491e5e7f2 100644 --- a/cli/tests/bundle/fixture10.out +++ b/cli/tests/bundle/fixture10.out @@ -1,4 +1,5 @@ +const a = "a"; const o = { }; -const { a ="a" } = o; -console.log(a); +const { a: a1 = a } = o; +console.log(a1); diff --git a/cli/tests/bundle/fixture11.out b/cli/tests/bundle/fixture11.out index 526693ef26..c09f0cac91 100644 --- a/cli/tests/bundle/fixture11.out +++ b/cli/tests/bundle/fixture11.out @@ -1,15 +1,13 @@ function a() { console.log("a"); } -var O; +var O2; (function(O1) { O1[O1["A"] = 0] = "A"; O1[O1["B"] = 1] = "B"; O1[O1["C"] = 2] = "C"; -})(O || (O = { +})(O2 || (O2 = { })); -const O1 = O; -export { O1 as O }; class A { #a; #c; @@ -29,3 +27,5 @@ class A { const a2 = new A(); a2.a(); a2.c(); +const O1 = O2; +export { O1 as O }; diff --git a/cli/tests/bundle/fixture14.out b/cli/tests/bundle/fixture14.out index c1a14cebe1..cb0b4834f0 100644 --- a/cli/tests/bundle/fixture14.out +++ b/cli/tests/bundle/fixture14.out @@ -1,25 +1,31 @@ -const lib = function() { - const a = function() { - const a1 = []; - return { - a: a1 - }; - }(); - const b = function() { - const b1 = []; - return { - b: b1 - }; - }(); - const c = function() { - const c1 = []; - return { - c: c1 - }; - }(); - const mod = []; +const mod = function() { + const a = []; + const a1 = a; return { - mod + a }; }(); -console.log(lib); +const a = mod; +const mod1 = function() { + const b = []; + const b1 = b; + return { + b + }; +}(); +const b = mod1; +const mod2 = function() { + const c = []; + const c1 = c; + return { + c + }; +}(); +const c = mod2; +const mod3 = function() { + const mod4 = []; + return { + mod: mod4 + }; +}(); +console.log(mod3); diff --git a/cli/tests/lint/file2.ts b/cli/tests/lint/file2.ts index 10c709ba26..a2be5c5e01 100644 --- a/cli/tests/lint/file2.ts +++ b/cli/tests/lint/file2.ts @@ -2,5 +2,5 @@ try { await Deno.open("./some/file.txt"); } catch (e) {} -// deno-lint-ignore no-explicit-any require-await +// deno-lint-ignore no-explicit-any function foo(): any {}