diff --git a/.nx/workflows/dynamic-changesets.yaml b/.nx/workflows/dynamic-changesets.yaml index c3fd5cff..da23d01c 100644 --- a/.nx/workflows/dynamic-changesets.yaml +++ b/.nx/workflows/dynamic-changesets.yaml @@ -5,6 +5,31 @@ distribute-on: large-changeset: 6 linux-large, 6 linux-extra-large extra-large-changeset: 8 linux-large, 8 linux-extra-large assignment-rules: + - projects: + - e2e-gradle + targets: + - e2e-ci** + run-on: + - agent: linux-extra-large + parallelism: 1 + - projects: + - e2e-next + - e2e-plugin + targets: + - e2e-ci** + run-on: + - agent: linux-extra-large + parallelism: 2 + - projects: + - e2e-angular + - e2e-node + - e2e-react + targets: + - e2e-ci** + run-on: + - agent: linux-extra-large + parallelism: 1 + - projects: - nx - workspace @@ -19,13 +44,36 @@ assignment-rules: - agent: linux-extra-large parallelism: 1 + - projects: + - e2e-release + - e2e-nuxt + - e2e-web + - e2e-eslint + - e2e-remix + - e2e-cypress + - e2e-docker + - e2e-js + - e2e-nx + - e2e-nx-init + - e2e-dotnet + - e2e-workspace-create + - e2e-rollup + targets: + - e2e-ci** + run-on: + - agent: linux-large + parallelism: 1 + - agent: linux-extra-large + parallelism: 2 + + # All other e2e tests can run in parallel - targets: - e2e-ci** run-on: - agent: linux-large parallelism: 2 - agent: linux-extra-large - parallelism: 4 + parallelism: 3 - targets: - bench:* diff --git a/Cargo.lock b/Cargo.lock index 673a4bc9..be3e065b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -169,15 +169,6 @@ dependencies = [ "syn 2.0.114", ] -[[package]] -name = "atomic" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340" -dependencies = [ - "bytemuck", -] - [[package]] name = "atomic-waker" version = "1.1.2" @@ -230,21 +221,6 @@ dependencies = [ "scoped-tls", ] -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -269,15 +245,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - [[package]] name = "bstr" version = "1.12.1" @@ -334,6 +301,12 @@ version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + [[package]] name = "castaway" version = "0.2.4" @@ -442,9 +415,9 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.9.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a" +checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32" dependencies = [ "castaway", "cfg-if", @@ -500,15 +473,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - [[package]] name = "crc32fast" version = "1.5.0" @@ -552,6 +516,22 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.10.0", + "crossterm_winapi", + "mio", + "parking_lot", + "rustix 0.38.44", + "signal-hook", + "signal-hook-mio", + "winapi", +] + [[package]] name = "crossterm" version = "0.29.0" @@ -587,26 +567,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" -[[package]] -name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "csscolorparser" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" -dependencies = [ - "lab", - "phf", -] - [[package]] name = "ctor" version = "0.6.3" @@ -671,12 +631,6 @@ dependencies = [ "rayon", ] -[[package]] -name = "deltae" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" - [[package]] name = "deranged" version = "0.5.5" @@ -714,16 +668,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - [[package]] name = "dispatch2" version = "0.3.0" @@ -843,15 +787,6 @@ version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" -[[package]] -name = "euclid" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06" -dependencies = [ - "num-traits", -] - [[package]] name = "eyre" version = "0.6.12" @@ -874,16 +809,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - [[package]] name = "fastrand" version = "2.3.0" @@ -957,18 +882,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" -[[package]] -name = "finl_unicode" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9844ddc3a6e533d62bba727eb6c28b5d360921d5175e9ff0f1e621a5c590a4d5" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "fixedbitset" version = "0.5.7" @@ -997,12 +910,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" -[[package]] -name = "foldhash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -1149,16 +1056,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "gethostname" version = "1.1.0" @@ -1283,7 +1180,9 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "foldhash 0.1.5", + "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -1291,11 +1190,6 @@ name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash 0.2.0", -] [[package]] name = "hashlink" @@ -1312,12 +1206,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "http" version = "1.4.0" @@ -1715,9 +1603,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.14.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1728,47 +1616,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" -[[package]] -name = "jiff" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" -dependencies = [ - "jiff-static", - "jiff-tzdb-platform", - "log", - "portable-atomic", - "portable-atomic-util", - "serde", - "windows-sys 0.59.0", -] - -[[package]] -name = "jiff-static" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "jiff-tzdb" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c900ef84826f1338a557697dc8fc601df9ca9af4ac137c7fb61d4c6f2dfd3076" - -[[package]] -name = "jiff-tzdb-platform" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" -dependencies = [ - "jiff-tzdb", -] - [[package]] name = "jni" version = "0.21.1" @@ -1896,17 +1743,6 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "kasuari" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899" -dependencies = [ - "hashbrown 0.16.1", - "portable-atomic", - "thiserror 2.0.18", -] - [[package]] name = "kqueue" version = "1.1.1" @@ -1927,12 +1763,6 @@ dependencies = [ "libc", ] -[[package]] -name = "lab" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" - [[package]] name = "lazy_static" version = "1.5.0" @@ -1977,15 +1807,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "line-clipping" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a" -dependencies = [ - "bitflags 2.10.0", -] - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -2027,11 +1848,11 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru" -version = "0.16.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.16.1", + "hashbrown 0.15.5", ] [[package]] @@ -2040,16 +1861,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" -[[package]] -name = "mac_address" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303" -dependencies = [ - "nix 0.29.0", - "winapi", -] - [[package]] name = "machine-uid" version = "0.5.4" @@ -2076,12 +1887,6 @@ version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" -[[package]] -name = "memmem" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" - [[package]] name = "memoffset" version = "0.6.5" @@ -2091,15 +1896,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2153,8 +1949,6 @@ dependencies = [ "napi-sys", "nohash-hasher", "rustc-hash 2.1.1", - "serde", - "serde_json", "tokio", ] @@ -2216,23 +2010,10 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset", "pin-utils", ] -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.10.0", - "cfg-if", - "cfg_aliases", - "libc", - "memoffset 0.9.1", -] - [[package]] name = "nix" version = "0.30.1" @@ -2332,17 +2113,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", -] - [[package]] name = "num-integer" version = "0.1.46" @@ -2361,15 +2131,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - [[package]] name = "nx" version = "0.1.0" @@ -2381,7 +2142,7 @@ dependencies = [ "color-eyre", "colored", "crossbeam-channel", - "crossterm", + "crossterm 0.29.0", "dashmap", "dunce", "flate2", @@ -2435,7 +2196,7 @@ dependencies = [ "tracing-appender", "tracing-subscriber", "tui-logger", - "tui-term", + "tui-term 0.2.0 (git+https://github.com/JamesHenry/tui-term?rev=88e3b61425c97220c528ef76c188df10032a75dd)", "urlencoding", "uuid", "vt100-ctt", @@ -2550,15 +2311,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" -[[package]] -name = "ordered-float" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" -dependencies = [ - "num-traits", -] - [[package]] name = "os_pipe" version = "1.2.3" @@ -2599,53 +2351,16 @@ dependencies = [ ] [[package]] -name = "percent-encoding" -version = "2.3.2" +name = "paste" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" - -[[package]] -name = "pest" -version = "2.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662" -dependencies = [ - "memchr", - "ucd-trie", -] +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "pest_derive" -version = "2.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "pest_meta" -version = "2.8.6" +name = "percent-encoding" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220" -dependencies = [ - "pest", - "sha2", -] +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "petgraph" @@ -2653,31 +2368,11 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ - "fixedbitset 0.5.7", + "fixedbitset", "hashbrown 0.15.5", "indexmap", ] -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator", - "phf_shared", -] - [[package]] name = "phf_generator" version = "0.11.3" @@ -2688,19 +2383,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.114", -] - [[package]] name = "phf_shared" version = "0.11.3" @@ -2761,21 +2443,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "portable-atomic" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" - -[[package]] -name = "portable-atomic-util" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" -dependencies = [ - "portable-atomic", -] - [[package]] name = "portable-pty" version = "0.8.1" @@ -3047,89 +2714,25 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc" -dependencies = [ - "instability", - "ratatui-core", - "ratatui-crossterm", - "ratatui-macros", - "ratatui-termwiz", - "ratatui-widgets", -] - -[[package]] -name = "ratatui-core" -version = "0.1.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ "bitflags 2.10.0", + "cassowary", "compact_str", - "hashbrown 0.16.1", + "crossterm 0.28.1", "indoc", - "itertools 0.14.0", - "kasuari", + "instability", + "itertools 0.13.0", "lru", + "paste", "strum", - "thiserror 2.0.18", "unicode-segmentation", "unicode-truncate", "unicode-width 0.2.0", ] -[[package]] -name = "ratatui-crossterm" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577c9b9f652b4c121fb25c6a391dd06406d3b092ba68827e6d2f09550edc54b3" -dependencies = [ - "cfg-if", - "crossterm", - "instability", - "ratatui-core", -] - -[[package]] -name = "ratatui-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f1342a13e83e4bb9d0b793d0ea762be633f9582048c892ae9041ef39c936f4" -dependencies = [ - "ratatui-core", - "ratatui-widgets", -] - -[[package]] -name = "ratatui-termwiz" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f76fe0bd0ed4295f0321b1676732e2454024c15a35d01904ddb315afd3d545c" -dependencies = [ - "ratatui-core", - "termwiz", -] - -[[package]] -name = "ratatui-widgets" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db" -dependencies = [ - "bitflags 2.10.0", - "hashbrown 0.16.1", - "indoc", - "instability", - "itertools 0.14.0", - "line-clipping", - "ratatui-core", - "strum", - "time", - "unicode-segmentation", - "unicode-width 0.2.0", -] - [[package]] name = "rayon" version = "1.11.0" @@ -3585,7 +3188,7 @@ dependencies = [ "ioctl-rs", "libc", "serial-core", - "termios 0.2.2", + "termios", ] [[package]] @@ -3598,17 +3201,6 @@ dependencies = [ "serial-core", ] -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -3831,22 +3423,23 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.27.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.27.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck", "proc-macro2", "quote", + "rustversion", "syn 2.0.114", ] @@ -4115,18 +3708,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "terminfo" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662" -dependencies = [ - "fnv", - "nom 7.1.3", - "phf", - "phf_codegen", -] - [[package]] name = "termios" version = "0.2.2" @@ -4136,63 +3717,12 @@ dependencies = [ "libc", ] -[[package]] -name = "termios" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - [[package]] name = "termtree" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" -[[package]] -name = "termwiz" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7" -dependencies = [ - "anyhow", - "base64", - "bitflags 2.10.0", - "fancy-regex", - "filedescriptor 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "finl_unicode", - "fixedbitset 0.4.2", - "hex", - "lazy_static", - "libc", - "log", - "memmem", - "nix 0.29.0", - "num-derive", - "num-traits", - "ordered-float", - "pest", - "pest_derive", - "phf", - "sha2", - "signal-hook", - "siphasher 1.0.2", - "terminfo", - "termios 0.3.3", - "thiserror 1.0.69", - "ucd-trie", - "unicode-segmentation", - "vtparse", - "wezterm-bidi", - "wezterm-blob-leases", - "wezterm-color-types", - "wezterm-dynamic", - "wezterm-input-types", - "winapi", -] - [[package]] name = "thiserror" version = "1.0.69" @@ -4284,9 +3814,7 @@ checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", - "libc", "num-conv", - "num_threads", "powerfmt", "serde", "time-core", @@ -4591,12 +4119,12 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tui-logger" -version = "0.18.2" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a6965ab2d37d9bcb0de9eb62631540ff4043048785f35136c58ef233f887a50" +checksum = "382b7ea88082dbe2236ed1e942552b1bfc59e98fdc5d0599f11a627aae9ee2be" dependencies = [ + "chrono", "env_filter", - "jiff", "lazy_static", "log", "parking_lot", @@ -4608,12 +4136,20 @@ dependencies = [ [[package]] name = "tui-term" -version = "0.3.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338ded85dbe7f9ea2298321d126244f54e531e2b2006b97abdab8e47d6f3c88" +checksum = "72af159125ce32b02ceaced6cffae6394b0e6b6dfd4dc164a6c59a2db9b3c0b0" +dependencies = [ + "ratatui", +] + +[[package]] +name = "tui-term" +version = "0.2.0" +source = "git+https://github.com/JamesHenry/tui-term?rev=88e3b61425c97220c528ef76c188df10032a75dd#88e3b61425c97220c528ef76c188df10032a75dd" dependencies = [ - "ratatui-core", - "ratatui-widgets", + "ratatui", + "vt100-ctt", ] [[package]] @@ -4622,18 +4158,6 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" -[[package]] -name = "typenum" -version = "1.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" - -[[package]] -name = "ucd-trie" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" - [[package]] name = "unicode-id" version = "0.3.6" @@ -4654,13 +4178,13 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-truncate" -version = "2.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" dependencies = [ - "itertools 0.14.0", + "itertools 0.13.0", "unicode-segmentation", - "unicode-width 0.2.0", + "unicode-width 0.1.14", ] [[package]] @@ -4717,7 +4241,6 @@ version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" dependencies = [ - "atomic", "getrandom 0.3.4", "js-sys", "wasm-bindgen", @@ -4748,6 +4271,8 @@ source = "git+https://github.com/JamesHenry/vt100-rust?rev=b15dc3b0f7db94167a9c5 dependencies = [ "itoa", "log", + "ratatui", + "tui-term 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.2.0", "vte 0.13.1", ] @@ -4782,15 +4307,6 @@ dependencies = [ "quote", ] -[[package]] -name = "vtparse" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9b2acfb050df409c972a37d3b8e08cdea3bddb0c09db9d53137e504cfabed0" -dependencies = [ - "utf8parse", -] - [[package]] name = "walkdir" version = "2.5.0" @@ -4998,78 +4514,6 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" -[[package]] -name = "wezterm-bidi" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0a6e355560527dd2d1cf7890652f4f09bb3433b6aadade4c9b5ed76de5f3ec" -dependencies = [ - "log", - "wezterm-dynamic", -] - -[[package]] -name = "wezterm-blob-leases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692daff6d93d94e29e4114544ef6d5c942a7ed998b37abdc19b17136ea428eb7" -dependencies = [ - "getrandom 0.3.4", - "mac_address", - "sha2", - "thiserror 1.0.69", - "uuid", -] - -[[package]] -name = "wezterm-color-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296" -dependencies = [ - "csscolorparser", - "deltae", - "lazy_static", - "wezterm-dynamic", -] - -[[package]] -name = "wezterm-dynamic" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2ab60e120fd6eaa68d9567f3226e876684639d22a4219b313ff69ec0ccd5ac" -dependencies = [ - "log", - "ordered-float", - "strsim", - "thiserror 1.0.69", - "wezterm-dynamic-derive", -] - -[[package]] -name = "wezterm-dynamic-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c0cf2d539c645b448eaffec9ec494b8b19bd5077d9e58cb1ae7efece8d575b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "wezterm-input-types" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e" -dependencies = [ - "bitflags 1.3.2", - "euclid", - "lazy_static", - "serde", - "wezterm-dynamic", -] - [[package]] name = "widestring" version = "1.2.1" diff --git a/astro-docs/src/content/docs/technologies/test-tools/vitest/Guides/migrating-from-nx-vite.mdoc b/astro-docs/src/content/docs/technologies/test-tools/vitest/Guides/migrating-from-nx-vite.mdoc index 1e6ad6d7..3c01f295 100644 --- a/astro-docs/src/content/docs/technologies/test-tools/vitest/Guides/migrating-from-nx-vite.mdoc +++ b/astro-docs/src/content/docs/technologies/test-tools/vitest/Guides/migrating-from-nx-vite.mdoc @@ -125,7 +125,7 @@ If you are upgrading to Nx 23, the `ensure-vitest-package-migration` migration r - Splits vitest options out of `@nx/vite/plugin` registrations into dedicated `@nx/vitest` plugin entries. - Adds an `@nx/vitest` plugin entry alongside any default-config `@nx/vite/plugin` registration. -See the [migration reference](/packages/vite/docs/ensure-vitest-package-migration) for full details on what the automated migration does. For manual steps, follow the guide above. +The automated migration handles the conversion entirely. For manual steps, follow the guide above. ## No changes required for these files diff --git a/e2e/angular/src/module-federation-host-remote.test.ts b/e2e/angular/src/module-federation-host-remote.test.ts index 39e3966e..aed112be 100644 --- a/e2e/angular/src/module-federation-host-remote.test.ts +++ b/e2e/angular/src/module-federation-host-remote.test.ts @@ -2,7 +2,6 @@ import { names } from '@nx/devkit'; import { checkFilesExist, killProcessAndPorts, - reservePort, runCLI, runCommandUntil, uniq, @@ -31,12 +30,12 @@ describe('Angular Module Federation - Host and Remote', () => { const sharedLib = uniq('shared-lib'); const wildcardLib = uniq('wildcard-lib'); const secondaryEntry = uniq('secondary'); - const hostPort = await reservePort(); - const remotePort = await reservePort(); + const hostPort = 4300; + const remotePort = 4301; // generate host app runCLI( - `generate @nx/angular:host ${hostApp} --port=${hostPort} --style=css --no-standalone --unitTestRunner=jest --no-interactive` + `generate @nx/angular:host ${hostApp} --style=css --no-standalone --unitTestRunner=jest --no-interactive` ); // generate remote app runCLI( @@ -153,7 +152,7 @@ describe('Angular Module Federation - Host and Remote', () => { `serve ${hostApp} --port=${hostPort} --dev-remotes=${remoteApp1}`, (output) => !output.includes(`Remote '${remoteApp1}' failed to serve correctly`) && - output.includes(`server ready at http://localhost:${hostPort}`) + output.includes(`listening on localhost:${hostPort}`) ); await killProcessAndPorts(processSwc.pid, hostPort, remotePort); @@ -161,7 +160,7 @@ describe('Angular Module Federation - Host and Remote', () => { `serve ${hostApp} --port=${hostPort} --dev-remotes=${remoteApp1}`, (output) => !output.includes(`Remote '${remoteApp1}' failed to serve correctly`) && - output.includes(`server ready at http://localhost:${hostPort}`), + output.includes(`listening on localhost:${hostPort}`), { env: { NX_PREFER_TS_NODE: 'true' } } ); @@ -171,8 +170,8 @@ describe('Angular Module Federation - Host and Remote', () => { it('should convert apps to MF successfully', async () => { const app1 = uniq('app1'); const app2 = uniq('app2'); - const app1Port = await reservePort(); - const app2Port = await reservePort(); + const app1Port = 4400; + const app2Port = 4401; // generate apps runCLI( @@ -194,7 +193,7 @@ describe('Angular Module Federation - Host and Remote', () => { `serve ${app1} --dev-remotes=${app2}`, (output) => !output.includes(`Remote '${app2}' failed to serve correctly`) && - output.includes(`server ready at http://localhost:${app1Port}`) + output.includes(`listening on localhost:${app1Port}`) ); await killProcessAndPorts(processSwc.pid, app1Port, app2Port); @@ -203,7 +202,7 @@ describe('Angular Module Federation - Host and Remote', () => { `serve ${app1} --dev-remotes=${app2}`, (output) => !output.includes(`Remote '${app2}' failed to serve correctly`) && - output.includes(`server ready at http://localhost:${app1Port}`), + output.includes(`listening on localhost:${app1Port}`), { env: { NX_PREFER_TS_NODE: 'true' } } ); diff --git a/e2e/angular/src/module-federation-lib.test.ts b/e2e/angular/src/module-federation-lib.test.ts index 7623a0f2..29ee6d45 100644 --- a/e2e/angular/src/module-federation-lib.test.ts +++ b/e2e/angular/src/module-federation-lib.test.ts @@ -1,6 +1,5 @@ import { killProcessAndPorts, - reservePort, runCLI, runCommandUntil, runE2ETests, @@ -28,10 +27,10 @@ describe('Angular Module Federation - Federated Libraries', () => { const module = uniq('module'); const host = uniq('host'); - const hostPort = await reservePort(); + const hostPort = 4200; runCLI( - `generate @nx/angular:host ${host} --port=${hostPort} --remotes=${remote} --e2eTestRunner=cypress --no-interactive` + `generate @nx/angular:host ${host} --remotes=${remote} --e2eTestRunner=cypress --no-interactive` ); runCLI(`generate @nx/js:lib ${lib} --no-interactive`); @@ -102,10 +101,10 @@ describe('Angular Module Federation - Federated Libraries', () => { const childRemote = uniq('childremote'); const module = uniq('module'); const host = uniq('host'); - const hostPort = await reservePort(); + const hostPort = 4200; runCLI( - `generate @nx/angular:host ${host} --port=${hostPort} --remotes=${remote} --e2eTestRunner=cypress --no-interactive` + `generate @nx/angular:host ${host} --remotes=${remote} --e2eTestRunner=cypress --no-interactive` ); runCLI(`generate @nx/js:lib ${lib} --no-interactive`); diff --git a/e2e/angular/src/module-federation-ssr.test.ts b/e2e/angular/src/module-federation-ssr.test.ts index 9374310b..26f01d21 100644 --- a/e2e/angular/src/module-federation-ssr.test.ts +++ b/e2e/angular/src/module-federation-ssr.test.ts @@ -3,7 +3,6 @@ import { killPorts, killProcessAndPorts, readJson, - reservePort, runCLI, runCommandUntil, runE2ETests, @@ -41,14 +40,13 @@ describe('Angular Module Federation - SSR', () => { const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); - // ports - const hostPort = await reservePort(); - // generate remote apps runCLI( - `generate @nx/angular:host ${host} --port=${hostPort} --ssr --remotes=${remote1},${remote2} --no-interactive` + `generate @nx/angular:host ${host} --ssr --remotes=${remote1},${remote2} --no-interactive` ); + // ports + const hostPort = 4500; const remote1Port = readJson(join(remote1, 'project.json')).targets.serve .options.port; const remote2Port = readJson(join(remote2, 'project.json')).targets.serve diff --git a/e2e/angular/src/module-federation.rspack.test.ts b/e2e/angular/src/module-federation.rspack.test.ts index 788a1524..1780be5c 100644 --- a/e2e/angular/src/module-federation.rspack.test.ts +++ b/e2e/angular/src/module-federation.rspack.test.ts @@ -5,7 +5,6 @@ import { killProcessAndPorts, newProject, readFile, - reservePort, runCLI, runCommandUntil, runE2ETests, @@ -35,12 +34,12 @@ describe('Angular Module Federation', () => { const sharedLib = uniq('shared-lib'); const wildcardLib = uniq('wildcard-lib'); const secondaryEntry = uniq('secondary'); - const hostPort = await reservePort(); - const remotePort = await reservePort(); + const hostPort = 4300; + const remotePort = 4301; // generate host app runCLI( - `generate @nx/angular:host ${hostApp} --port=${hostPort} --style=css --bundler=rspack --no-standalone --no-interactive` + `generate @nx/angular:host ${hostApp} --style=css --bundler=rspack --no-standalone --no-interactive` ); let rspackConfigFileContents = readFile(join(hostApp, 'rspack.config.ts')); let updatedConfigFileContents = rspackConfigFileContents.replace( @@ -180,12 +179,12 @@ describe('Angular Module Federation', () => { it('should load remote app in the browser via ESM module federation', async () => { const hostApp = uniq('host'); const remoteApp = uniq('remote'); - const hostPort = await reservePort(); - const remotePort = await reservePort(); + const hostPort = 4200; + const remotePort = 4401; // generate host with playwright e2e runner runCLI( - `generate @nx/angular:host ${hostApp} --port=${hostPort} --style=css --bundler=rspack --e2eTestRunner=playwright --no-interactive` + `generate @nx/angular:host ${hostApp} --style=css --bundler=rspack --e2eTestRunner=playwright --no-interactive` ); // generate remote diff --git a/e2e/angular/src/projects-build-and-test.test.ts b/e2e/angular/src/projects-build-and-test.test.ts index 6e1b0edb..883e08aa 100644 --- a/e2e/angular/src/projects-build-and-test.test.ts +++ b/e2e/angular/src/projects-build-and-test.test.ts @@ -5,7 +5,6 @@ import { killPort, killProcessAndPorts, readFile, - reservePort, runCLI, runCommandUntil, runE2ETests, @@ -96,7 +95,7 @@ describe('Angular Projects - Build and Test', () => { expect(await killPort(4200)).toBeTruthy(); } - const appPort = await reservePort(); + const appPort = 4207; const process = await runCommandUntil( `serve ${app1} -- --port=${appPort}`, (output) => output.includes(`listening on localhost:${appPort}`) diff --git a/e2e/gradle/src/utils/create-gradle-project.ts b/e2e/gradle/src/utils/create-gradle-project.ts index d09d51c1..6013fde2 100644 --- a/e2e/gradle/src/utils/create-gradle-project.ts +++ b/e2e/gradle/src/utils/create-gradle-project.ts @@ -28,21 +28,14 @@ export function createGradleProject( cwd, }) ); - // Run setup-time gradle commands with --no-daemon so we don't leave a - // long-lived daemon holding inotify watches on the project dir. A daemon - // spawned here outlives the setup phase and interferes with later - // non-gradle filesystem operations (e.g. `nx import` runs `git - // filter-branch --tree-filter`, which fails with "Unable to read current - // working directory" when the daemon is concurrently watching the same - // tree). The actual test-body gradle calls keep daemons enabled. e2eConsoleLogger( - execSync(`${gradleCommand} help --task :init --no-daemon`, { + execSync(`${gradleCommand} help --task :init`, { cwd, }).toString() ); e2eConsoleLogger( runCommand( - `${gradleCommand} init --type ${type}-application --dsl ${type} --project-name ${projectName} --package ${packageName} --no-incubating --split-project --overwrite --no-daemon`, + `${gradleCommand} init --type ${type}-application --dsl ${type} --project-name ${projectName} --package ${packageName} --no-incubating --split-project --overwrite`, { cwd, } @@ -60,7 +53,12 @@ export function createGradleProject( try { e2eConsoleLogger( - runCommand(`${gradleCommand} clean --no-daemon`, { + runCommand(`${gradleCommand} --stop`, { + cwd, + }) + ); + e2eConsoleLogger( + runCommand(`${gradleCommand} clean`, { cwd, }) ); diff --git a/e2e/js/src/js-executor-prune-lockfile.test.ts b/e2e/js/src/js-executor-prune-lockfile.test.ts index 7eca51a7..15579338 100644 --- a/e2e/js/src/js-executor-prune-lockfile.test.ts +++ b/e2e/js/src/js-executor-prune-lockfile.test.ts @@ -9,38 +9,6 @@ import { runCommand, tmpProjPath, } from '@nx/e2e-utils'; -import { cpSync, mkdtempSync, rmSync } from 'fs'; -import { tmpdir } from 'os'; -import { join } from 'path'; - -const installCmd = { - pnpm: 'pnpm install --frozen-lockfile', - yarn: 'yarn install --frozen-lockfile', - npm: 'npm ci', -} as const; - -// Copy the pruned dist to a fresh tmp dir outside the e2e workspace and run -// install there. This isolates the install from the surrounding workspace -// (pnpm-workspace.yaml, parent node_modules) so the assertion is really -// "the pruned dist is self-sufficient" — i.e. the actual deployment contract. -function installPrunedDist( - packageManager: 'pnpm' | 'yarn' | 'npm', - distPath: string -) { - const installDir = mkdtempSync(join(tmpdir(), 'prune-lockfile-install-')); - try { - cpSync(distPath, installDir, { recursive: true }); - // failOnError: true — runCommand silently swallows non-zero exits by - // default (see e2e/utils/command-utils.ts), which would let a broken - // pruned lockfile pass this assertion. We want a real failure. - runCommand(installCmd[packageManager], { - cwd: installDir, - failOnError: true, - }); - } finally { - rmSync(installDir, { recursive: true, force: true }); - } -} describe('js:prune-lockfile executor', () => { describe.each([ @@ -50,7 +18,7 @@ describe('js:prune-lockfile executor', () => { ])( 'package manager %s', (packageManager: 'pnpm' | 'yarn' | 'npm', lockfile) => { - let scope: string; + let scope; beforeAll(() => { scope = newProject({ @@ -63,7 +31,7 @@ describe('js:prune-lockfile executor', () => { cleanupProject(); }); - it('should produce installable pruned output with a workspace module', () => { + it('should prune lockfile with workspace module', () => { const nodeapp = uniq('nodeapp'); const nodelib = uniq('nodelib'); @@ -81,11 +49,9 @@ describe('js:prune-lockfile executor', () => { }; json.nx.targets['prune-lockfile'] = { executor: '@nx/js:prune-lockfile', - options: { buildTarget: 'build' }, - }; - json.nx.targets['copy-workspace-modules'] = { - executor: '@nx/js:copy-workspace-modules', - options: { buildTarget: 'build' }, + options: { + buildTarget: 'build', + }, }; return json; }); @@ -93,80 +59,11 @@ describe('js:prune-lockfile executor', () => { runCLI(`build ${nodeapp}`); runCLI(`prune-lockfile ${nodeapp}`); - runCLI(`copy-workspace-modules ${nodeapp}`); - checkFilesExist(`${nodeapp}/dist/${lockfile}`); - installPrunedDist(packageManager, tmpProjPath(`${nodeapp}/dist`)); - }); - - // app -> lib-a -> lib-b with lib-b having an npm dep. The pruned lockfile - // must include lib-b as an importer and pull in its npm deps; otherwise - // the dist install fails. Regression for #34655 (originally hit on pnpm - // with `workspace:*`; this asserts the install contract on every PM). - it('should produce installable pruned output with a transitive workspace dep', () => { - const nodeapp = uniq('nodeapp'); - const liba = uniq('liba'); - const libb = uniq('libb'); - - runCLI( - `generate @nx/node:app ${nodeapp} --linter=eslint --unitTestRunner=jest` - ); - runCLI( - `generate @nx/js:lib ${liba} --bundler=tsc --linter=eslint --unitTestRunner=jest` - ); - runCLI( - `generate @nx/js:lib ${libb} --bundler=tsc --linter=eslint --unitTestRunner=jest` - ); - - // pnpm uses workspace:* for sibling workspace refs; yarn classic and - // npm don't support that protocol, so use file:../ for those. - const ref = (name: string) => - packageManager === 'pnpm' ? 'workspace:*' : `file:../${name}`; - - updateJson(`${liba}/package.json`, (json) => { - json.dependencies = { - ...json.dependencies, - [`@${scope}/${libb}`]: ref(libb), - }; - return json; - }); - updateJson(`${libb}/package.json`, (json) => { - json.dependencies = { - ...json.dependencies, - lodash: '^4.17.21', - }; - return json; - }); - updateJson(`${nodeapp}/package.json`, (json) => { - json.dependencies = { - ...json.dependencies, - [`@${scope}/${liba}`]: ref(liba), - }; - json.nx.targets['prune-lockfile'] = { - executor: '@nx/js:prune-lockfile', - options: { buildTarget: 'build' }, - }; - json.nx.targets['copy-workspace-modules'] = { - executor: '@nx/js:copy-workspace-modules', - options: { buildTarget: 'build' }, - }; - return json; - }); - runCommand(`${packageManager} install`); - - runCLI(`build ${nodeapp}`); - runCLI(`prune-lockfile ${nodeapp}`); - runCLI(`copy-workspace-modules ${nodeapp}`); - - installPrunedDist(packageManager, tmpProjPath(`${nodeapp}/dist`)); }); } ); - // Plain semver workspace refs (e.g. "*" or "0.0.1") are an npm/yarn-classic - // thing — pnpm requires the `workspace:` protocol — so this scenario stays - // npm-only. The executor must recognize the sibling and rewrite the dep - // to point at workspace_modules. Regression test for #33523. describe('package manager npm (plain semver workspace dependency)', () => { let scope: string; @@ -181,7 +78,11 @@ describe('js:prune-lockfile executor', () => { cleanupProject(); }); - it('should rewrite dependency to workspace_modules and install cleanly', () => { + // npm workspaces reference sibling packages with plain semver (e.g. "*" or + // "0.0.1") rather than a `workspace:`/`file:`/`link:` protocol prefix. The + // executor must still recognize these as workspace modules and rewrite + // them to point at `workspace_modules`. Regression test for #33523. + it('should rewrite dependency to workspace_modules when version is plain semver', () => { const nodeapp = uniq('nodeapp'); const nodelib = uniq('nodelib'); @@ -199,11 +100,9 @@ describe('js:prune-lockfile executor', () => { }; json.nx.targets['prune-lockfile'] = { executor: '@nx/js:prune-lockfile', - options: { buildTarget: 'build' }, - }; - json.nx.targets['copy-workspace-modules'] = { - executor: '@nx/js:copy-workspace-modules', - options: { buildTarget: 'build' }, + options: { + buildTarget: 'build', + }, }; return json; }); @@ -211,7 +110,6 @@ describe('js:prune-lockfile executor', () => { runCLI(`build ${nodeapp}`); runCLI(`prune-lockfile ${nodeapp}`); - runCLI(`copy-workspace-modules ${nodeapp}`); checkFilesExist(`${nodeapp}/dist/package-lock.json`); const prunedPackageJson = JSON.parse( @@ -220,8 +118,6 @@ describe('js:prune-lockfile executor', () => { expect(prunedPackageJson.dependencies[`@${scope}/${nodelib}`]).toBe( `file:./workspace_modules/@${scope}/${nodelib}` ); - - installPrunedDist('npm', tmpProjPath(`${nodeapp}/dist`)); }); }); }); diff --git a/e2e/maven/src/maven-batch-v4.test.ts b/e2e/maven/src/maven-batch-v4.test.ts index 654567bc..ef00c71f 100644 --- a/e2e/maven/src/maven-batch-v4.test.ts +++ b/e2e/maven/src/maven-batch-v4.test.ts @@ -47,21 +47,6 @@ wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-w ); }); - it('should record build state while running Maven 4 resource phases in parallel', () => { - const output = runCLI( - 'run-many -t resources,after:resources --parallel=3 --skip-nx-cache', - { - env: { NX_BATCH_MODE: 'true', NX_VERBOSE_LOGGING: 'true' }, - } - ); - - expect(output).toContain('Successfully ran targets'); - expect(output).toContain('resources'); - expect(output).toContain('after:resources'); - expect(output).not.toContain('context.terminal'); - expect(output).not.toContain('Terminal.writer()'); - }); - it('should install successfully after restoring cached package outputs', () => { // Step 1: Clean target directories to simulate a clean CI checkout runCLI('run-many -t clean'); diff --git a/e2e/next/src/next-legacy.test.ts b/e2e/next/src/next-legacy.test.ts index bcb87958..6821ef3a 100644 --- a/e2e/next/src/next-legacy.test.ts +++ b/e2e/next/src/next-legacy.test.ts @@ -9,7 +9,6 @@ import { newProject, packageManagerLockFile, readFile, - reservePort, runCLI, runCommand, runCommandUntil, @@ -78,7 +77,7 @@ describe('@nx/next (legacy)', () => { checkFilesExist(`dist/${appName}/nested/headers-2.js`); }, 120_000); - it('should build and install pruned lock file', async () => { + it('should build and install pruned lock file', () => { const appName = uniq('app'); runCLI(`generate @nx/next:app ${appName} --no-interactive --style=css`, { env: { NX_ADD_PLUGINS: 'false' }, @@ -251,7 +250,7 @@ describe('@nx/next (legacy)', () => { expect(nextConfigPath).not.toContain(`require("@nx/`); // dev-only packages // Check that `nx serve --prod` works with previous production build (e.g. `nx build `). - const prodServePort = await reservePort(); + const prodServePort = 4001; const prodServeProcess = await runCommandUntil( `run ${appName}:serve --prod --port=${prodServePort}`, (output) => { @@ -260,7 +259,7 @@ describe('@nx/next (legacy)', () => { ); // Check that the output is self-contained (i.e. can run with its own package.json + node_modules) - const selfContainedPort = await reservePort(); + const selfContainedPort = 3000; runCLI( `generate @nx/workspace:run-commands serve-prod --project ${appName} --cwd=dist/packages/${appName} --command="npx next start --port=${selfContainedPort}"`, { diff --git a/e2e/node/src/node-esm-support.test.ts b/e2e/node/src/node-esm-support.test.ts index 1c47c1a4..53ed1f51 100644 --- a/e2e/node/src/node-esm-support.test.ts +++ b/e2e/node/src/node-esm-support.test.ts @@ -4,7 +4,6 @@ import { cleanupProject, getPackageManagerCommand, newProject, - reservePort, runCLI, runCLIAsync, runCommand, @@ -56,7 +55,6 @@ describe('Node.js Framework ESM Support', () => { describe('Express Framework with ESM', () => { it('should build and run Express app with ESM modules', async () => { - const port = await reservePort(); const expressApp = uniq('express-esm'); runCLI( `generate @nx/node:app apps/${expressApp} --framework=express --linter=eslint --unitTestRunner=jest` @@ -89,7 +87,7 @@ describe('Node.js Framework ESM Support', () => { console.log('Express ESM app starting'); console.log('fetch type:', typeof fetch); - const port = process.env.PORT || ${port}; + const port = process.env.PORT || 3000; const server = app.listen(port, () => { console.log('Express ESM server ready on port ' + port); }); @@ -113,7 +111,6 @@ describe('Node.js Framework ESM Support', () => { }, 600000); it('should serve Express app with ESM modules', async () => { - const port = await reservePort(); const expressApp = uniq('express-esm-serve'); runCLI( `generate @nx/node:app apps/${expressApp} --framework=express --linter=eslint --unitTestRunner=jest` @@ -142,7 +139,7 @@ describe('Node.js Framework ESM Support', () => { res.json({ message: 'Express ESM serve working' }); }); - const port = process.env.PORT || ${port}; + const port = process.env.PORT || 3000; const server = app.listen(port, () => { console.log('Express ESM serve ready on port ' + port); }); @@ -164,7 +161,6 @@ describe('Node.js Framework ESM Support', () => { describe('Fastify Framework with ESM', () => { it('should build and run Fastify app with ESM modules', async () => { - const port = await reservePort(); const fastifyApp = uniq('fastify-esm'); runCLI( `generate @nx/node:app apps/${fastifyApp} --framework=fastify --linter=eslint --unitTestRunner=jest` @@ -201,7 +197,7 @@ describe('Node.js Framework ESM Support', () => { const start = async () => { try { - const port = +(process.env.PORT || ${port}); + const port = +(process.env.PORT || 3000); await fastify.listen({ port }); console.log('Fastify ESM server ready on port ' + port); } catch (err) { @@ -229,7 +225,6 @@ describe('Node.js Framework ESM Support', () => { }, 600000); it('should serve Fastify app with ESM modules', async () => { - const port = await reservePort(); const fastifyApp = uniq('fastify-esm-serve'); runCLI( `generate @nx/node:app apps/${fastifyApp} --framework=fastify --linter=eslint --unitTestRunner=jest` @@ -260,7 +255,7 @@ describe('Node.js Framework ESM Support', () => { const start = async () => { try { - const port = +(process.env.PORT || ${port}); + const port = +(process.env.PORT || 3000); await fastify.listen({ port }); console.log('Fastify ESM serve ready on port ' + port); } catch (err) { @@ -285,7 +280,6 @@ describe('Node.js Framework ESM Support', () => { describe('Koa Framework with ESM', () => { it('should build and run Koa app with ESM modules', async () => { - const port = await reservePort(); const koaApp = uniq('koa-esm'); runCLI( `generate @nx/node:app apps/${koaApp} --framework=koa --linter=eslint --unitTestRunner=jest` @@ -324,7 +318,7 @@ describe('Node.js Framework ESM Support', () => { console.log('Koa ESM app starting'); console.log('fetch type:', typeof fetch); - const port = +(process.env.PORT || ${port}); + const port = +(process.env.PORT || 3000); const server = app.listen(port, () => { console.log('Koa ESM server ready on port ' + port); }); @@ -348,7 +342,6 @@ describe('Node.js Framework ESM Support', () => { }, 600000); it('should serve Koa app with ESM modules', async () => { - const port = await reservePort(); const koaApp = uniq('koa-esm-serve'); runCLI( `generate @nx/node:app apps/${koaApp} --framework=koa --linter=eslint --unitTestRunner=jest` @@ -383,7 +376,7 @@ describe('Node.js Framework ESM Support', () => { app.use(router.routes()).use(router.allowedMethods()); - const port = +(process.env.PORT || ${port}); + const port = +(process.env.PORT || 3000); const server = app.listen(port, () => { console.log('Koa ESM serve ready on port ' + port); }); @@ -405,7 +398,6 @@ describe('Node.js Framework ESM Support', () => { describe('Nest Framework with ESM', () => { it('should build and run Nest app with ESM modules', async () => { - const port = await reservePort(); const nestApp = uniq('nest-esm'); runCLI( `generate @nx/node:app apps/${nestApp} --framework=nest --linter=eslint --unitTestRunner=jest` @@ -439,7 +431,7 @@ describe('Node.js Framework ESM Support', () => { const app = await NestFactory.create(AppModule); const globalPrefix = 'api'; app.setGlobalPrefix(globalPrefix); - const port = process.env.PORT || ${port}; + const port = process.env.PORT || 3000; await app.listen(port); console.log('Nest ESM server ready on port ' + port); } @@ -462,7 +454,6 @@ describe('Node.js Framework ESM Support', () => { }, 600000); it('should serve Nest app with ESM modules', async () => { - const port = await reservePort(); const nestApp = uniq('nest-esm-serve'); runCLI( `generate @nx/node:app apps/${nestApp} --framework=nest --linter=eslint --unitTestRunner=jest` @@ -496,7 +487,7 @@ describe('Node.js Framework ESM Support', () => { const app = await NestFactory.create(AppModule); const globalPrefix = 'api'; app.setGlobalPrefix(globalPrefix); - const port = process.env.PORT || ${port}; + const port = process.env.PORT || 3000; await app.listen(port); console.log('Nest ESM serve ready on port ' + port); } @@ -519,7 +510,6 @@ describe('Node.js Framework ESM Support', () => { describe('Mixed Imports across Node.js Frameworks', () => { it('should handle CommonJS and ESM packages together', async () => { - const port = await reservePort(); const nodeApp = uniq('node-mixed-imports'); runCLI( `generate @nx/node:app apps/${nodeApp} --framework=express --linter=eslint --unitTestRunner=jest` @@ -562,7 +552,7 @@ describe('Node.js Framework ESM Support', () => { console.log('Mixed imports Node.js app starting'); console.log('lodash.pick type:', typeof lodash.pick); - const port = process.env.PORT || ${port}; + const port = process.env.PORT || 3000; const server = app.listen(port, () => { console.log('Mixed imports server ready on port ' + port); }); diff --git a/e2e/node/src/node-server.test.ts b/e2e/node/src/node-server.test.ts index 41dd2752..1ef4d8f7 100644 --- a/e2e/node/src/node-server.test.ts +++ b/e2e/node/src/node-server.test.ts @@ -7,7 +7,6 @@ import { newProject, promisifiedTreeKill, readFile, - reservePort, runCLI, runCommandUntil, uniq, @@ -57,7 +56,7 @@ describe('Node Applications + webpack', () => { } } - async function runE2eTests(appName: string, port: number) { + async function runE2eTests(appName: string, port: number = 5000) { process.env.PORT = `${port}`; const result = runCLI(`e2e ${appName}-e2e --verbose`); expect(result).toContain('Setting up...'); @@ -75,16 +74,8 @@ describe('Node Applications + webpack', () => { const fastifyApp = uniq('fastifyapp'); const koaApp = uniq('koaapp'); const nestApp = uniq('nest'); - let expressPort: number; - let fastifyPort: number; - let koaPort: number; - let nestPort: number; - - beforeAll(async () => { - expressPort = await reservePort(); - fastifyPort = await reservePort(); - koaPort = await reservePort(); - nestPort = await reservePort(); + + beforeAll(() => { runCLI( `generate @nx/node:lib libs/${testLib1} --linter=eslint --unitTestRunner=jest --buildable=false` ); @@ -92,16 +83,16 @@ describe('Node Applications + webpack', () => { `generate @nx/node:lib libs/${testLib2} --importPath=@acme/test2 --linter=eslint --unitTestRunner=jest --buildable=false` ); runCLI( - `generate @nx/node:app apps/${expressApp} --framework=express --port=${expressPort} --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest` + `generate @nx/node:app apps/${expressApp} --framework=express --port=7000 --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest` ); runCLI( - `generate @nx/node:app apps/${fastifyApp} --framework=fastify --port=${fastifyPort} --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest` + `generate @nx/node:app apps/${fastifyApp} --framework=fastify --port=7001 --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest` ); runCLI( - `generate @nx/node:app apps/${koaApp} --framework=koa --port=${koaPort} --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest` + `generate @nx/node:app apps/${koaApp} --framework=koa --port=7002 --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest` ); runCLI( - `generate @nx/node:app apps/${nestApp} --framework=nest --port=${nestPort} --bundler=webpack --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest --verbose` + `generate @nx/node:app apps/${nestApp} --framework=nest --port=7003 --bundler=webpack --no-interactive --linter=eslint --unitTestRunner=jest --e2eTestRunner=jest --verbose` ); addLibImport(expressApp, testLib1); @@ -154,19 +145,19 @@ describe('Node Applications + webpack', () => { }, 300_000); it('should e2e test express app', async () => { - await runE2eTests(expressApp, expressPort); + await runE2eTests(expressApp, 7000); }); it('should e2e test fastify app', async () => { - await runE2eTests(fastifyApp, fastifyPort); + await runE2eTests(fastifyApp, 7001); }); it('should e2e test koa app', async () => { - await runE2eTests(koaApp, koaPort); + await runE2eTests(koaApp, 7002); }); it('should e2e test nest app', async () => { - await runE2eTests(nestApp, nestPort); + await runE2eTests(nestApp, 7003); }); }); @@ -183,15 +174,13 @@ describe('Node Applications + webpack', () => { it('should support waitUntilTargets for serve target', async () => { const nodeApp1 = uniq('nodeapp1'); const nodeApp2 = uniq('nodeapp2'); - const nodeApp1Port = await reservePort(); - const nodeApp2Port = await reservePort(); // Set ports to avoid conflicts with other tests that might run in parallel runCLI( - `generate @nx/node:app apps/${nodeApp1} --framework=none --no-interactive --port=${nodeApp1Port} --linter=eslint --unitTestRunner=jest` + `generate @nx/node:app apps/${nodeApp1} --framework=none --no-interactive --port=4444 --linter=eslint --unitTestRunner=jest` ); runCLI( - `generate @nx/node:app apps/${nodeApp2} --framework=none --no-interactive --port=${nodeApp2Port} --linter=eslint --unitTestRunner=jest` + `generate @nx/node:app apps/${nodeApp2} --framework=none --no-interactive --port=4445 --linter=eslint --unitTestRunner=jest` ); updateJson(join('apps', nodeApp1, 'project.json'), (config) => { config.targets.serve.options.waitUntilTargets = [`${nodeApp2}:build`]; diff --git a/e2e/nx/src/__fixtures__/remote-cache.js b/e2e/nx/src/__fixtures__/remote-cache.js index a5251774..9b8eaa53 100644 --- a/e2e/nx/src/__fixtures__/remote-cache.js +++ b/e2e/nx/src/__fixtures__/remote-cache.js @@ -63,7 +63,7 @@ const server = http.createServer((req, res) => { } }); -const PORT = Number(process.env.PORT ?? 3000); +const PORT = 3000; server.listen(PORT, () => { console.log(`Server running at http://localhost:${PORT}/`); }); diff --git a/e2e/nx/src/cache-no-daemon.test.ts b/e2e/nx/src/cache-no-daemon.test.ts index fea2a7fc..1fa8fbad 100644 --- a/e2e/nx/src/cache-no-daemon.test.ts +++ b/e2e/nx/src/cache-no-daemon.test.ts @@ -6,7 +6,6 @@ import { newProject, readFile, removeFile, - reservePort, rmDist, runCLI as _runCLI, RunCmdOpts, @@ -648,16 +647,9 @@ console.log('Build complete'); describe('http remote cache', () => { let cacheServer: any; - let cachePort: number; - let unboundPort: number; - beforeAll(async () => { - cachePort = await reservePort(); - // A second port we deliberately don't bind, used by the - // "should error if server is not running" test. - unboundPort = await reservePort(); + beforeAll(() => { cacheServer = fork(join(__dirname, '__fixtures__', 'remote-cache.js'), { stdio: 'inherit', - env: { ...process.env, PORT: String(cachePort) }, }); }); @@ -683,7 +675,7 @@ console.log('Build complete'); ); runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${cachePort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3000', NX_SELF_HOSTED_REMOTE_CACHE_ACCESS_TOKEN: 'test-token', }, }); @@ -694,7 +686,7 @@ console.log('Build complete'); runCLI(`reset`); const output = runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${cachePort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3000', NX_SELF_HOSTED_REMOTE_CACHE_ACCESS_TOKEN: 'test-token', }, }); @@ -720,7 +712,7 @@ console.log('Build complete'); ); const output = runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${cachePort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3000', }, silenceError: true, }); @@ -748,13 +740,13 @@ console.log('Build complete'); ); const output = runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${unboundPort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3001', NX_SELF_HOSTED_REMOTE_CACHE_ACCESS_TOKEN: 'test-token', }, silenceError: true, }); - expect(output).toContain(`http://localhost:${unboundPort}`); + expect(output).toContain('http://localhost:3001'); }); }); diff --git a/e2e/nx/src/cache.test.ts b/e2e/nx/src/cache.test.ts index b7be1d03..2193bd52 100644 --- a/e2e/nx/src/cache.test.ts +++ b/e2e/nx/src/cache.test.ts @@ -6,7 +6,6 @@ import { newProject, readFile, removeFile, - reservePort, rmDist, runCLI, tmpProjPath, @@ -639,15 +638,9 @@ console.log('Build complete'); describe('http remote cache', () => { let cacheServer: any; - let cachePort: number; - let unusedPort: number; - beforeAll(async () => { - cachePort = await reservePort(); - // Reserved but never bound — used to simulate a server-not-running error. - unusedPort = await reservePort(); + beforeAll(() => { cacheServer = fork(join(__dirname, '__fixtures__', 'remote-cache.js'), { stdio: 'inherit', - env: { ...process.env, PORT: String(cachePort) }, }); }); @@ -673,7 +666,7 @@ console.log('Build complete'); ); runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${cachePort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3000', NX_SELF_HOSTED_REMOTE_CACHE_ACCESS_TOKEN: 'test-token', }, }); @@ -684,7 +677,7 @@ console.log('Build complete'); runCLI(`reset`); const output = runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${cachePort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3000', NX_SELF_HOSTED_REMOTE_CACHE_ACCESS_TOKEN: 'test-token', }, }); @@ -710,7 +703,7 @@ console.log('Build complete'); ); const output = runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${cachePort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3000', }, silenceError: true, }); @@ -738,13 +731,13 @@ console.log('Build complete'); ); const output = runCLI(`build ${projectName}`, { env: { - NX_SELF_HOSTED_REMOTE_CACHE_SERVER: `http://localhost:${unusedPort}`, + NX_SELF_HOSTED_REMOTE_CACHE_SERVER: 'http://localhost:3001', NX_SELF_HOSTED_REMOTE_CACHE_ACCESS_TOKEN: 'test-token', }, silenceError: true, }); - expect(output).toContain(`http://localhost:${unusedPort}`); + expect(output).toContain('http://localhost:3001'); }); }); diff --git a/e2e/nx/src/spread.test.ts b/e2e/nx/src/spread.test.ts index 591aaa5c..d62b1cbf 100644 --- a/e2e/nx/src/spread.test.ts +++ b/e2e/nx/src/spread.test.ts @@ -23,12 +23,6 @@ describe('Spread Token Merging', () => { }); afterEach(() => { updateFile('nx.json', JSON.stringify(existingNxJson, null, 2)); - // Reset daemon cache so the next test does not see stale plugin-inferred - // project graph data. The PR enabling NX_DAEMON=true in runCLI means the - // daemon persists across tests; without a reset, re-adding a previously - // removed plugin to nx.json can cause the daemon to return a cached graph - // that is missing inferred targets. - runCLI('reset'); }); function getResolvedProject(name: string) { diff --git a/e2e/nx/src/workspace-legacy.test.ts b/e2e/nx/src/workspace-legacy.test.ts index 7e944797..bdacae59 100644 --- a/e2e/nx/src/workspace-legacy.test.ts +++ b/e2e/nx/src/workspace-legacy.test.ts @@ -2,7 +2,6 @@ import { checkFilesExist, cleanupProject, newProject, - reservePort, runCLI, runE2ETests, uniq, @@ -19,9 +18,8 @@ describe('@nx/workspace:convert-to-monorepo', () => { it('should convert a standalone webpack and jest react project to a monorepo (legacy)', async () => { const reactApp = uniq('reactapp'); - const appPort = await reservePort(); runCLI( - `generate @nx/react:app --name=${reactApp} --directory="." --bundler=webpack --unitTestRunner=jest --e2eTestRunner=cypress --devServerPort=${appPort} --no-interactive --linter=eslint`, + `generate @nx/react:app --name=${reactApp} --directory="." --bundler=webpack --unitTestRunner=jest --e2eTestRunner=cypress --no-interactive --linter=eslint`, { env: { NX_ADD_PLUGINS: 'false', diff --git a/e2e/playwright/src/playwright.test.ts b/e2e/playwright/src/playwright.test.ts index 183870b7..bab5ea0b 100644 --- a/e2e/playwright/src/playwright.test.ts +++ b/e2e/playwright/src/playwright.test.ts @@ -1,13 +1,12 @@ import { cleanupProject, + newProject, + uniq, + runCLI, ensurePlaywrightBrowsersInstallation, getPackageManagerCommand, getSelectedPackageManager, - newProject, readJson, - reservePort, - runCLI, - uniq, } from '@nx/e2e-utils'; const TEN_MINS_MS = 600_000; @@ -29,15 +28,14 @@ describe('Playwright E2E Test runner', () => { it( 'should test and lint example app', - async () => { + () => { ensurePlaywrightBrowsersInstallation(); - const port = await reservePort(); runCLI( `g @nx/web:app demo-e2e --unitTestRunner=none --bundler=vite --e2eTestRunner=none --style=css --no-interactive` ); runCLI( - `g @nx/playwright:configuration --project demo-e2e --webServerCommand="${pmc.runNx} serve demo-e2e --port=${port}" --webServerAddress="http://localhost:${port}"` + `g @nx/playwright:configuration --project demo-e2e --webServerCommand="${pmc.runNx} serve demo-e2e" --webServerAddress="http://localhost:4200"` ); const e2eResults = runCLI(`e2e demo-e2e`); @@ -51,15 +49,14 @@ describe('Playwright E2E Test runner', () => { it( 'should test and lint example app with js', - async () => { + () => { ensurePlaywrightBrowsersInstallation(); - const port = await reservePort(); runCLI( `g @nx/web:app demo-js-e2e --unitTestRunner=none --bundler=vite --e2eTestRunner=none --style=css --no-interactive` ); runCLI( - `g @nx/playwright:configuration --project demo-js-e2e --js --webServerCommand="${pmc.runNx} serve demo-e2e --port=${port}" --webServerAddress="http://localhost:${port}"` + `g @nx/playwright:configuration --project demo-js-e2e --js --webServerCommand="${pmc.runNx} serve demo-e2e" --webServerAddress="http://localhost:4200"` ); const e2eResults = runCLI(`e2e demo-js-e2e`); @@ -94,17 +91,16 @@ describe('Playwright E2E Test Runner - legacy', () => { it( 'should test and lint example app', - async () => { + () => { ensurePlaywrightBrowsersInstallation(); const pmc = getPackageManagerCommand(); - const port = await reservePort(); runCLI( `g @nx/web:app demo-e2e --directory apps/demo-e2e --unitTestRunner=none --bundler=vite --e2eTestRunner=none --style=css --no-interactive` ); runCLI( - `g @nx/playwright:configuration --project demo-e2e --webServerCommand="${pmc.runNx} serve demo-e2e --port=${port}" --webServerAddress="http://localhost:${port}"` + `g @nx/playwright:configuration --project demo-e2e --webServerCommand="${pmc.runNx} serve demo-e2e" --webServerAddress="http://localhost:4200"` ); const e2eResults = runCLI(`e2e demo-e2e`); @@ -118,17 +114,16 @@ describe('Playwright E2E Test Runner - legacy', () => { it( 'should test and lint example app with js', - async () => { + () => { ensurePlaywrightBrowsersInstallation(); const pmc = getPackageManagerCommand(); - const port = await reservePort(); runCLI( `g @nx/web:app demo-js-e2e --directory apps/demo-js-e2e --unitTestRunner=none --bundler=vite --e2eTestRunner=none --style=css --no-interactive` ); runCLI( - `g @nx/playwright:configuration --project demo-js-e2e --js --webServerCommand="${pmc.runNx} serve demo-e2e --port=${port}" --webServerAddress="http://localhost:${port}"` + `g @nx/playwright:configuration --project demo-js-e2e --js --webServerCommand="${pmc.runNx} serve demo-e2e" --webServerAddress="http://localhost:4200"` ); const e2eResults = runCLI(`e2e demo-js-e2e`); diff --git a/e2e/react/src/module-federation/core-rspack-basic-host-remote-generation.test.ts b/e2e/react/src/module-federation/core-rspack-basic-host-remote-generation.test.ts index aadfc849..0483c6d4 100644 --- a/e2e/react/src/module-federation/core-rspack-basic-host-remote-generation.test.ts +++ b/e2e/react/src/module-federation/core-rspack-basic-host-remote-generation.test.ts @@ -1,14 +1,13 @@ import { stripIndents } from '@nx/devkit'; import { checkFilesExist, - reservePorts, + getAvailablePort, killProcessAndPorts, runCLIAsync, runCommandUntil, runE2ETests, uniq, updateFile, - updateJson, } from '@nx/e2e-utils'; import { readPort, runCLI } from './utils'; import { @@ -34,25 +33,12 @@ describe('React Rspack Module Federation - Basic - Host Remote Generation', () = const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); const remote3 = uniq('remote3'); - const [shellPort, remote1Port, remote2Port, remote3Port] = - await reservePorts(4); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host apps/${shell} --name=${shell} --remotes=${remote1},${remote2},${remote3} --devServerPort=${shellPort} --bundler=rspack --e2eTestRunner=cypress --style=css --no-interactive --skipFormat --js=${js}` ); - const remotePorts: Array<[string, number]> = [ - [remote1, remote1Port], - [remote2, remote2Port], - [remote3, remote3Port], - ]; - for (const [remote, port] of remotePorts) { - updateJson(`apps/${remote}/project.json`, (project) => { - project.targets.serve.options.port = port; - return project; - }); - } - checkFilesExist( `apps/${shell}/module-federation.config.${js ? 'js' : 'ts'}` ); diff --git a/e2e/react/src/module-federation/core-webpack-basic-host-remote-generation.test.ts b/e2e/react/src/module-federation/core-webpack-basic-host-remote-generation.test.ts index 7db71140..982f94a2 100644 --- a/e2e/react/src/module-federation/core-webpack-basic-host-remote-generation.test.ts +++ b/e2e/react/src/module-federation/core-webpack-basic-host-remote-generation.test.ts @@ -1,14 +1,13 @@ import { stripIndents } from '@nx/devkit'; import { checkFilesExist, - reservePorts, + getAvailablePort, killProcessAndPorts, runCLIAsync, runCommandUntil, runE2ETests, uniq, updateFile, - updateJson, } from '@nx/e2e-utils'; import { readPort, runCLI } from './utils'; import { @@ -34,25 +33,12 @@ describe('React Module Federation - Webpack Basic - Host Remote Generation', () const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); const remote3 = uniq('remote3'); - const [shellPort, remote1Port, remote2Port, remote3Port] = - await reservePorts(4); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${shell} --remotes=${remote1},${remote2},${remote3} --devServerPort=${shellPort} --bundler=webpack --e2eTestRunner=cypress --style=css --no-interactive --skipFormat --js=${js}` ); - const remotePorts: Array<[string, number]> = [ - [remote1, remote1Port], - [remote2, remote2Port], - [remote3, remote3Port], - ]; - for (const [remote, port] of remotePorts) { - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = port; - return project; - }); - } - checkFilesExist(`${shell}/module-federation.config.${js ? 'js' : 'ts'}`); checkFilesExist( `${remote1}/module-federation.config.${js ? 'js' : 'ts'}` diff --git a/e2e/react/src/module-federation/core-webpack-ssr.test.ts b/e2e/react/src/module-federation/core-webpack-ssr.test.ts index 37ddd45a..c5db4da4 100644 --- a/e2e/react/src/module-federation/core-webpack-ssr.test.ts +++ b/e2e/react/src/module-federation/core-webpack-ssr.test.ts @@ -3,13 +3,11 @@ import { killPorts, killProcessAndPorts, readJson, - reservePorts, runCLIAsync, runCommandUntil, runE2ETests, uniq, updateFile, - updateJson, } from '@nx/e2e-utils'; import { readPort, runCLI } from './utils'; import { @@ -34,34 +32,11 @@ describe('React Module Federation - Webpack SSR', () => { `generate @nx/react:host ${shell} --bundler=webpack --ssr --remotes=${remote1},${remote2},${remote3} --style=css --no-interactive --skipFormat` ); - // The generator should default ports to 4200..4203. expect(readPort(shell)).toEqual(4200); expect(readPort(remote1)).toEqual(4201); expect(readPort(remote2)).toEqual(4202); expect(readPort(remote3)).toEqual(4203); - // Override defaults with reserved ports so parallel tests don't collide - // when the SSR `server:*` targets bind sockets. - const [shellPort, remote1Port, remote2Port, remote3Port] = - await reservePorts(4); - const portMap: Array<[string, number]> = [ - [shell, shellPort], - [remote1, remote1Port], - [remote2, remote2Port], - [remote3, remote3Port], - ]; - for (const [app, port] of portMap) { - updateJson(`${app}/project.json`, (project) => { - project.targets.serve.options.port = port; - // The SSR `server` target binds its own socket via @nx/{webpack,rspack}:ssr-dev-server - // and defaults to 4200. Pin it so parallel tests don't collide. - if (project.targets.server?.options) { - project.targets.server.options.port = port; - } - return project; - }); - } - [shell, remote1, remote2, remote3].forEach((app) => { checkFilesExist( `${app}/module-federation.config.ts`, @@ -88,26 +63,6 @@ describe('React Module Federation - Webpack SSR', () => { `generate @nx/react:host ${shell} --ssr --bundler=webpack --remotes=${remote1},${remote2},${remote3} --style=css --e2eTestRunner=cypress --no-interactive --skipFormat` ); - const [shellPort, remote1Port, remote2Port, remote3Port] = - await reservePorts(4); - const portMap: Array<[string, number]> = [ - [shell, shellPort], - [remote1, remote1Port], - [remote2, remote2Port], - [remote3, remote3Port], - ]; - for (const [app, port] of portMap) { - updateJson(`${app}/project.json`, (project) => { - project.targets.serve.options.port = port; - // The SSR `server` target binds its own socket via @nx/{webpack,rspack}:ssr-dev-server - // and defaults to 4200. Pin it so parallel tests don't collide. - if (project.targets.server?.options) { - project.targets.server.options.port = port; - } - return project; - }); - } - const serveResult = await runCommandUntil( `serve ${shell}`, (output) => @@ -128,26 +83,6 @@ describe('React Module Federation - Webpack SSR', () => { `generate @nx/react:host ${shell} --bundler=webpack --ssr --remotes=${remote1},${remote2},${remote3} --style=css --e2eTestRunner=cypress --no-interactive --skipFormat` ); - const [shellPort, remote1Port, remote2Port, remote3Port] = - await reservePorts(4); - const portMap: Array<[string, number]> = [ - [shell, shellPort], - [remote1, remote1Port], - [remote2, remote2Port], - [remote3, remote3Port], - ]; - for (const [app, port] of portMap) { - updateJson(`${app}/project.json`, (project) => { - project.targets.serve.options.port = port; - // The SSR `server` target binds its own socket via @nx/{webpack,rspack}:ssr-dev-server - // and defaults to 4200. Pin it so parallel tests don't collide. - if (project.targets.server?.options) { - project.targets.server.options.port = port; - } - return project; - }); - } - const capitalize = (s: string) => s.charAt(0).toUpperCase() + s.slice(1); updateFile(`${shell}-e2e/src/e2e/app.cy.ts`, (content) => { diff --git a/e2e/react/src/module-federation/dynamic-federation.rspack.test.ts b/e2e/react/src/module-federation/dynamic-federation.rspack.test.ts index 37208b13..88847747 100644 --- a/e2e/react/src/module-federation/dynamic-federation.rspack.test.ts +++ b/e2e/react/src/module-federation/dynamic-federation.rspack.test.ts @@ -1,8 +1,8 @@ import { cleanupProject, fileExists, - reservePort, - reservePorts, + getAvailablePort, + getAvailablePorts, killProcessAndPorts, newProject, readJson, @@ -24,7 +24,7 @@ describe('Dynamic Module Federation', () => { it('should load remote dynamic module', async () => { const shell = uniq('shell'); const remote = uniq('remote'); - const [shellPort, remotePort] = await reservePorts(2); + const [shellPort, remotePort] = await getAvailablePorts(2); runCLI( `generate @nx/react:host ${shell} --remotes=${remote} --devServerPort=${shellPort} --bundler=rspack --e2eTestRunner=cypress --dynamic=true --no-interactive --skipFormat` diff --git a/e2e/react/src/module-federation/dynamic-federation.webpack.test.ts b/e2e/react/src/module-federation/dynamic-federation.webpack.test.ts index f44b6d8e..cdf761e9 100644 --- a/e2e/react/src/module-federation/dynamic-federation.webpack.test.ts +++ b/e2e/react/src/module-federation/dynamic-federation.webpack.test.ts @@ -1,7 +1,7 @@ import { cleanupProject, fileExists, - reservePorts, + getAvailablePorts, killProcessAndPorts, newProject, readJson, @@ -23,7 +23,7 @@ describe('Dynamic Module Federation', () => { it('should load remote dynamic module', async () => { const shell = uniq('shell'); const remote = uniq('remote'); - const [shellPort, remotePort] = await reservePorts(2); + const [shellPort, remotePort] = await getAvailablePorts(2); runCLI( `generate @nx/react:host ${shell} --remotes=${remote} --devServerPort=${shellPort} --bundler=webpack --e2eTestRunner=cypress --dynamic=true --no-interactive --skipFormat` diff --git a/e2e/react/src/module-federation/federate-module.rspack.test.ts b/e2e/react/src/module-federation/federate-module.rspack.test.ts index 01f21e08..b4bfaf85 100644 --- a/e2e/react/src/module-federation/federate-module.rspack.test.ts +++ b/e2e/react/src/module-federation/federate-module.rspack.test.ts @@ -1,13 +1,12 @@ import { cleanupProject, - reservePorts, + getAvailablePort, killProcessAndPorts, newProject, runCommandUntil, runE2ETests, uniq, updateFile, - updateJson, } from '@nx/e2e-utils'; import { readPort, runCLI } from './utils'; @@ -25,17 +24,12 @@ describe('Federate Module', () => { const module = uniq('module'); const host = uniq('host'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${host} --remotes=${remote} --bundler=rspack --e2eTestRunner=cypress --devServerPort=${shellPort} --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); - runCLI(`generate @nx/js:lib ${lib} --no-interactive --skipFormat`); // Federate Module @@ -101,6 +95,7 @@ describe('Federate Module', () => { ); const hostPort = readPort(host); + const remotePort = readPort(remote); // Build host and remote const buildOutput = runCLI(`build ${host}`); @@ -130,17 +125,12 @@ describe('Federate Module', () => { const module = uniq('module'); const host = uniq('host'); - const [shellPort, remotePort, childRemotePort] = await reservePorts(3); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${host} --remotes=${remote} --bundler=rspack --e2eTestRunner=cypress --devServerPort=${shellPort} --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); - runCLI(`generate @nx/js:lib ${lib} --no-interactive --skipFormat`); // Federate Module @@ -148,11 +138,6 @@ describe('Federate Module', () => { `generate @nx/react:federate-module ${lib}/src/index.ts --name=${module} --remote=${childRemote} --remoteDirectory=${childRemote} --bundler=rspack --no-interactive --skipFormat` ); - updateJson(`${childRemote}/project.json`, (project) => { - project.targets.serve.options.port = childRemotePort; - return project; - }); - updateFile( `${lib}/src/index.ts`, `export { default } from './lib/${lib}';` @@ -203,6 +188,8 @@ describe('Federate Module', () => { ); const hostPort = readPort(host); + const remotePort = readPort(remote); + const childRemotePort = readPort(childRemote); // Build host and remote const buildOutput = runCLI(`build ${host}`); diff --git a/e2e/react/src/module-federation/federate-module.webpack.test.ts b/e2e/react/src/module-federation/federate-module.webpack.test.ts index c8de8135..a29deef7 100644 --- a/e2e/react/src/module-federation/federate-module.webpack.test.ts +++ b/e2e/react/src/module-federation/federate-module.webpack.test.ts @@ -1,13 +1,12 @@ import { cleanupProject, - reservePorts, + getAvailablePort, killProcessAndPorts, newProject, runCommandUntil, runE2ETests, uniq, updateFile, - updateJson, } from '@nx/e2e-utils'; import { readPort, runCLI } from './utils'; @@ -25,17 +24,12 @@ describe('Federate Module', () => { const module = uniq('module'); const host = uniq('host'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${host} --bundler=webpack --remotes=${remote} --devServerPort=${shellPort} --e2eTestRunner=cypress --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); - runCLI(`generate @nx/js:lib ${lib} --no-interactive --skipFormat`); // Federate Module @@ -101,6 +95,7 @@ describe('Federate Module', () => { ); const hostPort = readPort(host); + const remotePort = readPort(remote); // Build host and remote const buildOutput = runCLI(`build ${host}`); @@ -130,17 +125,12 @@ describe('Federate Module', () => { const module = uniq('module'); const host = uniq('host'); - const [shellPort, remotePort, childRemotePort] = await reservePorts(3); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${host} --remotes=${remote} --devServerPort=${shellPort} --bundler=webpack --e2eTestRunner=cypress --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); - runCLI(`generate @nx/js:lib ${lib} --no-interactive --skipFormat`); // Federate Module @@ -148,11 +138,6 @@ describe('Federate Module', () => { `generate @nx/react:federate-module ${lib}/src/index.ts --bundler=webpack --name=${module} --remote=${childRemote} --remoteDirectory=${childRemote} --no-interactive --skipFormat` ); - updateJson(`${childRemote}/project.json`, (project) => { - project.targets.serve.options.port = childRemotePort; - return project; - }); - updateFile( `${lib}/src/index.ts`, `export { default } from './lib/${lib}';` @@ -203,6 +188,8 @@ describe('Federate Module', () => { ); const hostPort = readPort(host); + const remotePort = readPort(remote); + const childRemotePort = readPort(childRemote); // Build host and remote const buildOutput = runCLI(`build ${host}`); diff --git a/e2e/react/src/module-federation/independent-deployability.rspack.test.ts b/e2e/react/src/module-federation/independent-deployability.rspack.test.ts index cc7f659a..60af1c5e 100644 --- a/e2e/react/src/module-federation/independent-deployability.rspack.test.ts +++ b/e2e/react/src/module-federation/independent-deployability.rspack.test.ts @@ -1,6 +1,6 @@ import { cleanupProject, - reservePorts, + getAvailablePort, killProcessAndPorts, newProject, runCommandUntil, @@ -26,16 +26,13 @@ describe('Independent Deployability', () => { it('should support promised based remotes', async () => { const remote = uniq('remote'); const host = uniq('host'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${host} --remotes=${remote} --devServerPort=${shellPort} --bundler=rspack --e2eTestRunner=cypress --no-interactive --typescriptConfiguration=false --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); + const remotePort = readPort(remote); // Update remote to be loaded via script updateFile( `${remote}/module-federation.config.js`, @@ -146,21 +143,18 @@ describe('Independent Deployability', () => { const remote = uniq('remote'); const lib = uniq('lib'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${shell} --remotes=${remote} --devServerPort=${shellPort} --bundler=rspack --e2eTestRunner=cypress --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); - runCLI( `generate @nx/js:lib ${lib} --importPath=@acme/${lib} --publishable=true --no-interactive --skipFormat` ); + const remotePort = readPort(remote); + updateFile( `${lib}/src/lib/${lib}.ts`, stripIndents` @@ -298,16 +292,13 @@ describe('Independent Deployability', () => { const shell = uniq('shell'); const remote = uniq('remote'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${shell} --remotes=${remote} --bundler=rspack --devServerPort=${shellPort} --e2eTestRunner=cypress --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); + const remotePort = readPort(remote); // update host and remote to use library type var updateFile( @@ -388,8 +379,7 @@ describe('Independent Deployability', () => { const hostE2eResultsSwc = await runCommandUntil( `e2e ${shell}-e2e --verbose`, (output) => - output.includes('NX Successfully ran target e2e for project'), - { timeout: 120000 } + output.includes('NX Successfully ran target e2e for project') ); await killProcessAndPorts( hostE2eResultsSwc.pid, @@ -401,8 +391,7 @@ describe('Independent Deployability', () => { const remoteE2eResultsSwc = await runCommandUntil( `e2e ${remote}-e2e --verbose`, (output) => - output.includes('NX Successfully ran target e2e for project'), - { timeout: 120000 } + output.includes('NX Successfully ran target e2e for project') ); await killProcessAndPorts(remoteE2eResultsSwc.pid, remotePort); diff --git a/e2e/react/src/module-federation/independent-deployability.webpack.test.ts b/e2e/react/src/module-federation/independent-deployability.webpack.test.ts index 6fbb94fc..4488fdf4 100644 --- a/e2e/react/src/module-federation/independent-deployability.webpack.test.ts +++ b/e2e/react/src/module-federation/independent-deployability.webpack.test.ts @@ -1,6 +1,6 @@ import { cleanupProject, - reservePorts, + getAvailablePort, killProcessAndPorts, newProject, runCommandUntil, @@ -28,16 +28,13 @@ describe('Independent Deployability', () => { const remote = uniq('remote'); const host = uniq('host'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${host} --remotes=${remote} --devServerPort=${shellPort} --bundler=webpack --e2eTestRunner=cypress --no-interactive --typescriptConfiguration=false --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); + const remotePort = readPort(remote); // Update remote to be loaded via script updateFile( @@ -168,21 +165,18 @@ describe('Independent Deployability', () => { const remote = uniq('remote'); const lib = uniq('lib'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${shell} --remotes=${remote} --devServerPort=${shellPort} --bundler=webpack --e2eTestRunner=cypress --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); - runCLI( `generate @nx/js:lib ${lib} --importPath=@acme/${lib} --publishable=true --no-interactive --skipFormat` ); + const remotePort = readPort(remote); + updateFile( `${lib}/src/lib/${lib}.ts`, stripIndents` @@ -321,16 +315,13 @@ describe('Independent Deployability', () => { it('should support host and remote with library type var', async () => { const shell = uniq('shell'); const remote = uniq('remote'); - const [shellPort, remotePort] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${shell} --devServerPort=${shellPort} --remotes=${remote} --bundler=webpack --e2eTestRunner=cypress --no-interactive --skipFormat` ); - updateJson(`${remote}/project.json`, (project) => { - project.targets.serve.options.port = remotePort; - return project; - }); + const remotePort = readPort(remote); // update host and remote to use library type var updateFile( diff --git a/e2e/react/src/module-federation/misc-rspack-convert-to-rspack.test.ts b/e2e/react/src/module-federation/misc-rspack-convert-to-rspack.test.ts index efc522a2..383756b6 100644 --- a/e2e/react/src/module-federation/misc-rspack-convert-to-rspack.test.ts +++ b/e2e/react/src/module-federation/misc-rspack-convert-to-rspack.test.ts @@ -6,8 +6,7 @@ import { runE2ETests, uniq, updateFile, - updateJson, - reservePorts, + getAvailablePort, } from '@nx/e2e-utils'; import { readPort, runCLI } from './utils'; import { stripIndents } from 'nx/src/utils/strip-indents'; @@ -25,17 +24,12 @@ describe('React Rspack Module Federation Misc - Convert To Rspack', () => { it('should generate host and remote apps in webpack, convert to rspack and use playwright for e2es', async () => { const shell = uniq('shell'); const remote1 = uniq('remote1'); - const [shellPort, remote1Port] = await reservePorts(2); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host ${shell} --remotes=${remote1} --bundler=webpack --devServerPort=${shellPort} --e2eTestRunner=playwright --style=css --no-interactive --skipFormat` ); - updateJson(`${remote1}/project.json`, (project) => { - project.targets.serve.options.port = remote1Port; - return project; - }); - runCLI( `generate @nx/rspack:convert-webpack ${shell} --skipFormat --no-interactive` ); diff --git a/e2e/react/src/module-federation/misc-rspack-interoperability.test.ts b/e2e/react/src/module-federation/misc-rspack-interoperability.test.ts index 60bad4f0..b4116aa7 100644 --- a/e2e/react/src/module-federation/misc-rspack-interoperability.test.ts +++ b/e2e/react/src/module-federation/misc-rspack-interoperability.test.ts @@ -6,8 +6,7 @@ import { runE2ETests, uniq, updateFile, - updateJson, - reservePorts, + getAvailablePort, } from '@nx/e2e-utils'; import { readPort, runCLI } from './utils'; import { stripIndents } from 'nx/src/utils/strip-indents'; @@ -26,26 +25,16 @@ describe('React Rspack Module Federation Misc - Interoperability', () => { const shell = uniq('shell'); const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); - const [shellPort, remote1Port, remote2Port] = await reservePorts(3); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host apps/${shell} --name=${shell} --remotes=${remote1} --bundler=webpack --devServerPort=${shellPort} --e2eTestRunner=cypress --style=css --no-interactive --skipFormat` ); - updateJson(`apps/${remote1}/project.json`, (project) => { - project.targets.serve.options.port = remote1Port; - return project; - }); - runCLI( `generate @nx/react:remote apps/${remote2} --name=${remote2} --host=${shell} --bundler=rspack --style=css --no-interactive --skipFormat` ); - updateJson(`apps/${remote2}/project.json`, (project) => { - project.targets.serve.options.port = remote2Port; - return project; - }); - updateFile( `apps/${shell}-e2e/src/integration/app.spec.ts`, stripIndents` @@ -77,10 +66,8 @@ describe('React Rspack Module Federation Misc - Interoperability', () => { }); }); - const serveResult = await runCommandUntil( - `serve ${shell}`, - (output) => output.includes(`http://localhost:${readPort(shell)}`), - { timeout: 120000 } + const serveResult = await runCommandUntil(`serve ${shell}`, (output) => + output.includes(`http://localhost:${readPort(shell)}`) ); await killProcessAndPorts(serveResult.pid, readPort(shell)); @@ -88,8 +75,7 @@ describe('React Rspack Module Federation Misc - Interoperability', () => { if (runE2ETests()) { const e2eResultsSwc = await runCommandUntil( `e2e ${shell}-e2e --verbose`, - (output) => output.includes('All specs passed!'), - { timeout: 120000 } + (output) => output.includes('All specs passed!') ); await killProcessAndPorts(e2eResultsSwc.pid, readPort(shell)); @@ -100,26 +86,16 @@ describe('React Rspack Module Federation Misc - Interoperability', () => { const shell = uniq('shell'); const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); - const [shellPort, remote1Port, remote2Port] = await reservePorts(3); + const shellPort = await getAvailablePort(); runCLI( `generate @nx/react:host apps/${shell} --name=${shell} --remotes=${remote1} --bundler=rspack --devServerPort=${shellPort} --e2eTestRunner=cypress --style=css --no-interactive --skipFormat` ); - updateJson(`apps/${remote1}/project.json`, (project) => { - project.targets.serve.options.port = remote1Port; - return project; - }); - runCLI( `generate @nx/react:remote apps/${remote2} --name=${remote2} --host=${shell} --bundler=webpack --style=css --no-interactive --skipFormat` ); - updateJson(`apps/${remote2}/project.json`, (project) => { - project.targets.serve.options.port = remote2Port; - return project; - }); - updateFile( `apps/${shell}-e2e/src/integration/app.cy.ts`, stripIndents` @@ -148,8 +124,7 @@ describe('React Rspack Module Federation Misc - Interoperability', () => { if (runE2ETests()) { const e2eResultsSwc = await runCommandUntil( `e2e ${shell}-e2e --verbose`, - (output) => output.includes('Successfully ran target e2e'), - { timeout: 120000 } + (output) => output.includes('Successfully ran target e2e') ); await killProcessAndPorts(e2eResultsSwc.pid, readPort(shell)); diff --git a/e2e/react/src/module-federation/ts-solution-mf.test.ts b/e2e/react/src/module-federation/ts-solution-mf.test.ts index d11e0423..b151fae5 100644 --- a/e2e/react/src/module-federation/ts-solution-mf.test.ts +++ b/e2e/react/src/module-federation/ts-solution-mf.test.ts @@ -4,7 +4,7 @@ import { cleanupProject, checkFilesDoNotExist, checkFilesExist, - reservePort, + getAvailablePort, killProcessAndPorts, readFile, readJson, @@ -45,7 +45,7 @@ describe('React Rspack Module Federation - TS Solution + PM Workspaces', () => { const shell = uniq('shell'); const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); - const shellPort = await reservePort(); + const shellPort = await getAvailablePort(); // Generate host with remotes runCLI( @@ -192,7 +192,7 @@ describe('React Rspack Module Federation - TS Solution + PM Workspaces', () => { const shell = uniq('shell'); const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); - const shellPort = await reservePort(); + const shellPort = await getAvailablePort(); // Generate host with one remote runCLI( @@ -226,7 +226,7 @@ describe('React Rspack Module Federation - TS Solution + PM Workspaces', () => { const shell = uniq('shell'); const remote = uniq('remote'); const lib = uniq('lib'); - const shellPort = await reservePort(); + const shellPort = await getAvailablePort(); // Generate a library runCLI( diff --git a/e2e/react/src/react-rsbuild.test.ts b/e2e/react/src/react-rsbuild.test.ts index eccc444c..92f45a59 100644 --- a/e2e/react/src/react-rsbuild.test.ts +++ b/e2e/react/src/react-rsbuild.test.ts @@ -1,7 +1,7 @@ import { checkFilesExist, cleanupProject, - reservePort, + getAvailablePort, newProject, runCLI, runCLIAsync, @@ -67,7 +67,7 @@ describe('Build React applications and libraries with Rsbuild', () => { it('should support bundling with Rsbuild and Jest', async () => { const rsbuildApp = uniq('rsbuildapp'); - const port = await reservePort(); + const port = await getAvailablePort(); runCLI( `generate @nx/react:app apps/${rsbuildApp} --port=${port} --bundler=rsbuild --unitTestRunner=jest --no-interactive --linter=eslint` diff --git a/e2e/react/src/react-vite.test.ts b/e2e/react/src/react-vite.test.ts index cb89fb60..91e742e9 100644 --- a/e2e/react/src/react-vite.test.ts +++ b/e2e/react/src/react-vite.test.ts @@ -1,7 +1,7 @@ import { checkFilesExist, cleanupProject, - reservePort, + getAvailablePort, killPorts, newProject, readFile, @@ -66,7 +66,7 @@ describe('Build React applications and libraries with Vite', () => { it('should generate app with custom port', async () => { const viteApp = uniq('viteapp'); - const customPort = await reservePort(); + const customPort = await getAvailablePort(); runCLI( `generate @nx/react:app apps/${viteApp} --bundler=vite --port=${customPort} --unitTestRunner=vitest --no-interactive --linter=eslint --e2eTestRunner=playwright` diff --git a/e2e/release/src/release-publishable-libraries-ts-solution.test.ts b/e2e/release/src/release-publishable-libraries-ts-solution.test.ts index 10bbadaf..4779e717 100644 --- a/e2e/release/src/release-publishable-libraries-ts-solution.test.ts +++ b/e2e/release/src/release-publishable-libraries-ts-solution.test.ts @@ -69,7 +69,7 @@ describe('release publishable libraries in workspace with ts solution setup', () // This is the verdaccio instance that the e2e tests themselves are working from e2eRegistryUrl = execSync('npm config get registry').toString().trim(); - }, 300_000); + }, 100000); beforeEach(() => { try { diff --git a/e2e/release/src/release-publishable-libraries.test.ts b/e2e/release/src/release-publishable-libraries.test.ts index ad6dc382..b3e5fc95 100644 --- a/e2e/release/src/release-publishable-libraries.test.ts +++ b/e2e/release/src/release-publishable-libraries.test.ts @@ -76,7 +76,7 @@ describe('release publishable libraries', () => { // This is the verdaccio instance that the e2e tests themselves are working from e2eRegistryUrl = execSync('npm config get registry').toString().trim(); - }, 300_000); + }, 100000); beforeEach(() => { try { diff --git a/e2e/storybook/src/storybook-angular.test.ts b/e2e/storybook/src/storybook-angular.test.ts index 85666188..b0a4f525 100644 --- a/e2e/storybook/src/storybook-angular.test.ts +++ b/e2e/storybook/src/storybook-angular.test.ts @@ -3,7 +3,6 @@ import { cleanupProject, killPorts, newProject, - reservePort, runCLI, runCommandUntil, uniq, @@ -26,14 +25,12 @@ describe('Storybook executors for Angular', () => { }); describe('serve and build storybook', () => { - let storybookPort: number; - afterAll(() => storybookPort && killPorts(storybookPort)); + afterAll(() => killPorts(4400)); // TODO(jack): re-enable when lodash@4.18.0 assignWith bug is resolved it.skip('should serve an Angular based Storybook setup', async () => { - storybookPort = await reservePort(); const p = await runCommandUntil( - `run ${angularStorybookLib}:storybook --port ${storybookPort}`, + `run ${angularStorybookLib}:storybook --port 4400`, (output) => { return /Storybook.*(started|ready)/gi.test(output); } diff --git a/e2e/storybook/src/storybook-nested.test.ts b/e2e/storybook/src/storybook-nested.test.ts index 69600554..3a6babc4 100644 --- a/e2e/storybook/src/storybook-nested.test.ts +++ b/e2e/storybook/src/storybook-nested.test.ts @@ -4,7 +4,6 @@ import { getSelectedPackageManager, killPorts, readJson, - reservePort, runCLI, runCommandUntil, runCreateWorkspace, @@ -50,13 +49,11 @@ describe('Storybook generators and executors for standalone workspaces - using R }); describe('serve storybook', () => { - let storybookPort: number; - afterEach(() => storybookPort && killPorts(storybookPort)); + afterEach(() => killPorts(4400)); it('should serve a React based Storybook setup that uses Vite', async () => { - storybookPort = await reservePort(); const p = await runCommandUntil( - `run ${appName}:storybook --port ${storybookPort}`, + `run ${appName}:storybook --port 4400`, (output) => { return /Storybook.*(started|ready)/gi.test(output); } diff --git a/e2e/utils/command-utils.ts b/e2e/utils/command-utils.ts index 16d9e060..fdd461de 100644 --- a/e2e/utils/command-utils.ts +++ b/e2e/utils/command-utils.ts @@ -303,7 +303,6 @@ export function runCommandUntil( encoding: 'utf-8', env: { CI: 'true', - NX_DAEMON: 'true', // Use new versioning by default in e2e tests NX_INTERNAL_USE_LEGACY_VERSIONING: 'false', ...getStrippedEnvironmentVariables(), diff --git a/e2e/utils/port-utils.ts b/e2e/utils/port-utils.ts index 961a7581..f28a03b9 100644 --- a/e2e/utils/port-utils.ts +++ b/e2e/utils/port-utils.ts @@ -1,64 +1,8 @@ -import * as fs from 'fs'; import * as net from 'net'; -import * as os from 'os'; -import * as path from 'path'; /** - * Reserves a port across parallel processes on the same host via an atomic - * lock file. Avoids the TOCTOU race of probing port 0 and then binding it - * seconds later — another parallel process could be handed the same port in - * between. - * - * Starts at 6100 (outside the framework-default zone of 3000/4200/5173/8080/etc.) - * so reserved ports never collide with parallel tests that generate apps - * without explicitly pinning the dev-server port. - */ -const LOCK_DIR = path.join(os.tmpdir(), 'nx-e2e-port-locks'); -fs.mkdirSync(LOCK_DIR, { recursive: true }); - -export async function reservePort(start = 6100): Promise { - for (let port = start; port < 65000; port++) { - const lock = path.join(LOCK_DIR, `${port}.lock`); - try { - fs.writeFileSync(lock, '', { flag: 'wx' }); - } catch (err) { - if ((err as NodeJS.ErrnoException).code !== 'EEXIST') throw err; - continue; - } - // Lock claimed; now verify the OS port is actually free. Another e2e test - // on the same agent may be using the OS port via the generator's default - // (i.e. without participating in the lock-file scheme), so an exclusive - // lock is not enough. - if (!(await isPortAvailable(port))) { - try { - fs.unlinkSync(lock); - } catch {} - continue; - } - process.on('exit', () => { - try { - fs.unlinkSync(lock); - } catch {} - }); - return port; - } - throw new Error('No available ports'); -} - -/** - * Reserves `count` ports. - */ -export async function reservePorts(count: number): Promise { - const ports: number[] = []; - for (let i = 0; i < count; i++) { - ports.push(await reservePort()); - } - return ports; -} - -/** - * @deprecated Use {@link reservePort} — probing the OS for port 0 opens a - * TOCTOU race across parallel e2e processes. Kept for backwards compatibility. + * Finds an available port by creating a temporary server on port 0 + * and letting the OS assign a free port. */ export async function getAvailablePort(): Promise { return new Promise((resolve, reject) => { @@ -81,7 +25,10 @@ export async function getAvailablePort(): Promise { } /** - * @deprecated Use {@link reservePorts}. + * Finds multiple available ports for running multiple services + * + * @param count - Number of ports needed + * @returns Promise - Array of available port numbers */ export async function getAvailablePorts(count: number): Promise { const ports: number[] = []; diff --git a/e2e/vite/src/vite.test.ts b/e2e/vite/src/vite.test.ts index 0d74d661..2d3859ee 100644 --- a/e2e/vite/src/vite.test.ts +++ b/e2e/vite/src/vite.test.ts @@ -4,7 +4,6 @@ import { killProcessAndPorts, newProject, readJson, - reservePort, runCLI, runCommand, runCommandUntil, @@ -136,7 +135,7 @@ describe('@nx/vite/plugin', () => { it('should run serve-static', async () => { let process: ChildProcess; - const port = await reservePort(); + const port = 8081; try { process = await runCommandUntil( diff --git a/e2e/vue/src/vue.test.ts b/e2e/vue/src/vue.test.ts index e2a10f54..55b3c9be 100644 --- a/e2e/vue/src/vue.test.ts +++ b/e2e/vue/src/vue.test.ts @@ -2,7 +2,6 @@ import { cleanupProject, killPorts, newProject, - reservePort, runCLI, runE2ETests, uniq, @@ -35,7 +34,7 @@ describe('Vue Plugin', () => { ); if (runE2ETests('playwright')) { - const availablePort = await reservePort(); + const availablePort = await getAvailablePort(); updateFile(`${app}-e2e/playwright.config.ts`, (content) => { return content @@ -77,7 +76,7 @@ describe('Vue Plugin', () => { ); if (runE2ETests('playwright')) { - const availablePort = await reservePort(); + const availablePort = await getAvailablePort(); updateFile(`${app}-e2e/playwright.config.ts`, (content) => { return content @@ -116,3 +115,25 @@ describe('Vue Plugin', () => { ); }); }); + +async function getAvailablePort(): Promise { + const net = require('net'); + + return new Promise((resolve, reject) => { + const server = net.createServer(); + server.unref(); + server.on('error', reject); + + server.listen(0, () => { + const addressInfo = server.address(); + if (!addressInfo) { + reject(new Error('Failed to get server address')); + return; + } + const port = addressInfo.port; + server.close(() => { + resolve(port); + }); + }); + }); +} diff --git a/e2e/web/src/web-webpack.test.ts b/e2e/web/src/web-webpack.test.ts index 72fac69a..47add23c 100644 --- a/e2e/web/src/web-webpack.test.ts +++ b/e2e/web/src/web-webpack.test.ts @@ -2,7 +2,6 @@ import { cleanupProject, killProcessAndPorts, newProject, - reservePort, runCLI, runCommandUntil, uniq, @@ -23,14 +22,13 @@ describe('Web Components Applications with bundler set as webpack', () => { } ); - const port = await reservePort(); const childProcess = await runCommandUntil( - `serve ${appName} --port=${port} --ssl`, + `serve ${appName} --port=5000 --ssl`, (output) => { - return output.includes(`listening at https://localhost:${port}`); + return output.includes('listening at https://localhost:5000'); } ); - await killProcessAndPorts(childProcess.pid, port); + await killProcessAndPorts(childProcess.pid, 5000); }, 300_000); }); diff --git a/e2e/webpack/src/webpack.legacy.test.ts b/e2e/webpack/src/webpack.legacy.test.ts index 70fb04c9..2d88d6a7 100644 --- a/e2e/webpack/src/webpack.legacy.test.ts +++ b/e2e/webpack/src/webpack.legacy.test.ts @@ -1,10 +1,10 @@ import { checkFilesExist, cleanupProject, + getAvailablePort, killProcessAndPorts, newProject, readFile, - reservePort, runCLI, runCommandUntil, runE2ETests, @@ -51,7 +51,7 @@ describe('Webpack Plugin (legacy)', () => { it('should run serve-static', async () => { let process: ChildProcess; - const port = await reservePort(); + const port = await getAvailablePort(); try { process = await runCommandUntil( diff --git a/e2e/webpack/src/webpack.test.ts b/e2e/webpack/src/webpack.test.ts index 934c1bd6..09ec1281 100644 --- a/e2e/webpack/src/webpack.test.ts +++ b/e2e/webpack/src/webpack.test.ts @@ -332,7 +332,7 @@ describe('Webpack Plugin', () => { const myPkg = uniq('my-pkg'); runCLI( - `generate @nx/web:application ${appName} --directory=apps/${appName} --bundler=webpack` + `generate @nx/web:application ${appName} --directory=apps/${appName}` ); runCLI( diff --git a/nx.json b/nx.json index 1375dd4e..527d7d0b 100644 --- a/nx.json +++ b/nx.json @@ -287,7 +287,7 @@ "nxCloudId": "62d013ea0852fe0a2df74438", "nxCloudUrl": "https://staging.nx.app", "parallel": 1, - "bust": 331, + "bust": 322, "defaultBase": "master", "sync": { "applyChanges": true }, "conformance": { diff --git a/package.json b/package.json index addfa8ba..649acc20 100644 --- a/package.json +++ b/package.json @@ -191,7 +191,7 @@ "cytoscape-popper": "^2.0.0", "cz-git": "^1.4.0", "czg": "^1.4.0", - "detect-port": "^2.1.0", + "detect-port": "^1.5.1", "dotenv": "~16.4.5", "dotenv-expand": "~12.0.3", "ejs": "5.0.1", diff --git a/packages/angular/src/generators/application/lib/add-e2e.ts b/packages/angular/src/generators/application/lib/add-e2e.ts index 4caaa225..306b32d0 100644 --- a/packages/angular/src/generators/application/lib/add-e2e.ts +++ b/packages/angular/src/generators/application/lib/add-e2e.ts @@ -102,7 +102,7 @@ function getAngularE2EWebServerInfo( const pm = getPackageManagerCommand(); return { - e2eCiBaseUrl: `http://localhost:${e2ePort}`, + e2eCiBaseUrl: 'http://localhost:4200', e2eCiWebServerCommand: `${pm.exec} nx run ${projectName}:serve-static`, e2eWebServerCommand: `${pm.exec} nx run ${projectName}:serve`, e2eWebServerAddress: `http://localhost:${e2ePort}`, diff --git a/packages/angular/src/generators/host/host.ts b/packages/angular/src/generators/host/host.ts index 307b077e..5bdb3028 100644 --- a/packages/angular/src/generators/host/host.ts +++ b/packages/angular/src/generators/host/host.ts @@ -73,13 +73,11 @@ export async function host(tree: Tree, schema: Schema) { directory: options.directory, }); - const hostPort = options.port ?? 4200; - const appInstallTask = await applicationGenerator(tree, { ...options, standalone: options.standalone, routing: true, - port: hostPort, + port: 4200, skipFormat: true, bundler: 'webpack', }); @@ -90,7 +88,7 @@ export async function host(tree: Tree, schema: Schema) { appName: hostProjectName, mfType: 'host', routing: true, - port: hostPort, + port: 4200, remotes: remotesToIntegrate ?? [], federationType: options.dynamic ? 'dynamic' : 'static', skipPackageJson: options.skipPackageJson, @@ -126,7 +124,7 @@ export async function host(tree: Tree, schema: Schema) { name: remote, directory: remoteDirectory, host: hostProjectName, - port: isRspack ? hostPort + i + 1 : undefined, + port: isRspack ? 4200 + i + 1 : undefined, skipFormat: true, standalone: options.standalone, typescriptConfiguration, @@ -146,7 +144,7 @@ export async function host(tree: Tree, schema: Schema) { const project = readProjectConfiguration(tree, hostProjectName); project.targets.serve ??= {}; project.targets.serve.options ??= {}; - project.targets.serve.options.port = hostPort; + project.targets.serve.options.port = 4200; updateProjectConfiguration(tree, hostProjectName, project); if (!options.skipFormat) { diff --git a/packages/angular/src/generators/host/schema.d.ts b/packages/angular/src/generators/host/schema.d.ts index 17b9a2ad..489117b4 100644 --- a/packages/angular/src/generators/host/schema.d.ts +++ b/packages/angular/src/generators/host/schema.d.ts @@ -6,7 +6,6 @@ export interface Schema { directory: string; name?: string; bundler?: 'webpack' | 'rspack'; - port?: number; remotes?: string[]; dynamic?: boolean; setParserOptionsProject?: boolean; diff --git a/packages/angular/src/generators/host/schema.json b/packages/angular/src/generators/host/schema.json index fa279e05..ba31c8dd 100644 --- a/packages/angular/src/generators/host/schema.json +++ b/packages/angular/src/generators/host/schema.json @@ -43,10 +43,6 @@ "default": "webpack", "enum": ["webpack", "rspack"] }, - "port": { - "type": "number", - "description": "The port at which the Consumer (host) application should be served. Defaults to 4200." - }, "dynamic": { "type": "boolean", "description": "Should the host application use dynamic federation?", diff --git a/packages/angular/src/plugins/plugin.ts b/packages/angular/src/plugins/plugin.ts index e0c59523..b9046d8a 100644 --- a/packages/angular/src/plugins/plugin.ts +++ b/packages/angular/src/plugins/plugin.ts @@ -91,26 +91,19 @@ export const createNodesV2: CreateNodesV2 = [ `angular-${optionsHash}.hash` ); const projectsCache = new PluginCache(cachePath); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => - createNodesInternal( - configFile, - options, - context, - projectsCache, - pmc, - lockFileName - ), + createNodesInternal(configFile, options, context, projectsCache, pmc), configFiles, options, context ); } finally { - projectsCache.writeToDisk(); + projectsCache.writeToDisk(cachePath); } }, ]; @@ -120,8 +113,7 @@ async function createNodesInternal( options: {} | undefined, context: CreateNodesContextV2, projectsCache: PluginCache, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ): Promise { const angularWorkspaceRoot = dirname(configFilePath); @@ -137,7 +129,7 @@ async function createNodesInternal( angularWorkspaceRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!projectsCache.has(hash)) { diff --git a/packages/cypress/package.json b/packages/cypress/package.json index 37ca6cdb..b82e1ab6 100644 --- a/packages/cypress/package.json +++ b/packages/cypress/package.json @@ -41,7 +41,7 @@ "@nx/eslint": "workspace:*", "@nx/js": "workspace:*", "@phenomnomnominal/tsquery": "catalog:typescript", - "detect-port": "^2.1.0", + "detect-port": "^1.5.1", "semver": "catalog:", "tree-kill": "1.2.2", "tslib": "catalog:typescript" diff --git a/packages/cypress/src/executors/cypress/cypress.impl.ts b/packages/cypress/src/executors/cypress/cypress.impl.ts index 13e43433..b2d9d171 100644 --- a/packages/cypress/src/executors/cypress/cypress.impl.ts +++ b/packages/cypress/src/executors/cypress/cypress.impl.ts @@ -2,7 +2,6 @@ import { ExecutorContext, logger } from '@nx/devkit'; import { existsSync, readdirSync, unlinkSync } from 'fs'; import { basename, dirname } from 'path'; import { getTempTailwindPath } from '../../utils/ct-helpers'; -import { warnCypressExecutorDeprecation } from '../../utils/deprecation'; import { startDevServer } from '../../utils/start-dev-server'; const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies. @@ -50,8 +49,6 @@ export default async function cypressExecutor( options: CypressExecutorOptions, context: ExecutorContext ) { - warnCypressExecutorDeprecation(); - options = normalizeOptions(options, context); // this is used by cypress component testing presets to build the executor contexts with the correct configuration options. process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName; diff --git a/packages/cypress/src/executors/cypress/schema.json b/packages/cypress/src/executors/cypress/schema.json index c450c038..95ac967d 100644 --- a/packages/cypress/src/executors/cypress/schema.json +++ b/packages/cypress/src/executors/cypress/schema.json @@ -5,7 +5,6 @@ "type": "object", "outputCapture": "pipe", "cli": "nx", - "x-deprecated": "The `@nx/cypress:cypress` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/cypress:convert-to-inferred` to migrate to the `@nx/cypress/plugin` inferred plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.", "presets": [ { "name": "Starting Dev Server", diff --git a/packages/cypress/src/generators/component-configuration/component-configuration.ts b/packages/cypress/src/generators/component-configuration/component-configuration.ts index 49d111e3..161ca8d9 100644 --- a/packages/cypress/src/generators/component-configuration/component-configuration.ts +++ b/packages/cypress/src/generators/component-configuration/component-configuration.ts @@ -18,7 +18,6 @@ import { } from '@nx/devkit'; import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup'; import { coerce, major } from 'semver'; -import { warnCypressExecutorScaffolding } from '../../utils/deprecation'; import { getInstalledCypressMajorVersion, versions, @@ -86,7 +85,6 @@ export async function componentConfigurationGeneratorInternal( addProjectFiles(tree, projectConfig, opts); if (!hasPlugin || opts.addExplicitTargets) { - warnCypressExecutorScaffolding(); addTargetToProject(tree, projectConfig, opts); } updateNxJsonConfiguration(tree, hasPlugin); diff --git a/packages/cypress/src/generators/configuration/configuration.ts b/packages/cypress/src/generators/configuration/configuration.ts index 5dffac8e..1489d3dc 100644 --- a/packages/cypress/src/generators/configuration/configuration.ts +++ b/packages/cypress/src/generators/configuration/configuration.ts @@ -35,7 +35,6 @@ import { PackageJson } from 'nx/src/utils/package-json'; import { join } from 'path'; import { addLinterToCyProject } from '../../utils/add-linter'; import { addDefaultE2EConfig } from '../../utils/config'; -import { warnCypressExecutorScaffolding } from '../../utils/deprecation'; import { getInstalledCypressMajorVersion, versions, @@ -105,7 +104,6 @@ export async function configurationGeneratorInternal( await addFiles(tree, opts, projectGraph, hasPlugin); if (!hasPlugin) { - warnCypressExecutorScaffolding(); addTarget(tree, opts, projectGraph); } diff --git a/packages/cypress/src/plugins/plugin.ts b/packages/cypress/src/plugins/plugin.ts index d555f665..0422b28e 100644 --- a/packages/cypress/src/plugins/plugin.ts +++ b/packages/cypress/src/plugins/plugin.ts @@ -53,26 +53,19 @@ export const createNodes: CreateNodesV2 = [ `cypress-${optionsHash}.hash` ); const pluginCache = new PluginCache(cachePath); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => - createNodesInternal( - configFile, - options, - context, - pluginCache, - pmc, - lockFileName - ), + createNodesInternal(configFile, options, context, pluginCache, pmc), configFiles, options, context ); } finally { - pluginCache.writeToDisk(); + pluginCache.writeToDisk(cachePath); } }, ]; @@ -84,8 +77,7 @@ async function createNodesInternal( options: CypressPluginOptions, context: CreateNodesContextV2, pluginCache: PluginCache, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { options = normalizeOptions(options); const projectRoot = dirname(configFilePath); @@ -101,7 +93,7 @@ async function createNodesInternal( const hash = (await calculateHashForCreateNodes(projectRoot, options, context, [ - lockFileName, + getLockFileName(detectPackageManager(context.workspaceRoot)), ])) + configFilePath; if (!pluginCache.has(hash)) { diff --git a/packages/cypress/src/utils/deprecation.ts b/packages/cypress/src/utils/deprecation.ts deleted file mode 100644 index 649b536e..00000000 --- a/packages/cypress/src/utils/deprecation.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { logger } from '@nx/devkit'; - -// TODO(v24): Remove the @nx/cypress:cypress executor. The inferred plugin -// (@nx/cypress/plugin) and the convert-to-inferred generator stay supported. -export const CYPRESS_EXECUTOR_DEPRECATION_MESSAGE = - 'The `@nx/cypress:cypress` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/cypress:convert-to-inferred` to migrate to the `@nx/cypress/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.'; - -export function warnCypressExecutorDeprecation(): void { - logger.warn(CYPRESS_EXECUTOR_DEPRECATION_MESSAGE); -} - -// Fired when the @nx/cypress:configuration or :component-configuration -// generator is about to scaffold a target that uses the deprecated executor — -// i.e. when @nx/cypress/plugin isn't registered in nx.json. Surfaces the -// deprecation at scaffold time rather than only when the user later runs the -// generated target. -export function warnCypressExecutorScaffolding(): void { - logger.warn( - 'Scaffolding a target that uses the deprecated `@nx/cypress:cypress` executor. The executor will be removed in Nx v24. Run `nx g @nx/cypress:convert-to-inferred` after this scaffold to migrate the generated target to the `@nx/cypress/plugin` inferred plugin. To skip emitting executor targets entirely on future scaffolds, register `@nx/cypress/plugin` in `nx.json` first (`nx add @nx/cypress` or a manual plugin entry). See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.' - ); -} diff --git a/packages/detox/src/plugins/plugin.ts b/packages/detox/src/plugins/plugin.ts index 11765374..5825b2d4 100644 --- a/packages/detox/src/plugins/plugin.ts +++ b/packages/detox/src/plugins/plugin.ts @@ -35,27 +35,20 @@ export const createNodes: CreateNodesV2 = [ const optionsHash = hashObject(options); const cachePath = join(workspaceDataDirectory, `detox-${optionsHash}.hash`); const targetsCache = new PluginCache(cachePath); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => - createNodesInternal( - configFile, - options, - context, - targetsCache, - pmc, - lockFileName - ), + createNodesInternal(configFile, options, context, targetsCache, pmc), configFiles, options, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -67,8 +60,7 @@ async function createNodesInternal( options: DetoxPluginOptions, context: CreateNodesContextV2, targetsCache: PluginCache, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ): Promise { options = normalizeOptions(options); const projectRoot = dirname(configFile); @@ -77,7 +69,7 @@ async function createNodesInternal( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { diff --git a/packages/devkit/migrations.json b/packages/devkit/migrations.json index 90740997..c0b5008c 100644 --- a/packages/devkit/migrations.json +++ b/packages/devkit/migrations.json @@ -1,11 +1,5 @@ { - "generators": { - "update-devkit-deep-imports": { - "version": "23.0.0-beta.6", - "description": "Rewrite imports from `@nx/devkit/src/...` to `@nx/devkit` (for public symbols) or `@nx/devkit/internal` (for the rest), since deep imports are no longer reachable through the package's `exports` map.", - "implementation": "./dist/src/migrations/update-23-0-0/update-deep-imports" - } - }, + "generators": {}, "packageJsonUpdates": {}, "version": "0.1" } diff --git a/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.md b/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.md deleted file mode 100644 index dcc72ffa..00000000 --- a/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.md +++ /dev/null @@ -1,43 +0,0 @@ -#### Update `@nx/devkit` deep imports - -`@nx/devkit` now ships a strict `exports` map, so deep imports like `@nx/devkit/src/utils/...` and `@nx/devkit/src/generators/...` are no longer reachable through Node module resolution. - -This migration scans every `.ts`, `.tsx`, `.cts`, and `.mts` file in your workspace and rewrites those deep imports to one of the supported entry points: - -- Symbols that are part of the stable `@nx/devkit` public API are routed to `@nx/devkit`. -- Symbols that were previously only reachable through deep imports are routed to `@nx/devkit/internal`. - -After rewriting, the migration **collapses duplicate imports** so a file never ends up with two `import ... from '@nx/devkit'` (or `@nx/devkit/internal`) lines — including merging into any matching import you already had. - -#### Sample Code Changes - -##### Before - -```ts -import { Tree } from '@nx/devkit'; -import { dasherize, names } from '@nx/devkit/src/utils/string-utils'; -import { addPlugin } from '@nx/devkit/src/utils/add-plugin'; -``` - -##### After - -```ts -import { Tree, names } from '@nx/devkit'; -import { dasherize, addPlugin } from '@nx/devkit/internal'; -``` - -`names` was already in the public API, so it joins the existing `@nx/devkit` import. `dasherize` and `addPlugin` move to `@nx/devkit/internal`, and the two `/internal` imports are collapsed into one. - -#### Fallback for non-named imports - -For deep-import shapes that can't be split by symbol — default imports, namespace imports, side-effect imports, `require(...)` calls, and dynamic `import(...)` — the migration rewrites the specifier to `@nx/devkit/internal` as a best guess, since most symbols that previously lived under `@nx/devkit/src/...` ended up there. - -```ts -// Before -const { dasherize } = require('@nx/devkit/src/utils/string-utils'); - -// After -const { dasherize } = require('@nx/devkit/internal'); -``` - -If the symbol you're after is part of the stable public API instead, the rewritten import will fail to resolve against `@nx/devkit/internal` — switch it to `@nx/devkit` by hand. diff --git a/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.spec.ts b/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.spec.ts deleted file mode 100644 index ca83fea0..00000000 --- a/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.spec.ts +++ /dev/null @@ -1,296 +0,0 @@ -import { type Tree } from '@nx/devkit'; -import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing'; -import migration, { - DEVKIT_INTERNAL_SYMBOLS, - rewriteDevkitDeepImports, -} from './update-deep-imports'; - -describe('update-deep-imports migration', () => { - let tree: Tree; - - beforeEach(() => { - tree = createTreeWithEmptyWorkspace(); - }); - - describe('rewriteDevkitDeepImports', () => { - it('routes a single internal symbol to @nx/devkit/internal', () => { - const input = `import { dasherize } from '@nx/devkit/src/utils/string-utils';\n`; - expect(rewriteDevkitDeepImports(input)).toBe( - `import { dasherize } from '@nx/devkit/internal';\n` - ); - }); - - it('routes a single public symbol to @nx/devkit', () => { - const input = `import { names } from '@nx/devkit/src/utils/names';\n`; - expect(rewriteDevkitDeepImports(input)).toBe( - `import { names } from '@nx/devkit';\n` - ); - }); - - it('splits mixed public and internal symbols across two declarations', () => { - const input = `import { dasherize, names } from '@nx/devkit/src/utils/string-utils';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`import { names } from '@nx/devkit';`); - expect(output).toContain( - `import { dasherize } from '@nx/devkit/internal';` - ); - }); - - it('preserves `as` aliases', () => { - const input = `import { dasherize as toKebab } from '@nx/devkit/src/utils/string-utils';\n`; - expect(rewriteDevkitDeepImports(input)).toContain( - `import { dasherize as toKebab } from '@nx/devkit/internal';` - ); - }); - - it('handles `import type` declarations', () => { - const input = `import type { FileExtensionType } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';\n`; - expect(rewriteDevkitDeepImports(input)).toContain( - `import type { FileExtensionType } from '@nx/devkit/internal';` - ); - }); - - it('preserves inline `type` modifiers on individual specifiers', () => { - const input = `import { type FileExtensionType, addPlugin } from '@nx/devkit/src/x';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain( - `import { type FileExtensionType, addPlugin } from '@nx/devkit/internal';` - ); - }); - - it('drops redundant inline `type` when the whole import is already type-only', () => { - const input = `import type { type FileExtensionType } from '@nx/devkit/src/x';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain( - `import type { FileExtensionType } from '@nx/devkit/internal';` - ); - }); - - it('handles multi-line named imports', () => { - const input = `import {\n dasherize,\n names,\n classify,\n} from '@nx/devkit/src/utils/string-utils';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`import { names } from '@nx/devkit';`); - expect(output).toContain( - `import { dasherize, classify } from '@nx/devkit/internal';` - ); - }); - - it('rewrites multiple deep imports in one file', () => { - const input = - `import { dasherize } from '@nx/devkit/src/utils/string-utils';\n` + - `import { names } from '@nx/devkit/src/utils/names';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain( - `import { dasherize } from '@nx/devkit/internal';` - ); - expect(output).toContain(`import { names } from '@nx/devkit';`); - }); - - it('falls back to /internal for side-effect imports', () => { - const input = `import '@nx/devkit/src/utils/some-side-effect';\n`; - expect(rewriteDevkitDeepImports(input)).toContain( - `import '@nx/devkit/internal';` - ); - }); - - it('falls back to /internal for default imports', () => { - const input = `import x from '@nx/devkit/src/utils/foo';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`'@nx/devkit/internal'`); - expect(output).toContain(`import x from`); - }); - - it('falls back to /internal for namespace imports', () => { - const input = `import * as devkit from '@nx/devkit/src/utils/foo';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain( - `import * as devkit from '@nx/devkit/internal';` - ); - }); - - it('falls back to /internal for require()', () => { - const input = `const x = require('@nx/devkit/src/utils/foo');\n`; - expect(rewriteDevkitDeepImports(input)).toBe( - `const x = require('@nx/devkit/internal');\n` - ); - }); - - it('falls back to /internal for dynamic import()', () => { - const input = `const x = await import('@nx/devkit/src/utils/foo');\n`; - expect(rewriteDevkitDeepImports(input)).toBe( - `const x = await import('@nx/devkit/internal');\n` - ); - }); - - it('preserves quote style on fallback paths', () => { - const input = `const x = require("@nx/devkit/src/utils/foo");\n`; - expect(rewriteDevkitDeepImports(input)).toBe( - `const x = require("@nx/devkit/internal");\n` - ); - }); - - it('does not touch unrelated @nx/devkit imports', () => { - const input = `import { Tree } from '@nx/devkit';\n`; - expect(rewriteDevkitDeepImports(input)).toBe(input); - }); - - it('does not touch unrelated @nx/devkit/internal imports', () => { - const input = `import { dasherize } from '@nx/devkit/internal';\n`; - expect(rewriteDevkitDeepImports(input)).toBe(input); - }); - }); - - describe('migration runner', () => { - it('rewrites deep imports across .ts/.tsx/.cts/.mts files', async () => { - tree.write( - 'libs/foo/src/a.ts', - `import { dasherize } from '@nx/devkit/src/utils/string-utils';\n` - ); - tree.write( - 'libs/foo/src/b.tsx', - `import { addPlugin } from '@nx/devkit/src/utils/add-plugin';\n` - ); - tree.write( - 'libs/foo/src/c.cts', - `const { classify } = require('@nx/devkit/src/utils/string-utils');\n` - ); - tree.write( - 'libs/foo/src/d.mts', - `import { camelize } from '@nx/devkit/src/utils/string-utils';\n` - ); - - await migration(tree); - - expect(tree.read('libs/foo/src/a.ts', 'utf-8')).toContain( - `'@nx/devkit/internal'` - ); - expect(tree.read('libs/foo/src/b.tsx', 'utf-8')).toContain( - `'@nx/devkit/internal'` - ); - expect(tree.read('libs/foo/src/c.cts', 'utf-8')).toContain( - `'@nx/devkit/internal'` - ); - expect(tree.read('libs/foo/src/d.mts', 'utf-8')).toContain( - `'@nx/devkit/internal'` - ); - }); - - it('does not rewrite deep-import strings inside non-TS files', async () => { - const md = `Example: \`import { x } from '@nx/devkit/src/utils/foo';\`\n`; - tree.write('docs/example.md', md); - - await migration(tree); - - // The deep-import literal must survive untouched in markdown — only TS - // sources should be rewritten. (formatFiles may normalize trailing - // whitespace, so we assert on substring rather than full equality.) - expect(tree.read('docs/example.md', 'utf-8')).toContain( - `'@nx/devkit/src/utils/foo'` - ); - }); - - it('does not touch files that do not contain the deep prefix', async () => { - const content = `import { Tree } from '@nx/devkit';\n`; - tree.write('libs/foo/src/index.ts', content); - - await migration(tree); - - expect(tree.read('libs/foo/src/index.ts', 'utf-8')).toBe(content); - }); - }); - - describe('collapse', () => { - it('merges a rewritten import into a pre-existing @nx/devkit import', () => { - const input = - `import { Tree } from '@nx/devkit';\n` + - `import { names } from '@nx/devkit/src/utils/names';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`import { Tree, names } from '@nx/devkit';`); - expect(output).not.toMatch( - /import \{[^}]*\} from '@nx\/devkit';[\s\S]*import \{[^}]*\} from '@nx\/devkit';/ - ); - }); - - it('merges a rewritten import into a pre-existing @nx/devkit/internal import', () => { - const input = - `import { dasherize } from '@nx/devkit/internal';\n` + - `import { classify } from '@nx/devkit/src/utils/string-utils';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain( - `import { dasherize, classify } from '@nx/devkit/internal';` - ); - }); - - it('merges multiple rewritten imports that target the same specifier', () => { - const input = - `import { dasherize } from '@nx/devkit/src/utils/string-utils';\n` + - `import { classify } from '@nx/devkit/src/utils/string-utils';\n` + - `import { camelize } from '@nx/devkit/src/utils/string-utils';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain( - `import { dasherize, classify, camelize } from '@nx/devkit/internal';` - ); - // Only one /internal declaration in the output. - expect((output.match(/from '@nx\/devkit\/internal'/g) ?? []).length).toBe( - 1 - ); - }); - - it('keeps public and internal collapses independent', () => { - const input = - `import { Tree } from '@nx/devkit';\n` + - `import { dasherize, names } from '@nx/devkit/src/utils/string-utils';\n` + - `import { classify } from '@nx/devkit/src/utils/string-utils';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`import { Tree, names } from '@nx/devkit';`); - expect(output).toContain( - `import { dasherize, classify } from '@nx/devkit/internal';` - ); - }); - - it('does not merge value imports with type-only imports', () => { - const input = - `import type { Tree } from '@nx/devkit';\n` + - `import { names } from '@nx/devkit/src/utils/names';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`import type { Tree } from '@nx/devkit';`); - expect(output).toContain(`import { names } from '@nx/devkit';`); - }); - - it('merges duplicate specifiers without repeating them', () => { - const input = - `import { Tree } from '@nx/devkit';\n` + - `import { Tree, names } from '@nx/devkit';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`import { Tree, names } from '@nx/devkit';`); - expect((output.match(/Tree/g) ?? []).length).toBe(1); - }); - - it('does not touch a file that already has a single canonical import', () => { - const input = `import { Tree, names } from '@nx/devkit';\n`; - expect(rewriteDevkitDeepImports(input)).toBe(input); - }); - - it('leaves unrelated imports between merged declarations alone', () => { - const input = - `import { Tree } from '@nx/devkit';\n` + - `import { readFileSync } from 'node:fs';\n` + - `import { names } from '@nx/devkit/src/utils/names';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain(`import { Tree, names } from '@nx/devkit';`); - expect(output).toContain(`import { readFileSync } from 'node:fs';`); - }); - }); - - describe('symbol set sanity', () => { - it('treats every name in DEVKIT_INTERNAL_SYMBOLS as internal', () => { - for (const name of DEVKIT_INTERNAL_SYMBOLS) { - const input = `import { ${name} } from '@nx/devkit/src/x';\n`; - const output = rewriteDevkitDeepImports(input); - expect(output).toContain( - `import { ${name} } from '@nx/devkit/internal';` - ); - } - }); - }); -}); diff --git a/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.ts b/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.ts deleted file mode 100644 index 1bfc96e7..00000000 --- a/packages/devkit/src/migrations/update-23-0-0/update-deep-imports.ts +++ /dev/null @@ -1,343 +0,0 @@ -import { logger, type Tree } from 'nx/src/devkit-exports'; -import type { - ImportDeclaration, - ImportSpecifier, - NamedImports, - SourceFile, -} from 'typescript'; -import { formatFiles } from '../../generators/format-files'; -import { visitNotIgnoredFiles } from '../../generators/visit-not-ignored-files'; -import { ensurePackage } from '../../utils/package-json'; -import { - applyChangesToString, - ChangeType, - type StringChange, -} from '../../utils/string-change'; -import { typescriptVersion } from '../../utils/versions'; - -const TS_EXTENSIONS = ['.ts', '.tsx', '.cts', '.mts'] as const; -const DEEP_IMPORT_PREFIX = '@nx/devkit/src/'; -const PUBLIC_SPECIFIER = '@nx/devkit'; -const INTERNAL_SPECIFIER = '@nx/devkit/internal'; - -// Names re-exported from `@nx/devkit/internal` (see packages/devkit/internal.ts -// at the time this migration was authored). Anything imported from a -// `@nx/devkit/src/...` path whose name is NOT in this set is assumed to be -// part of the stable public `@nx/devkit` API. -export const DEVKIT_INTERNAL_SYMBOLS: ReadonlySet = new Set([ - 'signalToCode', - 'createProjectRootMappingsFromProjectConfigurations', - 'PluginCache', - 'safeWriteFileCache', - 'determineArtifactNameAndDirectoryOptions', - 'getRelativeCwd', - 'FileExtensionType', - 'getE2EWebServerInfo', - 'E2EWebServerDetails', - 'forEachExecutorOptions', - 'AggregatedLog', - 'migrateProjectExecutorsToPlugin', - 'migrateProjectExecutorsToPluginV1', - 'NoTargetsToMigrateError', - 'InferredTargetConfiguration', - 'processTargetOutputs', - 'deleteMatchingProperties', - 'toProjectRelativePath', - 'determineProjectNameAndRootOptions', - 'ensureRootProjectName', - 'resolveImportPath', - 'promptWhenInteractive', - 'addBuildTargetDefaults', - 'addE2eCiTargetDefaults', - 'addPlugin', - 'createAsyncIterable', - 'combineAsyncIterables', - 'mapAsyncIterable', - 'calculateHashForCreateNodes', - 'calculateHashesForCreateNodes', - 'getCatalogManager', - 'loadConfigFile', - 'clearRequireCache', - 'findPluginForConfigFile', - 'getNamedInputs', - 'logShowProjectCommand', - 'eachValueFrom', - 'checkAndCleanWithSemver', - 'camelize', - 'capitalize', - 'classify', - 'dasherize', -]); - -const FALLBACK_RE = /(['"])@nx\/devkit\/src\/[^'"\n]+?\1/g; - -let ts: typeof import('typescript') | undefined; - -export default async function updateDevkitDeepImports( - tree: Tree -): Promise { - let touchedCount = 0; - - visitNotIgnoredFiles(tree, '.', (filePath) => { - if (!TS_EXTENSIONS.some((ext) => filePath.endsWith(ext))) { - return; - } - const original = tree.read(filePath, 'utf-8'); - if (!original || !original.includes(DEEP_IMPORT_PREFIX)) { - return; - } - const updated = rewriteDevkitDeepImports(original); - if (updated !== original) { - tree.write(filePath, updated); - touchedCount += 1; - } - }); - - if (touchedCount > 0) { - logger.info(`Rewrote @nx/devkit deep imports in ${touchedCount} file(s).`); - } - - await formatFiles(tree); -} - -export function rewriteDevkitDeepImports(source: string): string { - ts ??= ensurePackage( - 'typescript', - typescriptVersion - ); - const sourceFile = ts.createSourceFile( - 'tmp.ts', - source, - ts.ScriptTarget.Latest, - /* setParentNodes */ true, - ts.ScriptKind.TSX - ); - - const changes: StringChange[] = []; - for (const stmt of sourceFile.statements) { - if (!ts.isImportDeclaration(stmt)) continue; - if (!ts.isStringLiteral(stmt.moduleSpecifier)) continue; - if (!stmt.moduleSpecifier.text.startsWith(DEEP_IMPORT_PREFIX)) continue; - - const replacement = buildReplacement(stmt, sourceFile); - changes.push( - { - type: ChangeType.Delete, - start: stmt.getStart(sourceFile), - length: stmt.getEnd() - stmt.getStart(sourceFile), - }, - { - type: ChangeType.Insert, - index: stmt.getStart(sourceFile), - text: replacement, - } - ); - } - - let updated = - changes.length > 0 ? applyChangesToString(source, changes) : source; - - // Fallback: any remaining `@nx/devkit/src/...` specifiers (default imports, - // namespace imports, side-effect imports, dynamic `import(...)`, `require(...)` - // calls, etc.) get rewritten to `/internal`. We can't bucket by symbol for - // those forms, so `/internal` is the safe default since it re-exports every - // symbol that was deep-importable. - updated = updated.replace( - FALLBACK_RE, - (_match, quote: string) => `${quote}${INTERNAL_SPECIFIER}${quote}` - ); - - // Final pass: collapse any duplicate `@nx/devkit` and `@nx/devkit/internal` - // named-only imports into a single declaration. This handles both the - // imports we just emitted AND any that the user already had, so we never - // leave the file with two `from '@nx/devkit'` lines. - updated = collapseDevkitImports(updated); - - return updated; -} - -function collapseDevkitImports(source: string): string { - const sourceFile = ts!.createSourceFile( - 'tmp.ts', - source, - ts!.ScriptTarget.Latest, - /* setParentNodes */ true, - ts!.ScriptKind.TSX - ); - - // Group eligible declarations by (specifier, isTypeOnly). - type Group = { - decls: ImportDeclaration[]; - specifier: string; - typeOnly: boolean; - }; - const groups = new Map(); - - for (const stmt of sourceFile.statements) { - if (!ts!.isImportDeclaration(stmt)) continue; - if (!ts!.isStringLiteral(stmt.moduleSpecifier)) continue; - const specifier = stmt.moduleSpecifier.text; - if (specifier !== PUBLIC_SPECIFIER && specifier !== INTERNAL_SPECIFIER) { - continue; - } - const importClause = stmt.importClause; - if (!importClause) continue; // skip side-effect imports - if (importClause.name) continue; // skip default imports - const namedBindings = importClause.namedBindings; - if (!namedBindings || !ts!.isNamedImports(namedBindings)) continue; - - const typeOnly = !!importClause.isTypeOnly; - const key = `${specifier}\x00${typeOnly ? 'type' : 'value'}`; - if (!groups.has(key)) { - groups.set(key, { decls: [], specifier, typeOnly }); - } - groups.get(key)!.decls.push(stmt); - } - - const changes: StringChange[] = []; - for (const { decls, specifier, typeOnly } of groups.values()) { - if (decls.length < 2) continue; - - const seen = new Set(); - const merged: string[] = []; - for (const decl of decls) { - const named = decl.importClause!.namedBindings as NamedImports; - for (const el of named.elements) { - const text = renderSpecifierFromNode(el, typeOnly); - if (!seen.has(text)) { - seen.add(text); - merged.push(text); - } - } - } - - // Replace the first declaration with the merged one in place. - const first = decls[0]; - changes.push( - { - type: ChangeType.Delete, - start: first.getStart(sourceFile), - length: first.getEnd() - first.getStart(sourceFile), - }, - { - type: ChangeType.Insert, - index: first.getStart(sourceFile), - text: renderImport(merged, specifier, typeOnly), - } - ); - - // Delete every other declaration in this group (and consume one trailing - // newline so we don't leave behind a blank line that prettier has to clean - // up later). - for (let i = 1; i < decls.length; i++) { - const decl = decls[i]; - const start = decl.getStart(sourceFile); - let end = decl.getEnd(); - if (source[end] === '\n') { - end += 1; - } else if (source[end] === '\r' && source[end + 1] === '\n') { - end += 2; - } - changes.push({ - type: ChangeType.Delete, - start, - length: end - start, - }); - } - } - - return changes.length > 0 ? applyChangesToString(source, changes) : source; -} - -function renderSpecifierFromNode( - el: ImportSpecifier, - parentIsTypeOnly: boolean -): string { - const aliasText = el.propertyName ? ` as ${el.name.text}` : ''; - const typePrefix = !parentIsTypeOnly && el.isTypeOnly ? 'type ' : ''; - return `${typePrefix}${(el.propertyName ?? el.name).text}${aliasText}`; -} - -function buildReplacement( - decl: ImportDeclaration, - sourceFile: SourceFile -): string { - const importClause = decl.importClause; - - // `import '@nx/devkit/src/...';` (side-effect) — no clause to bucket. - if (!importClause) { - return `import '${INTERNAL_SPECIFIER}';`; - } - - const namedBindings = importClause.namedBindings; - const isNamedImport = - namedBindings && ts!.isNamedImports(namedBindings) && !importClause.name; - - // Default / namespace / mixed-default-and-named — can't bucket reliably. - // Preserve the import shape, swap the specifier. - if (!isNamedImport) { - const before = source(decl, sourceFile).slice( - 0, - decl.moduleSpecifier.getStart(sourceFile) - decl.getStart(sourceFile) - ); - const after = source(decl, sourceFile).slice( - decl.moduleSpecifier.getEnd() - decl.getStart(sourceFile) - ); - return `${before}'${INTERNAL_SPECIFIER}'${after}`; - } - - const isTypeOnlyImport = importClause.isTypeOnly; - const elements = (namedBindings as NamedImports).elements; - - const publik: string[] = []; - const internal: string[] = []; - for (const el of elements) { - bucketSpecifier(el, isTypeOnlyImport, publik, internal); - } - - const lines: string[] = []; - if (publik.length > 0) { - lines.push(renderImport(publik, PUBLIC_SPECIFIER, isTypeOnlyImport)); - } - if (internal.length > 0) { - lines.push(renderImport(internal, INTERNAL_SPECIFIER, isTypeOnlyImport)); - } - if (lines.length === 0) { - // Defensive: empty `import {} from '...'` — point at /internal. - lines.push(`import {} from '${INTERNAL_SPECIFIER}';`); - } - return lines.join('\n'); -} - -function bucketSpecifier( - el: ImportSpecifier, - parentIsTypeOnly: boolean, - publik: string[], - internal: string[] -): void { - const lookupName = (el.propertyName ?? el.name).text; - const elementIsTypeOnly = el.isTypeOnly; - const aliasText = el.propertyName ? ` as ${el.name.text}` : ''; - // Inline `type` is illegal when the parent import is already `import type`. - const typePrefix = !parentIsTypeOnly && elementIsTypeOnly ? 'type ' : ''; - const text = `${typePrefix}${(el.propertyName ?? el.name).text}${aliasText}`; - - if (DEVKIT_INTERNAL_SYMBOLS.has(lookupName)) { - internal.push(text); - } else { - publik.push(text); - } -} - -function renderImport( - specifiers: string[], - from: string, - typeOnly: boolean -): string { - const prefix = typeOnly ? 'import type' : 'import'; - return `${prefix} { ${specifiers.join(', ')} } from '${from}';`; -} - -function source(decl: ImportDeclaration, sourceFile: SourceFile): string { - return sourceFile.text.slice(decl.getStart(sourceFile), decl.getEnd()); -} diff --git a/packages/docker/src/plugins/plugin.ts b/packages/docker/src/plugins/plugin.ts index b82484b7..5eda29eb 100644 --- a/packages/docker/src/plugins/plugin.ts +++ b/packages/docker/src/plugins/plugin.ts @@ -88,7 +88,7 @@ export const createNodesV2: CreateNodesV2 = [ context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; diff --git a/packages/dotnet/src/analyzer/analyzer-client.ts b/packages/dotnet/src/analyzer/analyzer-client.ts index 18628281..78687195 100644 --- a/packages/dotnet/src/analyzer/analyzer-client.ts +++ b/packages/dotnet/src/analyzer/analyzer-client.ts @@ -22,6 +22,31 @@ export interface AnalysisErrorResult { } export type AnalysisResult = AnalysisSuccessResult | AnalysisErrorResult; +const analyzerCaches = new Map>(); + +function getCachePathForOptionsHash(optionsHash: string): string { + return join(workspaceDataDirectory, `dotnet-${optionsHash}.hash`); +} + +function readAnalyzerCache( + optionsHash: string +): PluginCache { + if (analyzerCaches.has(optionsHash)) { + return analyzerCaches.get(optionsHash)!; + } + const cacheFilePath = getCachePathForOptionsHash(optionsHash); + return new PluginCache(cacheFilePath); +} + +function writeAnalyzerCache( + optionsHash: string, + cache: PluginCache +): void { + analyzerCaches.set(optionsHash, cache); + const cacheFilePath = getCachePathForOptionsHash(optionsHash); + cache.writeToDisk(cacheFilePath); +} + /** * Options passed to the MSBuild analyzer. * These are the target names that the analyzer will use to generate targets. @@ -201,9 +226,7 @@ export async function analyzeProjects( } const optionsHash = hashObject(options); - const analyzerCache = new PluginCache( - join(workspaceDataDirectory, `dotnet-${optionsHash}.hash`) - ); + const analyzerCache = readAnalyzerCache(optionsHash); const cachedResult = analyzerCache.get(filesHash); if (cachedResult) { // Update cache @@ -225,7 +248,7 @@ export async function analyzeProjects( }; // Update persistent cache analyzerCache.set(filesHash, result); - analyzerCache.writeToDisk(); + writeAnalyzerCache(optionsHash, analyzerCache); return result; } catch (error) { diff --git a/packages/dotnet/src/utils/cache.ts b/packages/dotnet/src/utils/cache.ts new file mode 100644 index 00000000..d7fa4ded --- /dev/null +++ b/packages/dotnet/src/utils/cache.ts @@ -0,0 +1,19 @@ +import { ProjectConfiguration, readJsonFile, writeJsonFile } from '@nx/devkit'; +import { existsSync } from 'fs'; + +export type DotNetTargets = Pick; + +export function readTargetsCache( + cachePath: string +): Record { + return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && existsSync(cachePath) + ? readJsonFile(cachePath) + : {}; +} + +export function writeTargetsToCache( + cachePath: string, + results: Record +) { + writeJsonFile(cachePath, results); +} diff --git a/packages/eslint/src/plugins/plugin.ts b/packages/eslint/src/plugins/plugin.ts index 76217662..1812f4d9 100644 --- a/packages/eslint/src/plugins/plugin.ts +++ b/packages/eslint/src/plugins/plugin.ts @@ -224,7 +224,7 @@ export const createNodes: CreateNodesV2 = [ context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; diff --git a/packages/expo/plugins/plugin.ts b/packages/expo/plugins/plugin.ts index f144ea00..be078a13 100644 --- a/packages/expo/plugins/plugin.ts +++ b/packages/expo/plugins/plugin.ts @@ -44,27 +44,20 @@ export const createNodes: CreateNodesV2 = [ const optionsHash = hashObject(options); const cachePath = join(workspaceDataDirectory, `expo-${optionsHash}.hash`); const targetsCache = new PluginCache(cachePath); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => - createNodesInternal( - configFile, - options, - context, - targetsCache, - pmc, - lockFileName - ), + createNodesInternal(configFile, options, context, targetsCache, pmc), configFiles, options, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -76,8 +69,7 @@ async function createNodesInternal( options: ExpoPluginOptions, context: CreateNodesContextV2, targetsCache: PluginCache, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ): Promise { options = normalizeOptions(options); const projectRoot = dirname(configFile); @@ -108,7 +100,7 @@ async function createNodesInternal( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { diff --git a/packages/gradle/src/plugin-v1/nodes.ts b/packages/gradle/src/plugin-v1/nodes.ts index 573403bc..8a26fe3f 100644 --- a/packages/gradle/src/plugin-v1/nodes.ts +++ b/packages/gradle/src/plugin-v1/nodes.ts @@ -92,7 +92,7 @@ export const createNodesV2: CreateNodesV2 = [ context ); } finally { - pluginCache.writeToDisk(); + pluginCache.writeToDisk(cachePath); } }, ]; @@ -100,7 +100,7 @@ export const createNodesV2: CreateNodesV2 = [ export const makeCreateNodesForGradleConfigFile = ( gradleReport: GradleReport, - pluginCache: PluginCache>, + pluginCache: PluginCache> = new PluginCache(), gradleProjectRootToTestFilesMap: Record = {} ) => async ( diff --git a/packages/gradle/src/plugin/nodes.ts b/packages/gradle/src/plugin/nodes.ts index acd304cd..4ac3c180 100644 --- a/packages/gradle/src/plugin/nodes.ts +++ b/packages/gradle/src/plugin/nodes.ts @@ -192,7 +192,7 @@ export const createNodesV2: CreateNodesV2 = [ return results; } finally { - pluginCache.writeToDisk(); + pluginCache.writeToDisk(cachePath); } }, ]; diff --git a/packages/jest/src/plugins/plugin.ts b/packages/jest/src/plugins/plugin.ts index 18928699..87d7036e 100644 --- a/packages/jest/src/plugins/plugin.ts +++ b/packages/jest/src/plugins/plugin.ts @@ -222,7 +222,7 @@ export const createNodes: CreateNodesV2 = [ context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; diff --git a/packages/js/package.json b/packages/js/package.json index d3a7cd7c..27889056 100644 --- a/packages/js/package.json +++ b/packages/js/package.json @@ -48,7 +48,7 @@ "babel-plugin-transform-typescript-metadata": "^0.3.1", "chalk": "catalog:", "columnify": "^1.6.0", - "detect-port": "^2.1.0", + "detect-port": "^1.5.1", "ignore": "^7.0.5", "js-tokens": "^4.0.0", "jsonc-parser": "3.2.0", diff --git a/packages/js/src/plugins/typescript/plugin.ts b/packages/js/src/plugins/typescript/plugin.ts index 57d448b0..98f3eb26 100644 --- a/packages/js/src/plugins/typescript/plugin.ts +++ b/packages/js/src/plugins/typescript/plugin.ts @@ -268,9 +268,9 @@ export const createNodesV2: CreateNodesV2 = [ initializeTsConfigCache(configFilePaths, context.workspaceRoot, cache); const normalizedOptions = normalizePluginOptions(options); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); const { configFilePaths: validConfigFilePaths, @@ -281,8 +281,7 @@ export const createNodesV2: CreateNodesV2 = [ normalizedOptions, optionsHash, context, - cache, - lockFileName + cache ); try { @@ -345,15 +344,19 @@ async function resolveValidConfigFilesAndHashes( options: NormalizedPluginOptions, optionsHash: string, context: CreateNodesContextV2, - cache: InvocationCache, - lockFileName: string + cache: InvocationCache ): Promise<{ configFilePaths: string[]; hashes: string[]; projectRoots: string[]; }> { const lockFileHash = - hashFile(join(context.workspaceRoot, lockFileName)) ?? ''; + hashFile( + join( + context.workspaceRoot, + getLockFileName(detectPackageManager(context.workspaceRoot)) + ) + ) ?? ''; const validConfigFilePaths: string[] = []; const hashes: string[] = []; diff --git a/packages/maven/batch-runner-adapters/maven4/src/main/kotlin/dev/nx/maven/adapter/maven4/Maven4AdapterInvoker.kt b/packages/maven/batch-runner-adapters/maven4/src/main/kotlin/dev/nx/maven/adapter/maven4/Maven4AdapterInvoker.kt index 14239a90..27ee4096 100644 --- a/packages/maven/batch-runner-adapters/maven4/src/main/kotlin/dev/nx/maven/adapter/maven4/Maven4AdapterInvoker.kt +++ b/packages/maven/batch-runner-adapters/maven4/src/main/kotlin/dev/nx/maven/adapter/maven4/Maven4AdapterInvoker.kt @@ -105,7 +105,6 @@ class Maven4AdapterInvoker( } } - @Synchronized override fun recordBuildStates(projectSelectors: Set) { val nxMaven = invoker.getNxMaven() if (nxMaven == null) { diff --git a/packages/maven/src/plugins/maven-data-cache.ts b/packages/maven/src/plugins/maven-data-cache.ts index 75df4037..655a89c4 100644 --- a/packages/maven/src/plugins/maven-data-cache.ts +++ b/packages/maven/src/plugins/maven-data-cache.ts @@ -18,7 +18,7 @@ export function writeMavenCache( cachePath: string, cache: PluginCache ): void { - cache.writeToDisk(); + cache.writeToDisk(cachePath); } /** diff --git a/packages/next/src/plugins/plugin.ts b/packages/next/src/plugins/plugin.ts index 23fd6e53..d74ebed0 100644 --- a/packages/next/src/plugins/plugin.ts +++ b/packages/next/src/plugins/plugin.ts @@ -52,9 +52,9 @@ export const createNodes: CreateNodesV2 = [ const cachePath = join(workspaceDataDirectory, `next-${optionsHash}.json`); const targetsCache = new PluginCache(cachePath); const isTsSolutionSetup = isUsingTsSolutionSetup(); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( @@ -65,15 +65,14 @@ export const createNodes: CreateNodesV2 = [ context, targetsCache, isTsSolutionSetup, - pmc, - lockFileName + pmc ), configFiles, options, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -86,8 +85,7 @@ async function createNodesInternal( context: CreateNodesContextV2, targetsCache: PluginCache, isTsSolutionSetup: boolean, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { const projectRoot = dirname(configFilePath); @@ -105,7 +103,7 @@ async function createNodesInternal( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { diff --git a/packages/nuxt/src/plugins/plugin.ts b/packages/nuxt/src/plugins/plugin.ts index 00a65516..484f95f5 100644 --- a/packages/nuxt/src/plugins/plugin.ts +++ b/packages/nuxt/src/plugins/plugin.ts @@ -41,17 +41,13 @@ export const createNodes: CreateNodesV2 = [ '**/nuxt.config.{js,ts,mjs,mts,cjs,cts}', async (files, options, context) => { //TODO(@nrwl/nx-vue-reviewers): This should batch hashing like our other plugins. - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); const result = await createNodesFromFiles( - (configFile, opts, ctx) => - createNodesInternal(configFile, opts, ctx, pmc, lockFileName), + createNodesInternal, files, options, context ); - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); return result; }, ]; @@ -61,9 +57,7 @@ export const createNodesV2 = createNodes; async function createNodesInternal( configFilePath: string, options: NuxtPluginOptions, - context: CreateNodesContextV2, - pmc: ReturnType, - lockFileName: string + context: CreateNodesContextV2 ) { const projectRoot = dirname(configFilePath); // Do not create a project if package.json and project.json isn't there. @@ -77,11 +71,15 @@ async function createNodesInternal( options = normalizeOptions(options); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); + const hash = await calculateHashForCreateNodes( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { targetsCache.set( diff --git a/packages/nx/Cargo.toml b/packages/nx/Cargo.toml index 5f07b58f..f406cd84 100644 --- a/packages/nx/Cargo.toml +++ b/packages/nx/Cargo.toml @@ -42,7 +42,6 @@ napi = { version = "3.8.3", default-features = false, features = [ "tokio_rt", "async", "chrono_date", - "serde-json", ] } napi-derive = '3.5.2' nom = '7.1.3' @@ -62,13 +61,13 @@ tracing = { version = "0.1.37", features = ["log"] } tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } tokio-util = "0.7.9" tracing-appender = "0.2" -tui-logger = { version = "0.18.2", features = ["tracing-support"] } +tui-logger = { version = "0.17.2", features = ["tracing-support"] } urlencoding = "2.1" uuid = { version = "1.0", features = ["v4"] } -tui-term = { version = "0.3.4", default-features = false } +tui-term = { git = "https://github.com/JamesHenry/tui-term", rev = "88e3b61425c97220c528ef76c188df10032a75dd" } walkdir = '2.3.3' xxhash-rust = { version = '0.8.5', features = ['xxh3', 'xxh64'] } -vt100-ctt = { git = "https://github.com/JamesHenry/vt100-rust", rev = "b15dc3b0f7db94167a9c584f1d403899c0cc871d", default-features = false } +vt100-ctt = { git = "https://github.com/JamesHenry/vt100-rust", rev = "b15dc3b0f7db94167a9c584f1d403899c0cc871d" } serde = "=1.0.219" serde_json = "1.0.140" static_assertions = "1.1" @@ -94,7 +93,7 @@ arboard = { version = "3.4.1", features = ["wayland-data-control"] } crossterm = { version = "0.29.0", features = ["event-stream", "use-dev-tty"] } portable-pty = { git = "https://github.com/cammisuli/wezterm", rev = "b538ee29e1e89eeb4832fb35ae095564dce34c29" } fs4 = "0.12.0" -ratatui = { version = "0.30" } +ratatui = { version = "0.29" } reqwest = { version = "0.12.22", default-features = false, features = [ "rustls-tls-native-roots", ] } diff --git a/packages/nx/plugins/package-json.ts b/packages/nx/plugins/package-json.ts index 7ad81198..c8d0fd89 100644 --- a/packages/nx/plugins/package-json.ts +++ b/packages/nx/plugins/package-json.ts @@ -10,10 +10,6 @@ import { join } from 'path'; import { ProjectConfiguration } from '../src/config/workspace-json-project-json'; import { readJsonFile } from '../src/utils/fileutils'; import { PluginCache } from '../src/utils/plugin-cache-utils'; -import { - detectPackageManager, - getPackageManagerCommand, -} from '../src/utils/package-manager'; export type PackageJsonConfigurationCache = PluginCache; @@ -28,7 +24,7 @@ export function readPackageJsonConfigurationCache(): PackageJsonConfigurationCac function writeCache() { if (packageJsonPluginCache) { - packageJsonPluginCache.writeToDisk(); + packageJsonPluginCache.writeToDisk(cachePath); } } @@ -45,19 +41,13 @@ const plugin: NxPluginV2 = { const isInPackageJsonWorkspaces = buildPackageJsonWorkspacesMatcher(patterns); - const packageManagerCommand = getPackageManagerCommand( - detectPackageManager(context.workspaceRoot), - context.workspaceRoot - ); - const result = createNodesFromFiles( (packageJsonPath) => createNodeFromPackageJson( packageJsonPath, workspaceRoot, cache, - isInPackageJsonWorkspaces(packageJsonPath), - packageManagerCommand + isInPackageJsonWorkspaces(packageJsonPath) ), configFiles, options, diff --git a/packages/nx/src/config/task-graph.ts b/packages/nx/src/config/task-graph.ts index edc108c7..e65f7d3f 100644 --- a/packages/nx/src/config/task-graph.ts +++ b/packages/nx/src/config/task-graph.ts @@ -1,6 +1,109 @@ /** - * `Task` and `TaskGraph` are defined as Rust structs in - * `packages/nx/src/native/tasks/types.rs` and exposed to TypeScript via NAPI. - * This file re-exports them so existing imports keep working. + * A representation of the invocation of an Executor */ -export type { Task, TaskGraph, TaskTarget, TaskHashDetails } from '../native'; +export interface Task { + /** + * Unique ID + */ + id: string; + /** + * Details about which project, target, and configuration to run. + */ + target: { + /** + * The project for which the task belongs to + */ + project: string; + /** + * The target name which the task should invoke + */ + target: string; + /** + * The configuration of the target which the task invokes + */ + configuration?: string; + }; + /** + * Overrides for the configured options of the target + */ + overrides: any; + + /** + * The outputs the task may produce + */ + outputs: string[]; + /** + * Root of the project the task belongs to + */ + projectRoot?: string; + /** + * Hash of the task which is used for caching. + */ + hash?: string; + /** + * Details about the composition of the hash + */ + hashDetails?: { + /** + * Command of the task + */ + command: string; + /** + * Hashes of inputs used in the hash + */ + nodes: { [name: string]: string }; + /** + * Hashes of implicit dependencies which are included in the hash + */ + implicitDeps?: { [fileName: string]: string }; + /** + * Hash of the runtime environment which the task was executed + */ + runtime?: { [input: string]: string }; + }; + /** + * + * Unix timestamp of when a Batch Task starts + **/ + startTime?: number; + /** + * + * Unix timestamp of when a Batch Task ends + **/ + endTime?: number; + + /** + * Determines if a given task should be cacheable. + */ + cache?: boolean; + + /** + * Determines if a given task should be parallelizable. + */ + parallelism: boolean; + + /** + * This denotes if the task runs continuously + */ + continuous?: boolean; +} + +/** + * Graph of Tasks to be executed + */ +export interface TaskGraph { + /** + * IDs of Tasks which do not have any dependencies and are thus ready to execute immediately + */ + roots: string[]; + /** + * Map of Task IDs to Tasks + */ + tasks: Record; + /** + * Map of Task IDs to IDs of tasks which the task depends on + */ + dependencies: Record; + + continuousDependencies: Record; +} diff --git a/packages/nx/src/hasher/hash-plan-inspector.ts b/packages/nx/src/hasher/hash-plan-inspector.ts index 511e4317..f711a737 100644 --- a/packages/nx/src/hasher/hash-plan-inspector.ts +++ b/packages/nx/src/hasher/hash-plan-inspector.ts @@ -61,7 +61,7 @@ export class HashPlanInspector { projectNames: string[], targets: string[], configuration?: string, - overrides: Record = {}, + overrides: Object = {}, extraTargetDependencies: TargetDependencies = {}, excludeTaskDependencies: boolean = false ) { diff --git a/packages/nx/src/native/index.d.ts b/packages/nx/src/native/index.d.ts index 69bc6f82..f20502ce 100644 --- a/packages/nx/src/native/index.d.ts +++ b/packages/nx/src/native/index.d.ts @@ -581,66 +581,26 @@ export interface Target { parallelism?: boolean } -/** A representation of the invocation of an Executor */ export interface Task { - /** Unique ID */ id: string - /** Details about which project, target, and configuration to run. */ target: TaskTarget - /** Overrides for the configured options of the target */ - overrides: Record - /** The outputs the task may produce */ outputs: Array - /** Root of the project the task belongs to */ projectRoot?: string - /** Hash of the task which is used for caching. */ - hash?: string - /** Details about the composition of the hash */ - hashDetails?: TaskHashDetails - /** Unix timestamp of when a Batch Task starts */ startTime?: number - /** Unix timestamp of when a Batch Task ends */ endTime?: number - /** Determines if a given task should be cacheable. */ - cache?: boolean - /** Determines if a given task should be parallelizable. */ - parallelism?: boolean - /** This denotes if the task runs continuously */ continuous?: boolean } -/** Graph of Tasks to be executed */ export interface TaskGraph { - /** IDs of Tasks which do not have any dependencies and are thus ready to execute immediately */ roots: Array - /** Map of Task IDs to Tasks */ tasks: Record - /** Map of Task IDs to IDs of tasks which the task depends on */ dependencies: Record> continuousDependencies: Record> } -/** Details about the composition of a task's hash */ -export interface TaskHashDetails { - /** Command of the task */ - command: string - /** Hashes of inputs used in the hash */ - nodes: Record - /** Hashes of implicit dependencies which are included in the hash */ - implicitDeps?: Record - /** Hash of the runtime environment which the task was executed */ - runtime?: Record -} - -/** - * The result of a completed Task. - * - * Task timing information (start and end timestamps) is available - * on the Task object itself via `Task.startTime` and `Task.endTime`. - */ export interface TaskResult { task: Task - status: 'success' | 'failure' | 'skipped' | 'stopped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache' + status: string code: number terminalOutput?: string } @@ -667,11 +627,8 @@ export declare const enum TaskStatus { } export interface TaskTarget { - /** The project for which the task belongs to */ project: string - /** The target name which the task should invoke */ target: string - /** The configuration of the target which the task invokes */ configuration?: string } diff --git a/packages/nx/src/native/tasks/dep_outputs.rs b/packages/nx/src/native/tasks/dep_outputs.rs index 8f256504..71b9f0fb 100644 --- a/packages/nx/src/native/tasks/dep_outputs.rs +++ b/packages/nx/src/native/tasks/dep_outputs.rs @@ -120,23 +120,33 @@ mod tests { use super::*; use std::collections::HashMap; - pub(super) fn create_test_task(project: &str, outputs: Vec) -> Task { - Task::new(project, "build") - .with_outputs(outputs) - .with_project_root("test") + pub(super) fn create_test_task(id: &str, outputs: Vec) -> Task { + Task { + id: id.to_string(), + target: crate::native::tasks::types::TaskTarget { + project: "test".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs, + project_root: Some("test".to_string()), + start_time: None, + end_time: None, + continuous: None, + } } #[test] fn test_collect_direct_dependencies() { let mut tasks = HashMap::new(); - tasks.insert("task1:build".to_string(), create_test_task("task1", vec![])); - tasks.insert("task2:build".to_string(), create_test_task("task2", vec![])); - tasks.insert("task3:build".to_string(), create_test_task("task3", vec![])); + tasks.insert("task1".to_string(), create_test_task("task1", vec![])); + tasks.insert("task2".to_string(), create_test_task("task2", vec![])); + tasks.insert("task3".to_string(), create_test_task("task3", vec![])); let mut dependencies = HashMap::new(); dependencies.insert( - "task1:build".to_string(), - vec!["task2:build".to_string(), "task3:build".to_string()], + "task1".to_string(), + vec!["task2".to_string(), "task3".to_string()], ); let task_graph = TaskGraph { @@ -146,24 +156,24 @@ mod tests { continuous_dependencies: HashMap::new(), }; - let result = collect_task_dependencies(&task_graph, "task1:build", false); + let result = collect_task_dependencies(&task_graph, "task1", false); assert_eq!(result.len(), 2); let ids: Vec<&str> = result.iter().map(|t| t.id.as_str()).collect(); - assert!(ids.contains(&"task2:build")); - assert!(ids.contains(&"task3:build")); + assert!(ids.contains(&"task2")); + assert!(ids.contains(&"task3")); } #[test] fn test_collect_transitive_dependencies() { let mut tasks = HashMap::new(); - tasks.insert("task1:build".to_string(), create_test_task("task1", vec![])); - tasks.insert("task2:build".to_string(), create_test_task("task2", vec![])); - tasks.insert("task3:build".to_string(), create_test_task("task3", vec![])); + tasks.insert("task1".to_string(), create_test_task("task1", vec![])); + tasks.insert("task2".to_string(), create_test_task("task2", vec![])); + tasks.insert("task3".to_string(), create_test_task("task3", vec![])); let mut dependencies = HashMap::new(); - dependencies.insert("task1:build".to_string(), vec!["task2:build".to_string()]); - dependencies.insert("task2:build".to_string(), vec!["task3:build".to_string()]); + dependencies.insert("task1".to_string(), vec!["task2".to_string()]); + dependencies.insert("task2".to_string(), vec!["task3".to_string()]); let task_graph = TaskGraph { roots: vec![], @@ -172,12 +182,12 @@ mod tests { continuous_dependencies: HashMap::new(), }; - let result = collect_task_dependencies(&task_graph, "task1:build", true); + let result = collect_task_dependencies(&task_graph, "task1", true); assert_eq!(result.len(), 2); let ids: Vec<&str> = result.iter().map(|t| t.id.as_str()).collect(); - assert!(ids.contains(&"task2:build")); - assert!(ids.contains(&"task3:build")); + assert!(ids.contains(&"task2")); + assert!(ids.contains(&"task3")); } #[test] @@ -185,18 +195,18 @@ mod tests { // Diamond pattern: task1 -> task2 -> task4 // task1 -> task3 -> task4 let mut tasks = HashMap::new(); - tasks.insert("task1:build".to_string(), create_test_task("task1", vec![])); - tasks.insert("task2:build".to_string(), create_test_task("task2", vec![])); - tasks.insert("task3:build".to_string(), create_test_task("task3", vec![])); - tasks.insert("task4:build".to_string(), create_test_task("task4", vec![])); + tasks.insert("task1".to_string(), create_test_task("task1", vec![])); + tasks.insert("task2".to_string(), create_test_task("task2", vec![])); + tasks.insert("task3".to_string(), create_test_task("task3", vec![])); + tasks.insert("task4".to_string(), create_test_task("task4", vec![])); let mut dependencies = HashMap::new(); dependencies.insert( - "task1:build".to_string(), - vec!["task2:build".to_string(), "task3:build".to_string()], + "task1".to_string(), + vec!["task2".to_string(), "task3".to_string()], ); - dependencies.insert("task2:build".to_string(), vec!["task4:build".to_string()]); - dependencies.insert("task3:build".to_string(), vec!["task4:build".to_string()]); + dependencies.insert("task2".to_string(), vec!["task4".to_string()]); + dependencies.insert("task3".to_string(), vec!["task4".to_string()]); let task_graph = TaskGraph { roots: vec![], @@ -205,14 +215,14 @@ mod tests { continuous_dependencies: HashMap::new(), }; - let result = collect_task_dependencies(&task_graph, "task1:build", true); + let result = collect_task_dependencies(&task_graph, "task1", true); // Should only contain task2, task3, task4 once (not task4 twice) assert_eq!(result.len(), 3); let ids: Vec<&str> = result.iter().map(|t| t.id.as_str()).collect(); - assert!(ids.contains(&"task2:build")); - assert!(ids.contains(&"task3:build")); - assert!(ids.contains(&"task4:build")); + assert!(ids.contains(&"task2")); + assert!(ids.contains(&"task3")); + assert!(ids.contains(&"task4")); } #[test] @@ -236,10 +246,7 @@ mod tests { let mut tasks = HashMap::new(); let mut dependencies = HashMap::new(); - tasks.insert( - "root:build".to_string(), - tests::create_test_task("root", vec![]), - ); + tasks.insert("root".to_string(), tests::create_test_task("root", vec![])); // Create diamond pattern repeated at each level for level in 0..depth { @@ -261,7 +268,7 @@ mod tests { ); if level == 0 { - dependencies.insert("root:build".to_string(), vec![left.clone(), right.clone()]); + dependencies.insert("root".to_string(), vec![left.clone(), right.clone()]); } else { let prev_bottom = format!("bottom{}", level - 1); dependencies.insert(prev_bottom, vec![left.clone(), right.clone()]); @@ -272,7 +279,7 @@ mod tests { } TaskGraph { - roots: vec!["root:build".to_string()], + roots: vec!["root".to_string()], tasks, dependencies, continuous_dependencies: HashMap::new(), @@ -284,7 +291,7 @@ mod tests { // This test verifies that deduplication works and the function is fast // on a large diamond graph (depth 30 = 90 tasks with many duplicate paths) let graph = create_diamond_graph(30); - let root_task = &graph.tasks["root:build"]; + let root_task = &graph.tasks["root"]; let start = std::time::Instant::now(); let result = get_dep_output(root_task, &graph, "**/*.js", true).unwrap(); diff --git a/packages/nx/src/native/tasks/types.rs b/packages/nx/src/native/tasks/types.rs index b14882e0..1e55e1ee 100644 --- a/packages/nx/src/native/tasks/types.rs +++ b/packages/nx/src/native/tasks/types.rs @@ -6,127 +6,39 @@ use napi::{ sys, }; -/// A representation of the invocation of an Executor #[napi(object)] -#[derive(Default, Clone, Debug, PartialEq)] +#[derive(Default, Clone, Debug, PartialEq, Eq)] pub struct Task { - /// Unique ID pub id: String, - /// Details about which project, target, and configuration to run. pub target: TaskTarget, - /// Overrides for the configured options of the target - #[napi(ts_type = "Record")] - pub overrides: serde_json::Value, - /// The outputs the task may produce pub outputs: Vec, - /// Root of the project the task belongs to pub project_root: Option, - /// Hash of the task which is used for caching. - pub hash: Option, - /// Details about the composition of the hash - pub hash_details: Option, - /// Unix timestamp of when a Batch Task starts pub start_time: Option, - /// Unix timestamp of when a Batch Task ends pub end_time: Option, - /// Determines if a given task should be cacheable. - pub cache: Option, - /// Determines if a given task should be parallelizable. - pub parallelism: Option, - /// This denotes if the task runs continuously pub continuous: Option, } -impl Task { - /// Build a Task for the given project + target. The id is derived as - /// `{project}:{target}`, matching the formula used by the TS task graph - /// builder in `tasks-runner/create-task-graph.ts`. - pub fn new(project: impl Into, target: impl Into) -> Self { - let project = project.into(); - let target = target.into(); - let id = format!("{project}:{target}"); - Task { - id, - target: TaskTarget { - project, - target, - configuration: None, - }, - ..Default::default() - } - } - - pub fn with_project_root(mut self, project_root: impl Into) -> Self { - self.project_root = Some(project_root.into()); - self - } - - pub fn with_outputs(mut self, outputs: Vec) -> Self { - self.outputs = outputs; - self - } - - pub fn with_continuous(mut self, continuous: bool) -> Self { - self.continuous = Some(continuous); - self - } - - /// Whether this task may run in parallel with others. Defaults to `true` - /// when unset, matching `create-task-graph.ts` (`parallelism ?? true`). - pub fn is_parallelizable(&self) -> bool { - self.parallelism.unwrap_or(true) - } -} - -/// Details about the composition of a task's hash -#[napi(object)] -#[derive(Default, Clone, Debug, PartialEq, Eq)] -pub struct TaskHashDetails { - /// Command of the task - pub command: String, - /// Hashes of inputs used in the hash - pub nodes: HashMap, - /// Hashes of implicit dependencies which are included in the hash - pub implicit_deps: Option>, - /// Hash of the runtime environment which the task was executed - pub runtime: Option>, -} - #[napi(object)] #[derive(Default, Clone, Debug, PartialEq, Eq)] pub struct TaskTarget { - /// The project for which the task belongs to pub project: String, - /// The target name which the task should invoke pub target: String, - /// The configuration of the target which the task invokes pub configuration: Option, } -/// The result of a completed Task. -/// -/// Task timing information (start and end timestamps) is available -/// on the Task object itself via `Task.startTime` and `Task.endTime`. #[napi(object)] -#[derive(Default, Clone, Debug, PartialEq)] +#[derive(Default, Clone, Debug, PartialEq, Eq)] pub struct TaskResult { pub task: Task, - #[napi( - ts_type = "'success' | 'failure' | 'skipped' | 'stopped' | 'local-cache-kept-existing' | 'local-cache' | 'remote-cache'" - )] pub status: String, pub code: i32, pub terminal_output: Option, } -/// Graph of Tasks to be executed #[napi(object)] pub struct TaskGraph { - /// IDs of Tasks which do not have any dependencies and are thus ready to execute immediately pub roots: Vec, - /// Map of Task IDs to Tasks pub tasks: HashMap, - /// Map of Task IDs to IDs of tasks which the task depends on pub dependencies: HashMap>, pub continuous_dependencies: HashMap>, } diff --git a/packages/nx/src/native/tui/action.rs b/packages/nx/src/native/tui/action.rs index 1391c216..d76526af 100644 --- a/packages/nx/src/native/tui/action.rs +++ b/packages/nx/src/native/tui/action.rs @@ -6,7 +6,7 @@ use super::{ lifecycle::{BatchInfo, TuiMode}, }; -#[derive(Debug, Clone, PartialEq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub enum Action { Tick, Render, diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__active_filter.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__active_filter.snap index 52aae9b0..52880e34 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__active_filter.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__active_filter.snap @@ -4,16 +4,16 @@ expression: terminal.backend() --- " " " NX Running Test Tasks... Cache Duration" -" │ " -">│⠋ app1:test ... <1ms" -" └ " -" · app1:build ... ..." +" " +" " +" " +" " " " " " " " " " " " " Filter: app1 " -" -> 1 tasks filtered out. Press / to persist, to clear " +" -> 3 tasks filtered out. Press / to persist, to clear " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__all_tasks_in_progress.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__all_tasks_in_progress.snap index da1b191c..dea9b0d8 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__all_tasks_in_progress.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__all_tasks_in_progress.snap @@ -5,9 +5,9 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:build ... <1ms" -" │⠋ app1:test ... <1ms" -" │⠋ app2:lint ... <1ms" +">│⠋ task1 ... <1ms" +" │⠋ task2 ... <1ms" +" │⠋ task3 ... <1ms" " └ " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_when_waiting_entries_scrolled_out.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_when_waiting_entries_scrolled_out.snap index 67b474d5..09075d58 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_when_waiting_entries_scrolled_out.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_when_waiting_entries_scrolled_out.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Cache Duration " " ↑" " ║" -"> · app10:test ... ... █" -" · app1:test ... ... ║" -" · app2:test ... ... ║" -" · app3:test ... ... ║" +"> · task1 ... ... █" +" · task10 ... ... ║" +" · task2 ... ... ║" +" · task3 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_with_waiting_entries_visible.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_with_waiting_entries_visible.snap index 081b15e9..8f31053e 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_with_waiting_entries_visible.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__bottom_corner_with_waiting_entries_visible.snap @@ -8,7 +8,7 @@ expression: terminal.backend() " │· Waiting for task... █" " │· Waiting for task... ║" " └ ║" -"> · app10:test ... ... ║" -" · app1:test ... ... ║" +"> · task1 ... ... ║" +" · task10 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_rendering.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_rendering.snap index 6ee80bad..e268ec4d 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_rendering.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_rendering.snap @@ -5,9 +5,9 @@ expression: terminal.backend() " " " NX Completed Test Tasks Cache Duration" " " -"> ✖ app1:build - ..." -" ✔ app1:test - ..." -" ✔ app2:lint - ..." +"> ✖ task2 - ..." +" ✔ task1 - ..." +" ✔ task3 - ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_single_line_url_only.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_single_line_url_only.snap index eb605e60..e4e70a00 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_single_line_url_only.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_single_line_url_only.snap @@ -5,9 +5,9 @@ expression: terminal.backend() " " " NX Completed Test Tasks Cache Duration" " " -"> ✔ app1:build - ..." -" ✔ app1:test - ..." -" ✔ app2:lint - ..." +"> ✔ task1 - ..." +" ✔ task2 - ..." +" ✔ task3 - ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_two_line_layout.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_two_line_layout.snap index 5d1dfa4c..7c24eb5d 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_two_line_layout.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_two_line_layout.snap @@ -5,9 +5,9 @@ expression: terminal.backend() " " " NX Completed Test Tasks Cache Duration" " " -"> ✔ app1:build - ..." -" ✔ app1:test - ..." -" ✔ app2:lint - ..." +"> ✔ task1 - ..." +" ✔ task2 - ..." +" ✔ task3 - ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url.snap index ebf45899..7a2f0267 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Cache Duration" " " " " -"> · app1:build ... ..." -" · app1:test ... ..." -" · app2:lint ... ..." +"> · task1 ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url_super_wide.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url_super_wide.snap index 10973cf3..35180109 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url_super_wide.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__cloud_message_without_url_super_wide.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Cache Duration" " " " " -"> · app1:build ... ..." -" · app1:test ... ..." -" · app2:lint ... ..." +"> · task1 ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__completed_tasks_with_different_durations.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__completed_tasks_with_different_durations.snap index 3d315291..a9b0bcd8 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__completed_tasks_with_different_durations.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__completed_tasks_with_different_durations.snap @@ -5,9 +5,9 @@ expression: terminal.backend() " " " NX Completed Test Tasks (60.0s) Cache Duration" " " -"> ✔ app1:test - 2.0s" -" ✔ app1:build - 10.0s" -" ✔ app2:lint - 60.0s" +"> ✔ task1 - 2.0s" +" ✔ task2 - 10.0s" +" ✔ task3 - 60.0s" " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__continuous_task.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__continuous_task.snap index 19eeff3e..1310b964 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__continuous_task.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__continuous_task.snap @@ -5,12 +5,12 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app3:serve - Continuous" +">│⠋ continuous-task - Continuous" " │· Waiting for task... " " └ " -" · app1:build ... ..." -" · app1:test ... ..." -" · app2:lint ... ..." +" · task1 ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__deep_scrolling_narrow_terminal.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__deep_scrolling_narrow_terminal.snap index 54730928..db571366 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__deep_scrolling_narrow_terminal.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__deep_scrolling_narrow_terminal.snap @@ -5,6 +5,6 @@ expression: terminal.backend() " " " NX Running Deep Scroll Duration " " ↑" -"> · app100:test ... █" +"> · task1 ... █" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_parallel_section_when_no_in_progress_match.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_parallel_section_when_no_in_progress_match.snap index 744fd81d..6fd3a2e1 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_parallel_section_when_no_in_progress_match.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_parallel_section_when_no_in_progress_match.snap @@ -5,7 +5,7 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " " -" " +"> ✔ task1 - ..." " " " " " " @@ -14,6 +14,6 @@ expression: terminal.backend() " " " " " Filter: task1 " -" -> 3 tasks filtered out. Press / to persist, to clear " +" -> 2 tasks filtered out. Press / to persist, to clear " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_placeholders_but_shows_matching_in_progress.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_placeholders_but_shows_matching_in_progress.snap index 744fd81d..01926eca 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_placeholders_but_shows_matching_in_progress.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filter_hides_placeholders_but_shows_matching_in_progress.snap @@ -4,9 +4,9 @@ expression: terminal.backend() --- " " " NX Running Test Tasks... Cache Duration" -" " -" " -" " +" │ " +">│⠋ task1 ... <1ms" +" └ " " " " " " " @@ -14,6 +14,6 @@ expression: terminal.backend() " " " " " Filter: task1 " -" -> 3 tasks filtered out. Press / to persist, to clear " +" -> 2 tasks filtered out. Press / to persist, to clear " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_active_tasks_with_parallel_section.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_active_tasks_with_parallel_section.snap index 0f7322e9..7ceb6a2c 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_active_tasks_with_parallel_section.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_active_tasks_with_parallel_section.snap @@ -4,16 +4,16 @@ expression: terminal.backend() --- " " " NX Running Test Tasks... Cache Duration" -" " -" " -" " -" " -" " +" │ " +">│⠋ task1 ... <1ms" +" │⠋ task2 ... <1ms" +" └ " +" · task3 ... ..." " " " " " " " " " Filter: task " -" -> 3 tasks filtered out. Press / to persist, to clear " +" Press to clear filter " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_completed_tasks_no_parallel_section.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_completed_tasks_no_parallel_section.snap index 0f7322e9..c24f0183 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_completed_tasks_no_parallel_section.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__filtered_completed_tasks_no_parallel_section.snap @@ -5,15 +5,15 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " " +"> ✔ task1 - <1ms" +" ✔ task2 - <1ms" " " -" " -" " -" " +" · task3 ... ..." " " " " " " " " " Filter: task " -" -> 3 tasks filtered out. Press / to persist, to clear " +" Press to clear filter " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__initial_rendering.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__initial_rendering.snap index 2e92380b..445dd8c6 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__initial_rendering.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__initial_rendering.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Cache Duration" " " " " -"> · app1:build ... ..." -" · app1:test ... ..." -" · app2:lint ... ..." +"> · task1 ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__max_parallel_exceeds_task_count_does_not_reserve_extra_slots.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__max_parallel_exceeds_task_count_does_not_reserve_extra_slots.snap index f6c4d37d..536457db 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__max_parallel_exceeds_task_count_does_not_reserve_extra_slots.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__max_parallel_exceeds_task_count_does_not_reserve_extra_slots.snap @@ -1,16 +1,17 @@ --- source: packages/nx/src/native/tui/components/tasks_list.rs +assertion_line: 3114 expression: terminal.backend() --- " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test ... <1ms" +">│⠋ task1 ... <1ms" " │· Waiting for task... " " │· Waiting for task... " " └ " -" · app1:build ... ..." -" · app2:lint ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__medium_width_rendering.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__medium_width_rendering.snap index 962d0afa..156cec93 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__medium_width_rendering.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__medium_width_rendering.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Cache Duration" " " " " -"> · app1:build ... ..." -" · app1:test ... ..." -" · app2:lint ... ..." +"> · task1 ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__mixed_task_statuses.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__mixed_task_statuses.snap index d837dc72..c32c98da 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__mixed_task_statuses.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__mixed_task_statuses.snap @@ -5,9 +5,9 @@ expression: terminal.backend() " " " NX Completed Test Tasks Cache Duration" " " -"> ✖ app1:build - ..." -" ✔ app1:test - ..." -" ⏭ app2:lint - ..." +"> ✖ task2 - ..." +" ✔ task1 - ..." +" ⏭ task3 - ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__more_in_progress_tasks_than_parallel_limit.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__more_in_progress_tasks_than_parallel_limit.snap index 994de207..5c73b458 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__more_in_progress_tasks_than_parallel_limit.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__more_in_progress_tasks_than_parallel_limit.snap @@ -5,10 +5,10 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test ... <1ms" -" │⠋ app2:build ... <1ms" -" │⠋ app3:lint ... <1ms" -" │⠋ app4:deploy ... <1ms" +">│⠋ task1 ... <1ms" +" │⠋ task2 ... <1ms" +" │⠋ task3 ... <1ms" +" │⠋ task4 ... <1ms" " └ " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_duration_only.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_duration_only.snap index 519a771f..50fbdd4b 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_duration_only.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_duration_only.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Duration" " " " " -"> · app1:build ..." -" · app1:test ..." -" · app2:lint ..." +"> · task1 ..." +" · task2 ..." +" · task3 ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_rendering.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_rendering.snap index cbe4fdb5..fef70bbc 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_rendering.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__narrow_width_rendering.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Duration" " " " " -"> · app1:build ..." -" · app1:test ..." -" · app2:lint ..." +"> · task1 ..." +" · task2 ..." +" · task3 ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__not_focused.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__not_focused.snap index 26ec4d7a..ebc2f674 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__not_focused.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__not_focused.snap @@ -5,11 +5,11 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test ... <1ms" +">│⠋ task1 ... <1ms" " │· Waiting for task... " " └ " -" · app1:build ... ..." -" · app2:lint ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__parallel_section_visibility_with_filtered_tasks.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__parallel_section_visibility_with_filtered_tasks.snap index 1ddc0fec..24618ce9 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__parallel_section_visibility_with_filtered_tasks.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__parallel_section_visibility_with_filtered_tasks.snap @@ -5,7 +5,7 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " " -" " +"> · task3 ... ..." " " " " " " @@ -14,6 +14,6 @@ expression: terminal.backend() " " " " " Filter: task3 " -" -> 3 tasks filtered out. Press / to persist, to clear " +" -> 2 tasks filtered out. Press / to persist, to clear " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__persisted_filter.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__persisted_filter.snap index 1191bdf5..0b836df0 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__persisted_filter.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__persisted_filter.snap @@ -4,16 +4,16 @@ expression: terminal.backend() --- " " " NX Running Test Tasks... Cache Duration" -" │ " -">│⠋ app1:test ... <1ms" -" └ " -" · app1:build ... ..." +" " +" " +" " +" " " " " " " " " " " " " Filter: app1 " -" -> 1 tasks filtered out. Press / to edit, to clear " +" -> 3 tasks filtered out. Press / to edit, to clear " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks.snap index c79e0481..51e255e6 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks.snap @@ -5,11 +5,11 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test [1] ... <1ms" +">│⠋ task1 [1] ... <1ms" " │· Waiting for task... " " └ " -" · app1:build ... ..." -" · app2:lint ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks_with_narrow_width.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks_with_narrow_width.snap index 06c4540d..6997aaf7 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks_with_narrow_width.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__pinned_tasks_with_narrow_width.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Test Tasks... Duration" " " " " -"> · app1:build ..." -" · app1:test [1] ..." -" · app2:lint ..." +"> · task1 [1] ..." +" · task2 ..." +" · task3 ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__run_one_mode_with_highlighted_task.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__run_one_mode_with_highlighted_task.snap index fee95e9d..17b075a7 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__run_one_mode_with_highlighted_task.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__run_one_mode_with_highlighted_task.snap @@ -8,9 +8,9 @@ expression: terminal.backend() " │· Waiting for task... " " │· Waiting for task... " " └ " -"> · app1:build ... ..." -" · app1:test ... ..." +"> · task1 ... ..." " " +" · task2 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_focus_dimming.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_focus_dimming.snap index 9efabe9e..a8d79ef1 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_focus_dimming.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_focus_dimming.snap @@ -6,19 +6,19 @@ expression: terminal.backend() " NX Running Test Tasks with Scrollbar... Cache Duration " " ↑" " █" -"> · app10:test ... ... █" -" · app11:build ... ... █" -" · app12:lint ... ... █" -" · app13:test ... ... █" -" · app14:build ... ... █" -" · app15:lint ... ... ║" -" · app16:test ... ... ║" -" · app17:build ... ... ║" -" · app18:lint ... ... ║" -" · app19:test ... ... ║" -" · app1:test ... ... ║" -" · app20:build ... ... ║" -" · app21:lint ... ... ║" -" · app22:test ... ... ║" +"> · task-1 ... ... █" +" · task-10 ... ... █" +" · task-11 ... ... █" +" · task-12 ... ... █" +" · task-13 ... ... █" +" · task-14 ... ... ║" +" · task-15 ... ... ║" +" · task-16 ... ... ║" +" · task-17 ... ... ║" +" · task-18 ... ... ║" +" · task-19 ... ... ║" +" · task-2 ... ... ║" +" · task-20 ... ... ║" +" · task-21 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_medium_terminal.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_medium_terminal.snap index 0cc2ccca..66706dc5 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_medium_terminal.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_medium_terminal.snap @@ -6,19 +6,19 @@ expression: terminal.backend() " NX Running Test Tasks with Scrollbar... Cache Duration " " ↑" " █" -"> · app10:test ... ... █" -" · app11:build ... ... █" -" · app12:lint ... ... █" -" · app13:test ... ... █" -" · app14:build ... ... ║" -" · app15:lint ... ... ║" -" · app16:test ... ... ║" -" · app17:build ... ... ║" -" · app18:lint ... ... ║" -" · app19:test ... ... ║" -" · app1:test ... ... ║" -" · app20:build ... ... ║" -" · app21:lint ... ... ║" -" · app22:test ... ... ║" +"> · task-1 ... ... █" +" · task-10 ... ... █" +" · task-11 ... ... █" +" · task-12 ... ... █" +" · task-13 ... ... ║" +" · task-14 ... ... ║" +" · task-15 ... ... ║" +" · task-16 ... ... ║" +" · task-17 ... ... ║" +" · task-18 ... ... ║" +" · task-19 ... ... ║" +" · task-2 ... ... ║" +" · task-20 ... ... ║" +" · task-21 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_narrow_terminal.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_narrow_terminal.snap index 9c5c01d5..29c6e14e 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_narrow_terminal.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_narrow_terminal.snap @@ -6,17 +6,17 @@ expression: terminal.backend() " NX Running Test Tasks with Scrollba Cache Duration " " ↑" " █" -"> · app10:test ... ... █" -" · app11:build ... ... █" -" · app12:lint ... ... █" -" · app13:test ... ... ║" -" · app14:build ... ... ║" -" · app15:lint ... ... ║" -" · app16:test ... ... ║" -" · app17:build ... ... ║" -" · app18:lint ... ... ║" -" · app19:test ... ... ║" -" · app1:test ... ... ║" -" · app20:build ... ... ║" +"> · task-1 ... ... █" +" · task-10 ... ... █" +" · task-11 ... ... █" +" · task-12 ... ... ║" +" · task-13 ... ... ║" +" · task-14 ... ... ║" +" · task-15 ... ... ║" +" · task-16 ... ... ║" +" · task-17 ... ... ║" +" · task-18 ... ... ║" +" · task-19 ... ... ║" +" · task-2 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_scrolled_down.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_scrolled_down.snap index 0c4a00dd..3bd92feb 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_scrolled_down.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_scrolled_down.snap @@ -5,20 +5,20 @@ expression: terminal.backend() " " " NX Running Test Tasks with Scrollbar... Cache Duration " " ↑" -" · app24:lint ... ... ║" -" · app25:test ... ... ║" -" · app26:build ... ... ║" -" · app27:lint ... ... ║" -" · app28:test ... ... ║" -" · app29:build ... ... █" -" · app2:build ... ... █" -" · app30:lint ... ... █" -" · app31:test ... ... █" -"> · app32:build ... ... ║" -" · app33:lint ... ... ║" -" · app34:test ... ... ║" -" · app35:build ... ... ║" -" · app36:lint ... ... ║" -" · app37:test ... ... ║" +" · task-23 ... ... ║" +" · task-24 ... ... ║" +" · task-25 ... ... ║" +" · task-26 ... ... ║" +" · task-27 ... ... ║" +" · task-28 ... ... █" +" · task-29 ... ... █" +" · task-3 ... ... █" +" · task-30 ... ... █" +"> · task-31 ... ... ║" +" · task-32 ... ... ║" +" · task-33 ... ... ║" +" · task-34 ... ... ║" +" · task-35 ... ... ║" +" · task-36 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_short_terminal.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_short_terminal.snap index d2f3fdb7..4dafb988 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_short_terminal.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_short_terminal.snap @@ -6,11 +6,11 @@ expression: terminal.backend() " NX Running Test Tasks with Scrollbar... Cache Duration " " ↑" " █" -"> · app10:test ... ... █" -" · app11:build ... ... ║" -" · app12:lint ... ... ║" -" · app13:test ... ... ║" -" · app14:build ... ... ║" -" · app15:lint ... ... ║" +"> · task-1 ... ... █" +" · task-10 ... ... ║" +" · task-11 ... ... ║" +" · task-12 ... ... ║" +" · task-13 ... ... ║" +" · task-14 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_tall_terminal.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_tall_terminal.snap index c0d90181..2e7bb28b 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_tall_terminal.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_tall_terminal.snap @@ -6,29 +6,29 @@ expression: terminal.backend() " NX Running Test Tasks with Scrollbar... Cache Duration " " ↑" " █" -"> · app10:test ... ... █" -" · app11:build ... ... █" -" · app12:lint ... ... █" -" · app13:test ... ... █" -" · app14:build ... ... █" -" · app15:lint ... ... █" -" · app16:test ... ... █" -" · app17:build ... ... ║" -" · app18:lint ... ... ║" -" · app19:test ... ... ║" -" · app1:test ... ... ║" -" · app20:build ... ... ║" -" · app21:lint ... ... ║" -" · app22:test ... ... ║" -" · app23:build ... ... ║" -" · app24:lint ... ... ║" -" · app25:test ... ... ║" -" · app26:build ... ... ║" -" · app27:lint ... ... ║" -" · app28:test ... ... ║" -" · app29:build ... ... ║" -" · app2:build ... ... ║" -" · app30:lint ... ... ║" -" · app31:test ... ... ║" +"> · task-1 ... ... █" +" · task-10 ... ... █" +" · task-11 ... ... █" +" · task-12 ... ... █" +" · task-13 ... ... █" +" · task-14 ... ... █" +" · task-15 ... ... █" +" · task-16 ... ... ║" +" · task-17 ... ... ║" +" · task-18 ... ... ║" +" · task-19 ... ... ║" +" · task-2 ... ... ║" +" · task-20 ... ... ║" +" · task-21 ... ... ║" +" · task-22 ... ... ║" +" · task-23 ... ... ║" +" · task-24 ... ... ║" +" · task-25 ... ... ║" +" · task-26 ... ... ║" +" · task-27 ... ... ║" +" · task-28 ... ... ║" +" · task-29 ... ... ║" +" · task-3 ... ... ║" +" · task-30 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_wide_terminal.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_wide_terminal.snap index d0e9e4fb..0270f338 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_wide_terminal.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrollbar_positioning_wide_terminal.snap @@ -6,24 +6,24 @@ expression: terminal.backend() " NX Running Test Tasks with Scrollbar... Cache Duration " " ↑" " █" -"> · app10:test ... ... █" -" · app11:build ... ... █" -" · app12:lint ... ... █" -" · app13:test ... ... █" -" · app14:build ... ... █" -" · app15:lint ... ... █" -" · app16:test ... ... ║" -" · app17:build ... ... ║" -" · app18:lint ... ... ║" -" · app19:test ... ... ║" -" · app1:test ... ... ║" -" · app20:build ... ... ║" -" · app21:lint ... ... ║" -" · app22:test ... ... ║" -" · app23:build ... ... ║" -" · app24:lint ... ... ║" -" · app25:test ... ... ║" -" · app26:build ... ... ║" -" · app27:lint ... ... ║" +"> · task-1 ... ... █" +" · task-10 ... ... █" +" · task-11 ... ... █" +" · task-12 ... ... █" +" · task-13 ... ... █" +" · task-14 ... ... █" +" · task-15 ... ... ║" +" · task-16 ... ... ║" +" · task-17 ... ... ║" +" · task-18 ... ... ║" +" · task-19 ... ... ║" +" · task-2 ... ... ║" +" · task-20 ... ... ║" +" · task-21 ... ... ║" +" · task-22 ... ... ║" +" · task-23 ... ... ║" +" · task-24 ... ... ║" +" · task-25 ... ... ║" +" · task-26 ... ... ║" " ↓" " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_after_scroll.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_after_scroll.snap index d0cecd97..83728cf3 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_after_scroll.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_after_scroll.snap @@ -7,13 +7,13 @@ expression: terminal.backend() " │ ↑" " │· Waiting for task... █" " └ █" -"> · app10:test ... ... █" -" · app11:test ... ... █" -" · app12:test ... ... █" -" · app1:test ... ... ║" -" · app2:test ... ... ║" -" · app3:test ... ... ║" -" · app4:test ... ... ║" -" · app5:test ... ... ║" +"> · task1 ... ... █" +" · task10 ... ... █" +" · task11 ... ... █" +" · task12 ... ... ║" +" · task2 ... ... ║" +" · task3 ... ... ║" +" · task4 ... ... ║" +" · task5 ... ... ║" " ↓" " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_after_navigation.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_after_navigation.snap index 9cb3f2b8..7f371c99 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_after_navigation.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_after_navigation.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Scrolling Test... Cache Duration" " " " " -"> · app1:build ... ..." -" · app1:test ... ..." -" · this-is-a-very-long-project-name-that-affects-column-vi ... ..." +"> · short1 ... ..." +" · short2 ... ..." +" · this-is-a-very-long-task-name-that-exceeds-thirty-chara ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_short_names.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_short_names.snap index 9cb3f2b8..7f371c99 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_short_names.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport1_short_names.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Scrolling Test... Cache Duration" " " " " -"> · app1:build ... ..." -" · app1:test ... ..." -" · this-is-a-very-long-project-name-that-affects-column-vi ... ..." +"> · short1 ... ..." +" · short2 ... ..." +" · this-is-a-very-long-task-name-that-exceeds-thirty-chara ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport2_long_names.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport2_long_names.snap index 9cb3f2b8..7f371c99 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport2_long_names.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_consistency_viewport2_long_names.snap @@ -6,9 +6,9 @@ expression: terminal.backend() " NX Running Scrolling Test... Cache Duration" " " " " -"> · app1:build ... ..." -" · app1:test ... ..." -" · this-is-a-very-long-project-name-that-affects-column-vi ... ..." +"> · short1 ... ..." +" · short2 ... ..." +" · this-is-a-very-long-task-name-that-exceeds-thirty-chara ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_initial.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_initial.snap index fd2da4f3..412ad9b7 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_initial.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__scrolling_initial.snap @@ -8,12 +8,12 @@ expression: terminal.backend() " │· Waiting for task... █" " │· Waiting for task... █" " └ █" -"> · app10:test ... ... █" -" · app11:test ... ... ║" -" · app12:test ... ... ║" -" · app1:test ... ... ║" -" · app2:test ... ... ║" -" · app3:test ... ... ║" -" · app4:test ... ... ║" +"> · task1 ... ... █" +" · task10 ... ... ║" +" · task11 ... ... ║" +" · task12 ... ... ║" +" · task2 ... ... ║" +" · task3 ... ... ║" +" · task4 ... ... ║" " ↓" " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__shared_task_grouped_with_in_progress_section.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__shared_task_grouped_with_in_progress_section.snap index 88821c39..91bfe9f4 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__shared_task_grouped_with_in_progress_section.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__shared_task_grouped_with_in_progress_section.snap @@ -5,10 +5,10 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test ... <1ms" -" │⠋ app2:lint - ..." +">│⠋ task1 ... <1ms" +" │⠋ task3 - ..." " └ " -" ✔ app1:build - ..." +" ✔ task2 - ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__short_height_rendering.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__short_height_rendering.snap index 8086e9d1..50204ad8 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__short_height_rendering.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__short_height_rendering.snap @@ -5,10 +5,10 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test ... <1ms" +">│⠋ task1 ... <1ms" " │· Waiting for task... " " └ " -" · app1:build ... ..." -" · app2:lint ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__spacebar_mode.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__spacebar_mode.snap index 26ec4d7a..ebc2f674 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__spacebar_mode.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__spacebar_mode.snap @@ -5,11 +5,11 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test ... <1ms" +">│⠋ task1 ... <1ms" " │· Waiting for task... " " └ " -" · app1:build ... ..." -" · app2:lint ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__task_with_cache_status.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__task_with_cache_status.snap index fdde5f6a..e73a44d1 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__task_with_cache_status.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__task_with_cache_status.snap @@ -5,9 +5,9 @@ expression: terminal.backend() " " " NX Completed Test Tasks Cache Duration" " " -"> ✔ app1:build Remote ..." -" ✔ app1:test Local ..." -" ✔ app2:lint Match ..." +"> ✔ task1 Local ..." +" ✔ task2 Remote ..." +" ✔ task3 Match ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__three_tasks_one_in_progress_two_pending_with_two_max_parallel.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__three_tasks_one_in_progress_two_pending_with_two_max_parallel.snap index 26ec4d7a..ebc2f674 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__three_tasks_one_in_progress_two_pending_with_two_max_parallel.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__three_tasks_one_in_progress_two_pending_with_two_max_parallel.snap @@ -5,11 +5,11 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " │ " -">│⠋ app1:test ... <1ms" +">│⠋ task1 ... <1ms" " │· Waiting for task... " " └ " -" · app1:build ... ..." -" · app2:lint ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_when_waiting_entries_scrolled_out.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_when_waiting_entries_scrolled_out.snap index 23c945dc..8f53038c 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_when_waiting_entries_scrolled_out.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_when_waiting_entries_scrolled_out.snap @@ -5,10 +5,10 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration " " ↑" -"> · app10:test ... ... ║" -" · app1:test ... ... █" -" · app2:test ... ... ║" -" · app3:test ... ... ║" -" · app4:test ... ... ║" +"> · task1 ... ... ║" +" · task10 ... ... █" +" · task2 ... ... ║" +" · task3 ... ... ║" +" · task4 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_with_waiting_entries_visible.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_with_waiting_entries_visible.snap index 081b15e9..8f31053e 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_with_waiting_entries_visible.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__vertical_line_with_waiting_entries_visible.snap @@ -8,7 +8,7 @@ expression: terminal.backend() " │· Waiting for task... █" " │· Waiting for task... ║" " └ ║" -"> · app10:test ... ... ║" -" · app1:test ... ... ║" +"> · task1 ... ... ║" +" · task10 ... ... ║" " ↓" " quit: q help: ?" diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_layout_handling.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_layout_handling.snap index bd9ac9ee..fe9eb3f4 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_layout_handling.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_layout_handling.snap @@ -5,10 +5,10 @@ expression: terminal.backend() " " " NX Running Test Tasks" " " -"> ⠋ app1:test " +"> ⠋ task1 " " " -" · app1:build " -" · app2:lint " +" · task2 " +" · task3 " " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_width_rendering.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_width_rendering.snap index a3a34316..0e7594fe 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_width_rendering.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__very_narrow_width_rendering.snap @@ -5,11 +5,11 @@ expression: terminal.backend() " " " NX Running Test " " │ " -">│⠋ app1:test " +">│⠋ task1 " " │· Waiting for t" " └ " -" · app1:build " -" · app2:lint " +" · task2 " +" · task3 " " " " " " " diff --git a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__wide_and_short_rendering.snap b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__wide_and_short_rendering.snap index 9b9ea846..0629eee9 100644 --- a/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__wide_and_short_rendering.snap +++ b/packages/nx/src/native/tui/components/snapshots/nx__native__tui__components__tasks_list__tests__wide_and_short_rendering.snap @@ -5,10 +5,10 @@ expression: terminal.backend() " " " NX Running Test Tasks... Cache Duration" " " -"> ⠋ app1:test ... <1ms" +"> ⠋ task1 ... <1ms" " " -" · app1:build ... ..." -" · app2:lint ... ..." +" · task2 ... ..." +" · task3 ... ..." " " " " " quit: q help: ? navigate: ↑ ↓ filter: / pin output: 1 or 2 show output: " diff --git a/packages/nx/src/native/tui/components/tasks_list.rs b/packages/nx/src/native/tui/components/tasks_list.rs index f8928f55..2ddf87b7 100644 --- a/packages/nx/src/native/tui/components/tasks_list.rs +++ b/packages/nx/src/native/tui/components/tasks_list.rs @@ -4,7 +4,7 @@ use parking_lot::Mutex; use ratatui::{ Frame, layout::{Alignment, Constraint, Direction, Layout, Rect}, - style::{Modifier, Style}, + style::{Modifier, Style, Stylize}, text::{Line, Span}, widgets::{ Block, Cell, Paragraph, Row, Scrollbar, ScrollbarOrientation, ScrollbarState, Table, @@ -2991,24 +2991,55 @@ impl Component for TasksList { #[cfg(test)] mod tests { use super::*; + use crate::native::tasks::types::TaskTarget; use crate::native::tui::app::Focus; use crate::native::tui::lifecycle::RunMode; use hashbrown::HashSet; use ratatui::Terminal; use ratatui::backend::TestBackend; - // Helper function to create a TasksList with test task data. + // Helper function to create a TasksList with test task data fn create_test_tasks_list() -> (TasksList, Vec) { let test_tasks = vec![ - Task::new("app1", "test") - .with_project_root("") - .with_continuous(false), - Task::new("app1", "build") - .with_project_root("") - .with_continuous(false), - Task::new("app2", "lint") - .with_project_root("") - .with_continuous(false), + Task { + id: "task1".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "task2".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "task3".to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "lint".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); let title_text = "Test Tasks".to_string(); @@ -3128,18 +3159,58 @@ mod tests { // Actual (bug): Shows │ next to all 4 tasks, but missing └ separator let test_tasks = vec![ - Task::new("app1", "test") - .with_project_root("") - .with_continuous(false), - Task::new("app2", "build") - .with_project_root("") - .with_continuous(false), - Task::new("app3", "lint") - .with_project_root("") - .with_continuous(false), - Task::new("app4", "deploy") - .with_project_root("") - .with_continuous(false), + Task { + id: "task1".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "task2".to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "task3".to_string(), + target: TaskTarget { + project: "app3".to_string(), + target: "lint".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "task4".to_string(), + target: TaskTarget { + project: "app4".to_string(), + target: "deploy".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); @@ -3561,9 +3632,19 @@ mod tests { let mut terminal = create_test_terminal(120, 15); // Create a task list with a continuous task - let continuous_task = Task::new("app3", "serve") - .with_project_root("") - .with_continuous(true); + let continuous_task = Task { + id: "continuous-task".to_string(), + target: TaskTarget { + project: "app3".to_string(), + target: "serve".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(true), + start_time: None, + end_time: None, + }; // Add and start the continuous task let task_item = TaskItem::new(continuous_task.id.clone(), true); @@ -3588,9 +3669,19 @@ mod tests { // Create 12 tasks to test scrolling for i in 1..=12 { - let task = Task::new(format!("app{i}"), "test") - .with_project_root("") - .with_continuous(false); + let task = Task { + id: format!("task{}", i), + target: TaskTarget { + project: format!("app{}", i % 3 + 1), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }; tasks.push(task); } @@ -3629,9 +3720,19 @@ mod tests { // Create many tasks to ensure scrolling beyond waiting entries for i in 1..=10 { - let task = Task::new(format!("app{i}"), "test") - .with_project_root("") - .with_continuous(false); + let task = Task { + id: format!("task{}", i), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }; tasks.push(task); } @@ -3681,9 +3782,19 @@ mod tests { // Create many tasks to ensure scrolling beyond waiting entries and bottom corner for i in 1..=10 { - let task = Task::new(format!("app{i}"), "test") - .with_project_root("") - .with_continuous(false); + let task = Task { + id: format!("task{}", i), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }; tasks.push(task); } @@ -3729,12 +3840,32 @@ mod tests { fn test_run_one_mode_with_highlighted_task() { // Create a task list with a highlighted initiating task let test_tasks = vec![ - Task::new("app1", "test") - .with_project_root("") - .with_continuous(false), - Task::new("app1", "build") - .with_project_root("") - .with_continuous(false), + Task { + id: "task1".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "task2".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; // Create a set of initiating tasks (task1) @@ -3783,12 +3914,32 @@ mod tests { let long_task_name = "very-long-task-name-that-exceeds-thirty-characters-to-test-threshold-logic"; let test_tasks = vec![ - Task::new(long_task_name, "test") - .with_project_root("") - .with_continuous(false), - Task::new("another-very-long-task-name-for-testing-purposes", "build") - .with_project_root("") - .with_continuous(false), + Task { + id: long_task_name.to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "another-very-long-task-name-for-testing-purposes".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); @@ -4001,11 +4152,19 @@ mod tests { let mut tasks = Vec::new(); for i in 1..=num_tasks { - tasks.push( - Task::new(format!("app{i}"), "test") - .with_project_root("") - .with_continuous(false), - ); + tasks.push(Task { + id: format!("task{}", i), + target: TaskTarget { + project: "app".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }); } let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(viewport_size))); @@ -4068,10 +4227,7 @@ mod tests { #[test] fn test_column_visibility_task_name_length_variations() { - // Test column visibility across task name (id) lengths: short, 29, - // 30, 31, and very long. The helper builds an id of the requested - // length by using `project` of `(len - 2)` chars and target "x", - // yielding id "{project}:x" of length `len`. + // Test various task name lengths: short, 29, 30, 31, and very long // Short task names (like default test tasks) let (mut tasks_list_short, _) = create_test_tasks_list(); @@ -4079,14 +4235,16 @@ mod tests { assert!(result.show_duration); assert!(result.show_cache_status); - // 29-char id - let mut tasks_list_29 = create_tasks_list_with_id_of_length(29); + // 29-character task name + let task_name_29 = "this-is-exactly-29-chars-here"; // 29 characters + let mut tasks_list_29 = create_tasks_list_with_name(task_name_29); let result = tasks_list_29.calculate_column_visibility(47); assert!(result.show_duration); assert!(!result.show_cache_status); - // 30-char id (threshold) - let mut tasks_list_30 = create_tasks_list_with_id_of_length(30); + // 30-character task name (threshold) + let task_name_30 = "this-is-exactly-thirty-chars-1"; // 30 characters + let mut tasks_list_30 = create_tasks_list_with_name(task_name_30); let result = tasks_list_30.calculate_column_visibility(48); assert!(result.show_duration); assert!(!result.show_cache_status); @@ -4094,14 +4252,17 @@ mod tests { assert!(result.show_duration); assert!(result.show_cache_status); - // 31-char id - let mut tasks_list_31 = create_tasks_list_with_id_of_length(31); + // 31-character task name + let task_name_31 = "this-is-exactly-thirty-one-char"; // 31 characters + let mut tasks_list_31 = create_tasks_list_with_name(task_name_31); let result = tasks_list_31.calculate_column_visibility(54); assert!(result.show_duration); assert!(!result.show_cache_status); - // Very long id (well past the 30-char cap) - let mut tasks_list_long = create_tasks_list_with_id_of_length(74); + // Very long task name + let long_task_name = + "very-long-task-name-that-exceeds-thirty-characters-to-test-threshold-logic"; + let mut tasks_list_long = create_tasks_list_with_name(long_task_name); let result = tasks_list_long.calculate_column_visibility(47); assert!(!result.show_duration); assert!(!result.show_cache_status); @@ -4110,17 +4271,21 @@ mod tests { assert!(result.show_cache_status); } - // Helper function: build a TasksList containing a single task whose - // id is exactly `len` chars long. Uses target "x" so the project name - // is `len - 2` chars. - fn create_tasks_list_with_id_of_length(len: usize) -> TasksList { - assert!(len >= 3, "id length must allow `:x`"); - let project: String = std::iter::repeat('a').take(len - 2).collect(); - let test_tasks = vec![ - Task::new(project, "x") - .with_project_root("") - .with_continuous(false), - ]; + // Helper function to create tasks list with specific task name + fn create_tasks_list_with_name(task_name: &str) -> TasksList { + let test_tasks = vec![Task { + id: task_name.to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); TasksList::new( @@ -4135,18 +4300,33 @@ mod tests { #[test] fn test_calculate_column_visibility_mixed_task_name_lengths() { - // Mixed-length task ids: one short ("a:test", 6) and one long - // (>30 chars) so the threshold formula caps at 30. let test_tasks = vec![ - Task::new("a", "test") - .with_project_root("") - .with_continuous(false), - Task::new( - "this-is-a-very-long-project-name-that-exceeds-thirty-characters", - "build", - ) - .with_project_root("") - .with_continuous(false), + Task { + id: "short".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "this-is-a-very-long-task-name-that-exceeds-thirty-characters".to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); @@ -4183,34 +4363,75 @@ mod tests { #[test] fn test_column_visibility_viewport_consistency() { - // Tasks with mixed name lengths distributed across viewports. - // Viewport 1 holds short ids ("app1:test", "app1:build", "app1:lint"); - // viewport 2 holds ids well over the 30-char threshold so the - // duration/cache visibility is governed by the long names. + // Create tasks with mixed name lengths distributed across viewports let test_tasks = vec![ // Viewport 1: Short task names - Task::new("app1", "test") - .with_project_root("") - .with_continuous(false), - Task::new("app1", "build") - .with_project_root("") - .with_continuous(false), - Task::new("app1", "lint") - .with_project_root("") - .with_continuous(false), + Task { + id: "short1".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "short2".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "short3".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "lint".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, // Viewport 2: Long task names - Task::new( - "this-is-a-very-long-project-name-that-exceeds-thirty-characters-1", - "e2e", - ) - .with_project_root("") - .with_continuous(false), - Task::new( - "this-is-a-very-long-project-name-that-exceeds-thirty-characters-2", - "deploy", - ) - .with_project_root("") - .with_continuous(false), + Task { + id: "this-is-a-very-long-task-name-that-exceeds-thirty-characters-viewport2-task1".to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "e2e".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "another-extremely-long-task-name-for-testing-viewport-consistency-viewport2-task2".to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "deploy".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(3))); // viewport size 3 @@ -4262,28 +4483,64 @@ mod tests { #[test] fn test_scrolling_column_visibility_consistency_wide_terminal() { - // Tasks with mixed name lengths. + // Create tasks with mixed name lengths let test_tasks = vec![ // Viewport 1: Short task names - Task::new("app1", "test") - .with_project_root("") - .with_continuous(false), - Task::new("app1", "build") - .with_project_root("") - .with_continuous(false), - // Viewport 2: Long task names (long project names) - Task::new( - "this-is-a-very-long-project-name-that-exceeds-thirty-characters-for-testing", - "e2e", - ) - .with_project_root("") - .with_continuous(false), - Task::new( - "another-extremely-long-project-name-for-testing-scrolling-consistency-behavior", - "deploy", - ) - .with_project_root("") - .with_continuous(false), + Task { + id: "short1".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "short2".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + // Viewport 2: Long task names + Task { + id: "this-is-a-very-long-task-name-that-exceeds-thirty-characters-for-testing" + .to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "e2e".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "another-extremely-long-task-name-for-testing-scrolling-consistency-behavior" + .to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "deploy".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(2))); // viewport size 2 @@ -4335,22 +4592,49 @@ mod tests { #[test] fn test_scrolling_column_visibility_rendering_consistency() { - // Tasks with mixed name lengths. + // Create tasks with mixed name lengths let test_tasks = vec![ // Viewport 1: Short task names - Task::new("app1", "test") - .with_project_root("") - .with_continuous(false), - Task::new("app1", "build") - .with_project_root("") - .with_continuous(false), - // Viewport 2: Long task name that would affect column visibility - Task::new( - "this-is-a-very-long-project-name-that-affects-column-visibility", - "e2e", - ) - .with_project_root("") - .with_continuous(false), + Task { + id: "short1".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "short2".to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + // Viewport 2: Long task names that would affect column visibility + Task { + id: "this-is-a-very-long-task-name-that-exceeds-thirty-characters-and-affects-column-visibility".to_string(), + target: TaskTarget { + project: "app2".to_string(), + target: "e2e".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(2))); // viewport size 2 @@ -4396,11 +4680,19 @@ mod tests { fn test_cache_column_spacing_with_long_truncated_task_name() { let long_task_name = "this-is-a-very-long-task-name-that-will-definitely-be-truncated-when-displayed"; - let test_tasks = vec![ - Task::new(long_task_name, "test") - .with_project_root("") - .with_continuous(false), - ]; + let test_tasks = vec![Task { + id: long_task_name.to_string(), + target: TaskTarget { + project: "app1".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); let mut tasks_list = TasksList::new( @@ -4436,18 +4728,14 @@ mod tests { // Get effective width without pinned tasks let effective_width_without_pins = tasks_list.calculate_effective_task_name_width(); - // Pin the longest task; adding " [1]" should bump the effective - // task-name column width by exactly 4 characters. - let longest_idx = test_tasks - .iter() - .enumerate() - .max_by_key(|(_, t)| t.id.len()) - .unwrap() - .0; - tasks_list.pinned_tasks[0] = Some(test_tasks[longest_idx].id.clone()); + // Pin a task which adds " [1]" to the effective task name width + tasks_list.pinned_tasks[0] = Some(test_tasks[0].id.clone()); let effective_width_with_pins = tasks_list.calculate_effective_task_name_width(); + // The effective width with pins should be larger than without pins assert!(effective_width_with_pins > effective_width_without_pins); + + // The difference should be 4 characters (" [1]" format) let expected_difference = 4; // " [1]" format assert_eq!( effective_width_with_pins, @@ -4460,23 +4748,25 @@ mod tests { let mut test_tasks = Vec::new(); for i in 0..num_tasks { - // Project varies per iteration so that auto-derived ids stay - // unique; target cycles through test/build/lint as the - // original fixture did. - test_tasks.push( - Task::new( - format!("app{}", i + 1), - if i % 3 == 0 { + test_tasks.push(Task { + id: format!("task-{}", i + 1), + target: TaskTarget { + project: format!("app{}", (i % 5) + 1), + target: if i % 3 == 0 { "test".to_string() } else if i % 3 == 1 { "build".to_string() } else { "lint".to_string() }, - ) - .with_project_root("") - .with_continuous(false), - ); + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }); } let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); @@ -4748,15 +5038,45 @@ mod tests { /// Helper function to create a TasksList with batch-enabled test data fn create_test_tasks_list_with_batches() -> (TasksList, Vec) { let test_tasks = vec![ - Task::new("app", "build") - .with_project_root("") - .with_continuous(false), - Task::new("lib", "build") - .with_project_root("") - .with_continuous(false), - Task::new("standalone", "test") - .with_project_root("") - .with_continuous(false), + Task { + id: "app:build".to_string(), + target: TaskTarget { + project: "app".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "lib:build".to_string(), + target: TaskTarget { + project: "lib".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "standalone:test".to_string(), + target: TaskTarget { + project: "standalone".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); @@ -5437,24 +5757,84 @@ mod tests { // Create extended task list with additional tasks for multiple batches let test_tasks = vec![ - Task::new("app", "build") - .with_project_root("") - .with_continuous(false), - Task::new("shared", "build") - .with_project_root("") - .with_continuous(false), - Task::new("app", "test") - .with_project_root("") - .with_continuous(false), - Task::new("shared", "test") - .with_project_root("") - .with_continuous(false), - Task::new("lint", "check") - .with_project_root("") - .with_continuous(false), - Task::new("format", "check") - .with_project_root("") - .with_continuous(false), + Task { + id: "app:build".to_string(), + target: TaskTarget { + project: "app".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "shared:build".to_string(), + target: TaskTarget { + project: "shared".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "app:test".to_string(), + target: TaskTarget { + project: "app".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "shared:test".to_string(), + target: TaskTarget { + project: "shared".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "lint:check".to_string(), + target: TaskTarget { + project: "lint".to_string(), + target: "check".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "format:check".to_string(), + target: TaskTarget { + project: "format".to_string(), + target: "check".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); @@ -5628,18 +6008,58 @@ mod tests { // and we validate that they are still grouped under the batch?" let test_tasks = vec![ - Task::new("app", "build") - .with_project_root("") - .with_continuous(false), - Task::new("app", "test") - .with_project_root("") - .with_continuous(false), - Task::new("shared", "build") - .with_project_root("") - .with_continuous(false), - Task::new("shared", "test") - .with_project_root("") - .with_continuous(false), + Task { + id: "app:build".to_string(), + target: TaskTarget { + project: "app".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "app:test".to_string(), + target: TaskTarget { + project: "app".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "shared:build".to_string(), + target: TaskTarget { + project: "shared".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "shared:test".to_string(), + target: TaskTarget { + project: "shared".to_string(), + target: "test".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); @@ -5825,12 +6245,32 @@ mod tests { // This tests the transition from running batch with grouped tasks to individual tasks after completion let test_tasks = vec![ - Task::new("app", "build") - .with_project_root("") - .with_continuous(false), - Task::new("lib", "build") - .with_project_root("") - .with_continuous(false), + Task { + id: "app:build".to_string(), + target: TaskTarget { + project: "app".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, + Task { + id: "lib:build".to_string(), + target: TaskTarget { + project: "lib".to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some("".to_string()), + continuous: Some(false), + start_time: None, + end_time: None, + }, ]; let selection_manager = Arc::new(Mutex::new(TaskSelectionManager::new(10))); diff --git a/packages/nx/src/native/tui/components/terminal_pane.rs b/packages/nx/src/native/tui/components/terminal_pane.rs index db4d2ff4..b6eb3a19 100644 --- a/packages/nx/src/native/tui/components/terminal_pane.rs +++ b/packages/nx/src/native/tui/components/terminal_pane.rs @@ -20,7 +20,6 @@ use crate::native::tui::theme::THEME; use crate::native::tui::utils::{ format_duration_with_estimate, get_task_status_icon, get_task_status_style, }; -use crate::native::tui::vt100_adapter::Vt100CttScreen; use crate::native::tui::{action::Action, pty::PtyInstance}; /// Configuration for terminal pane layout and display constants @@ -686,8 +685,7 @@ impl<'a> StatefulWidget for TerminalPane<'a> { ScrollbarState::default() }; - let pseudo_term = - PseudoTerminal::new(Vt100CttScreen::wrap(&screen)).block(block); + let pseudo_term = PseudoTerminal::new(&*screen).block(block); Widget::render(pseudo_term, safe_area, buf); // Only render scrollbar if needed diff --git a/packages/nx/src/native/tui/inline_app.rs b/packages/nx/src/native/tui/inline_app.rs index 2f475908..3590f63a 100644 --- a/packages/nx/src/native/tui/inline_app.rs +++ b/packages/nx/src/native/tui/inline_app.rs @@ -1061,7 +1061,6 @@ impl InlineApp { pty: &Arc, ) { use crate::native::tui::theme::THEME; - use crate::native::tui::vt100_adapter::Vt100CttScreen; use ratatui::style::Style; use ratatui::widgets::Block; use tui_term::widget::PseudoTerminal; @@ -1074,7 +1073,7 @@ impl InlineApp { .border_style(Style::default().fg(THEME.primary_fg)); // Use PseudoTerminal with block - let pseudo_term = PseudoTerminal::new(Vt100CttScreen::wrap(&screen)).block(block); + let pseudo_term = PseudoTerminal::new(&*screen).block(block); f.render_widget(pseudo_term, area); } } @@ -1083,18 +1082,30 @@ impl InlineApp { #[cfg(test)] mod tests { use super::*; - use crate::native::tasks::types::TaskResult; + use crate::native::tasks::types::{TaskResult, TaskTarget}; use crate::native::tui::config; use crossterm::event::KeyEvent; use tokio::sync::mpsc; fn create_test_task(id: &str) -> Task { - Task::new(id, "build").with_project_root(format!("/tmp/{}", id)) + Task { + id: id.to_string(), + target: TaskTarget { + project: id.to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some(format!("/tmp/{}", id)), + start_time: None, + end_time: None, + continuous: None, + } } fn create_test_inline_app() -> InlineApp { let tasks = vec![create_test_task("app1"), create_test_task("app2")]; - let initiating_tasks = HashSet::from([String::from("app1:build")]); + let initiating_tasks = HashSet::from([String::from("app1")]); let task_graph = TaskGraph { tasks: HashMap::new(), dependencies: HashMap::new(), @@ -1201,8 +1212,8 @@ mod tests { let (tx, _rx) = mpsc::unbounded_channel(); // Mark all tasks as completed - app.update_task_status("app1:build", TaskStatus::Success); - app.update_task_status("app2:build", TaskStatus::Success); + app.update_task_status("app1", TaskStatus::Success); + app.update_task_status("app2", TaskStatus::Success); let event = tui::Event::Key(KeyEvent::new(KeyCode::Char('q'), KeyModifiers::NONE)); let result = app.handle_event(event, &tx).unwrap(); @@ -1334,15 +1345,15 @@ mod tests { let mut app = create_test_inline_app(); // Register non-interactive PTY (simpler test) - app.register_running_non_interactive_task(String::from("app1:build")); + app.register_running_non_interactive_task(String::from("app1")); // Verify scrollback tracking initialized - assert_eq!(app.task_scrollback_lines.get("app1:build"), Some(&0)); + assert_eq!(app.task_scrollback_lines.get("app1"), Some(&0)); // Verify PTY registered in state let state_ref = app.get_state(); let state = state_ref.lock(); - assert!(state.get_pty_instance("app1:build").is_some()); + assert!(state.get_pty_instance("app1").is_some()); } #[test] @@ -1367,24 +1378,18 @@ mod tests { // Verify status updated in state let state_ref = app.get_state(); let state = state_ref.lock(); - assert_eq!( - state.get_task_status("app1:build"), - Some(TaskStatus::InProgress) - ); + assert_eq!(state.get_task_status("app1"), Some(TaskStatus::InProgress)); } #[test] fn test_update_task_status() { let mut app = create_test_inline_app(); - app.update_task_status("app1:build", TaskStatus::Success); + app.update_task_status("app1", TaskStatus::Success); let state_ref = app.get_state(); let state = state_ref.lock(); - assert_eq!( - state.get_task_status("app1:build"), - Some(TaskStatus::Success) - ); + assert_eq!(state.get_task_status("app1"), Some(TaskStatus::Success)); } #[test] @@ -1406,7 +1411,7 @@ mod tests { // Verify timing recorded let state_ref = app.get_state(); let state = state_ref.lock(); - let (start, end) = state.get_task_timing("app1:build"); + let (start, end) = state.get_task_timing("app1"); assert!(start.is_some()); assert!(end.is_some()); } @@ -1421,13 +1426,10 @@ mod tests { assert!(app.get_current_running_item().is_none()); // Start a task - app.update_task_status("app1:build", TaskStatus::InProgress); + app.update_task_status("app1", TaskStatus::InProgress); // Should find running task - assert_eq!( - app.get_current_running_item(), - Some(String::from("app1:build")) - ); + assert_eq!(app.get_current_running_item(), Some(String::from("app1"))); } #[test] @@ -1615,13 +1617,13 @@ mod tests { let mut app = create_test_inline_app(); // Register same task twice - app.register_running_non_interactive_task(String::from("app1:build")); - app.register_running_non_interactive_task(String::from("app1:build")); + app.register_running_non_interactive_task(String::from("app1")); + app.register_running_non_interactive_task(String::from("app1")); // Should overwrite, not panic let state_ref = app.get_state(); let state = state_ref.lock(); - assert!(state.get_pty_instance("app1:build").is_some()); + assert!(state.get_pty_instance("app1").is_some()); } #[test] @@ -1644,16 +1646,28 @@ mod tests { #[cfg(test)] mod integration_tests { use super::*; - use crate::native::tasks::types::TaskResult; + use crate::native::tasks::types::{TaskResult, TaskTarget}; use crate::native::tui::config; fn create_test_task(id: &str) -> Task { - Task::new(id, "build").with_project_root(format!("/tmp/{}", id)) + Task { + id: id.to_string(), + target: TaskTarget { + project: id.to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some(format!("/tmp/{}", id)), + start_time: None, + end_time: None, + continuous: None, + } } fn create_test_inline_app() -> InlineApp { let tasks = vec![create_test_task("app1"), create_test_task("app2")]; - let initiating_tasks = HashSet::from([String::from("app1:build")]); + let initiating_tasks = HashSet::from([String::from("app1")]); let task_graph = TaskGraph { tasks: HashMap::new(), dependencies: HashMap::new(), @@ -1690,10 +1704,10 @@ mod integration_tests { app.start_tasks(tasks); // Register PTY - app.register_running_non_interactive_task(String::from("app1:build")); + app.register_running_non_interactive_task(String::from("app1")); // Update to success - app.update_task_status("app1:build", TaskStatus::Success); + app.update_task_status("app1", TaskStatus::Success); // End tasks app.end_tasks(vec![TaskResult { @@ -1709,11 +1723,8 @@ mod integration_tests { // Verify final state let state_ref = app.get_state(); let state = state_ref.lock(); - assert_eq!( - state.get_task_status("app1:build"), - Some(TaskStatus::Success) - ); - assert!(state.get_pty_instance("app1:build").is_some()); + assert_eq!(state.get_task_status("app1"), Some(TaskStatus::Success)); + assert!(state.get_pty_instance("app1").is_some()); } #[test] @@ -1748,15 +1759,12 @@ mod integration_tests { let app2 = InlineApp::with_state(state.clone(), None).unwrap(); // Modify through app1 - app1.update_task_status("shared:build", TaskStatus::Success); + app1.update_task_status("shared", TaskStatus::Success); // Verify visible through app2 assert!(!app2.should_quit()); // Can access state without issues let state2_ref = app2.get_state(); let state2 = state2_ref.lock(); - assert_eq!( - state2.get_task_status("shared:build"), - Some(TaskStatus::Success) - ); + assert_eq!(state2.get_task_status("shared"), Some(TaskStatus::Success)); } } diff --git a/packages/nx/src/native/tui/mod.rs b/packages/nx/src/native/tui/mod.rs index 578cd613..90affb4e 100644 --- a/packages/nx/src/native/tui/mod.rs +++ b/packages/nx/src/native/tui/mod.rs @@ -16,7 +16,6 @@ pub mod tui_app; pub mod tui_core; pub mod tui_state; pub mod utils; -pub mod vt100_adapter; pub use inline_app::InlineApp; pub use lifecycle::BatchInfo; diff --git a/packages/nx/src/native/tui/tui_state.rs b/packages/nx/src/native/tui/tui_state.rs index 9c1bd20e..edddaba9 100644 --- a/packages/nx/src/native/tui/tui_state.rs +++ b/packages/nx/src/native/tui/tui_state.rs @@ -615,15 +615,28 @@ static_assertions::assert_impl_all!(TuiState: Send); #[cfg(test)] mod tests { use super::*; + use crate::native::tasks::types::TaskTarget; use crate::native::tui::config; fn create_test_task(id: &str) -> Task { - Task::new(id, "build").with_project_root(format!("/tmp/{}", id)) + Task { + id: id.to_string(), + target: TaskTarget { + project: id.to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some(format!("/tmp/{}", id)), + start_time: None, + end_time: None, + continuous: None, + } } fn create_test_state() -> TuiState { let tasks = vec![create_test_task("app1"), create_test_task("app2")]; - let initiating_tasks = HashSet::from([String::from("app1:build")]); + let initiating_tasks = HashSet::from([String::from("app1")]); let task_graph = TaskGraph { tasks: HashMap::new(), dependencies: HashMap::new(), @@ -656,19 +669,13 @@ mod tests { let mut state = create_test_state(); // Initial status should be NotStarted - assert_eq!( - state.get_task_status("app1:build"), - Some(TaskStatus::NotStarted) - ); + assert_eq!(state.get_task_status("app1"), Some(TaskStatus::NotStarted)); // Update status - state.update_task_status("app1:build", TaskStatus::InProgress); + state.update_task_status("app1", TaskStatus::InProgress); // Verify status updated - assert_eq!( - state.get_task_status("app1:build"), - Some(TaskStatus::InProgress) - ); + assert_eq!(state.get_task_status("app1"), Some(TaskStatus::InProgress)); } #[test] @@ -680,12 +687,12 @@ mod tests { #[test] fn test_get_task_status_map() { let mut state = create_test_state(); - state.update_task_status("app1:build", TaskStatus::Success); - state.update_task_status("app2:build", TaskStatus::InProgress); + state.update_task_status("app1", TaskStatus::Success); + state.update_task_status("app2", TaskStatus::InProgress); let map = state.get_task_status_map(); - assert_eq!(map.get("app1:build"), Some(&TaskStatus::Success)); - assert_eq!(map.get("app2:build"), Some(&TaskStatus::InProgress)); + assert_eq!(map.get("app1"), Some(&TaskStatus::Success)); + assert_eq!(map.get("app2"), Some(&TaskStatus::InProgress)); } // === PTY Management Tests === @@ -698,10 +705,10 @@ mod tests { let pty = Arc::new(PtyInstance::non_interactive_with_dimensions(24, 80)); // Register PTY - state.register_pty_instance(String::from("app1:build"), pty.clone()); + state.register_pty_instance(String::from("app1"), pty.clone()); // Verify PTY is retrievable - let retrieved = state.get_pty_instance("app1:build"); + let retrieved = state.get_pty_instance("app1"); assert!(retrieved.is_some()); assert!(Arc::ptr_eq(&pty, &retrieved.unwrap())); } @@ -719,13 +726,13 @@ mod tests { let pty1 = Arc::new(PtyInstance::non_interactive_with_dimensions(24, 80)); let pty2 = Arc::new(PtyInstance::non_interactive_with_dimensions(30, 120)); - state.register_pty_instance(String::from("app1:build"), pty1.clone()); - state.register_pty_instance(String::from("app2:build"), pty2.clone()); + state.register_pty_instance(String::from("app1"), pty1.clone()); + state.register_pty_instance(String::from("app2"), pty2.clone()); let instances = state.get_pty_instances(); assert_eq!(instances.len(), 2); - assert!(instances.contains_key("app1:build")); - assert!(instances.contains_key("app2:build")); + assert!(instances.contains_key("app1")); + assert!(instances.contains_key("app2")); } // === Quit Management Tests === @@ -810,7 +817,7 @@ mod tests { // Record start let before_start = current_timestamp_millis(); - state.record_task_start("app1:build"); + state.record_task_start("app1"); let after_start = current_timestamp_millis(); // Small delay @@ -818,11 +825,11 @@ mod tests { // Record end let before_end = current_timestamp_millis(); - state.record_task_end("app1:build"); + state.record_task_end("app1"); let after_end = current_timestamp_millis(); // Verify timings - let (start, end) = state.get_task_timing("app1:build"); + let (start, end) = state.get_task_timing("app1"); assert!(start.is_some()); assert!(end.is_some()); @@ -851,14 +858,14 @@ mod tests { fn test_get_task_start_and_end_times() { let mut state = create_test_state(); - state.record_task_start("app1:build"); - state.record_task_end("app1:build"); + state.record_task_start("app1"); + state.record_task_end("app1"); let start_times = state.get_task_start_times(); let end_times = state.get_task_end_times(); - assert!(start_times.contains_key("app1:build")); - assert!(end_times.contains_key("app1:build")); + assert!(start_times.contains_key("app1")); + assert!(end_times.contains_key("app1")); } // === User Interaction Tests === @@ -916,6 +923,7 @@ mod tests { #[cfg(test)] mod integration_tests { use super::*; + use crate::native::tasks::types::TaskTarget; use crate::native::tui::config; #[test] @@ -928,14 +936,14 @@ mod integration_tests { let state_clone = state.clone(); let handle = std::thread::spawn(move || { let mut s = state_clone.lock(); - s.update_task_status("app1:build", TaskStatus::Success); + s.update_task_status("app1", TaskStatus::Success); }); handle.join().unwrap(); // Verify change is visible let s = state.lock(); - assert_eq!(s.get_task_status("app1:build"), Some(TaskStatus::Success)); + assert_eq!(s.get_task_status("app1"), Some(TaskStatus::Success)); } #[test] @@ -956,7 +964,7 @@ mod integration_tests { fn create_test_state() -> TuiState { let tasks = vec![create_test_task("app1"), create_test_task("app2")]; - let initiating_tasks = HashSet::from([String::from("app1:build")]); + let initiating_tasks = HashSet::from([String::from("app1")]); let task_graph = TaskGraph { tasks: HashMap::new(), dependencies: HashMap::new(), @@ -983,6 +991,18 @@ mod integration_tests { } fn create_test_task(id: &str) -> Task { - Task::new(id, "build").with_project_root(format!("/tmp/{}", id)) + Task { + id: id.to_string(), + target: TaskTarget { + project: id.to_string(), + target: "build".to_string(), + configuration: None, + }, + outputs: vec![], + project_root: Some(format!("/tmp/{}", id)), + start_time: None, + end_time: None, + continuous: None, + } } } diff --git a/packages/nx/src/native/tui/vt100_adapter.rs b/packages/nx/src/native/tui/vt100_adapter.rs deleted file mode 100644 index 14dd77f9..00000000 --- a/packages/nx/src/native/tui/vt100_adapter.rs +++ /dev/null @@ -1,101 +0,0 @@ -//! Bridges `vt100_ctt::Screen` / `vt100_ctt::Cell` to the public traits in -//! `tui_term::widget`. We can't `impl Screen for vt100_ctt::Screen` directly -//! because of the orphan rule, so we wrap them in `#[repr(transparent)]` -//! newtypes and do a zero-cost reference cast. -//! -//! Allows `ratatui::style::Color` because PTY output is colours the child -//! process emitted; light/dark theme adjustment doesn't apply here. - -#![allow(clippy::disallowed_types)] - -use ratatui::buffer::Cell as BufferCell; -use ratatui::style::{Color, Modifier, Style}; -use tui_term::widget::{Cell, Screen}; - -#[repr(transparent)] -pub struct Vt100CttScreen(vt100_ctt::Screen); - -impl Vt100CttScreen { - pub fn wrap(screen: &vt100_ctt::Screen) -> &Self { - // SAFETY: `Vt100CttScreen` is `#[repr(transparent)]` over `vt100_ctt::Screen`, - // so `&vt100_ctt::Screen` and `&Vt100CttScreen` have identical layout, ABI, - // and alignment. The borrow's lifetime is preserved by the cast. - unsafe { &*(screen as *const vt100_ctt::Screen as *const Self) } - } -} - -#[repr(transparent)] -pub struct Vt100CttCell(vt100_ctt::Cell); - -impl Vt100CttCell { - fn wrap(cell: &vt100_ctt::Cell) -> &Self { - // SAFETY: see `Vt100CttScreen::wrap` — same `#[repr(transparent)]` invariant. - unsafe { &*(cell as *const vt100_ctt::Cell as *const Self) } - } -} - -impl Screen for Vt100CttScreen { - type C = Vt100CttCell; - - #[inline] - fn cell(&self, row: u16, col: u16) -> Option<&Self::C> { - self.0.cell(row, col).map(Vt100CttCell::wrap) - } - - #[inline] - fn hide_cursor(&self) -> bool { - self.0.hide_cursor() - } - - #[inline] - fn cursor_position(&self) -> (u16, u16) { - let (row, col) = self.0.cursor_position(); - let scrollback = u16::try_from(self.0.scrollback()).unwrap_or(u16::MAX); - (row.saturating_add(scrollback), col) - } -} - -impl Cell for Vt100CttCell { - #[inline] - fn has_contents(&self) -> bool { - self.0.has_contents() - } - - #[inline] - fn apply(&self, buf_cell: &mut BufferCell) { - if self.0.has_contents() { - buf_cell.set_symbol(&self.0.contents()); - } - - let mut modifier = Modifier::empty(); - if self.0.bold() { - modifier |= Modifier::BOLD; - } - if self.0.italic() { - modifier |= Modifier::ITALIC; - } - if self.0.underline() { - modifier |= Modifier::UNDERLINED; - } - if self.0.inverse() { - modifier |= Modifier::REVERSED; - } - if self.0.dimmed() { - modifier |= Modifier::DIM; - } - - let fg = map_color(self.0.fgcolor()); - let bg = map_color(self.0.bgcolor()); - - buf_cell.set_style(Style::reset().fg(fg).bg(bg).add_modifier(modifier)); - } -} - -#[inline] -fn map_color(color: vt100_ctt::Color) -> Color { - match color { - vt100_ctt::Color::Default => Color::Reset, - vt100_ctt::Color::Idx(i) => Color::Indexed(i), - vt100_ctt::Color::Rgb(r, g, b) => Color::Rgb(r, g, b), - } -} diff --git a/packages/nx/src/plugins/js/lock-file/npm-parser.spec.ts b/packages/nx/src/plugins/js/lock-file/npm-parser.spec.ts index 9d3f9082..8a82055e 100644 --- a/packages/nx/src/plugins/js/lock-file/npm-parser.spec.ts +++ b/packages/nx/src/plugins/js/lock-file/npm-parser.spec.ts @@ -1506,200 +1506,6 @@ describe('NPM lock file utility', () => { ); }); }); - - describe('transitive workspace dependencies', () => { - function makeGraph( - workspaceProjects: Array<{ - projectName: string; - packageName: string; - root: string; - }>, - workspaceDeps: Record, - externalNodes: ProjectGraph['externalNodes'], - externalDeps: Record = {} - ): ProjectGraph { - const nodes: ProjectGraph['nodes'] = {}; - const dependencies: ProjectGraph['dependencies'] = {}; - for (const { projectName, packageName, root } of workspaceProjects) { - nodes[projectName] = { - name: projectName, - type: 'lib', - data: { - root, - metadata: { js: { packageName } }, - }, - } as any; - dependencies[projectName] = [ - ...(workspaceDeps[projectName] ?? []).map((target) => ({ - source: projectName, - target, - type: 'static' as any, - })), - ...(externalDeps[projectName] ?? []).map((target) => ({ - source: projectName, - target, - type: 'static' as any, - })), - ]; - } - return { nodes, dependencies, externalNodes }; - } - - it('should include node_modules and workspace_modules entries for transitive workspace deps', () => { - // app -> @myorg/lib-a -> @myorg/lib-b -> lodash - const lockFile = { - name: 'test-app', - version: '1.0.0', - lockfileVersion: 3, - packages: { - '': { - name: 'test-app', - version: '1.0.0', - dependencies: { '@myorg/lib-a': 'file:libs/lib-a' }, - }, - 'libs/lib-a': { - name: '@myorg/lib-a', - version: '0.0.1', - dependencies: { '@myorg/lib-b': 'file:../lib-b' }, - }, - 'node_modules/@myorg/lib-a': { - resolved: 'libs/lib-a', - link: true, - }, - 'libs/lib-b': { - name: '@myorg/lib-b', - version: '0.0.1', - dependencies: { lodash: '^4.17.21' }, - }, - 'node_modules/@myorg/lib-b': { - resolved: 'libs/lib-b', - link: true, - }, - 'node_modules/lodash': { - version: '4.17.21', - resolved: 'https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz', - integrity: - 'sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==', - }, - }, - }; - - const packageJson = { - name: 'test-app', - version: '1.0.0', - dependencies: { '@myorg/lib-a': 'file:libs/lib-a' }, - }; - - const graph = makeGraph( - [ - { - projectName: '@myorg/lib-a', - packageName: '@myorg/lib-a', - root: 'libs/lib-a', - }, - { - projectName: '@myorg/lib-b', - packageName: '@myorg/lib-b', - root: 'libs/lib-b', - }, - ], - { '@myorg/lib-a': ['@myorg/lib-b'] }, - { - 'npm:lodash': { - type: 'npm', - name: 'npm:lodash', - data: { - version: '4.17.21', - packageName: 'lodash', - hash: 'sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==', - }, - }, - }, - { '@myorg/lib-b': ['npm:lodash'] } - ); - - const prunedGraph = pruneProjectGraph(graph, packageJson); - const result = JSON.parse( - stringifyNpmLockfile(prunedGraph, JSON.stringify(lockFile), packageJson) - ); - - expect(result.packages).toHaveProperty('node_modules/@myorg/lib-a'); - expect(result.packages).toHaveProperty('workspace_modules/@myorg/lib-a'); - expect(result.packages).toHaveProperty('node_modules/@myorg/lib-b'); - expect(result.packages).toHaveProperty('workspace_modules/@myorg/lib-b'); - expect(result.packages).toHaveProperty('node_modules/lodash'); - expect( - result.packages['workspace_modules/@myorg/lib-a'].dependencies - ).toEqual({ '@myorg/lib-b': 'file:../lib-b' }); - }); - - it('should not infinite-loop on circular workspace dependencies', () => { - const lockFile = { - name: 'test-app', - version: '1.0.0', - lockfileVersion: 3, - packages: { - '': { - name: 'test-app', - version: '1.0.0', - dependencies: { '@myorg/lib-a': 'file:libs/lib-a' }, - }, - 'libs/lib-a': { - name: '@myorg/lib-a', - version: '0.0.1', - dependencies: { '@myorg/lib-b': 'file:../lib-b' }, - }, - 'node_modules/@myorg/lib-a': { - resolved: 'libs/lib-a', - link: true, - }, - 'libs/lib-b': { - name: '@myorg/lib-b', - version: '0.0.1', - dependencies: { '@myorg/lib-a': 'file:../lib-a' }, - }, - 'node_modules/@myorg/lib-b': { - resolved: 'libs/lib-b', - link: true, - }, - }, - }; - - const packageJson = { - name: 'test-app', - version: '1.0.0', - dependencies: { '@myorg/lib-a': 'file:libs/lib-a' }, - }; - - const graph = makeGraph( - [ - { - projectName: '@myorg/lib-a', - packageName: '@myorg/lib-a', - root: 'libs/lib-a', - }, - { - projectName: '@myorg/lib-b', - packageName: '@myorg/lib-b', - root: 'libs/lib-b', - }, - ], - { - '@myorg/lib-a': ['@myorg/lib-b'], - '@myorg/lib-b': ['@myorg/lib-a'], - }, - {} - ); - - const prunedGraph = pruneProjectGraph(graph, packageJson); - const result = JSON.parse( - stringifyNpmLockfile(prunedGraph, JSON.stringify(lockFile), packageJson) - ); - - expect(result.packages).toHaveProperty('workspace_modules/@myorg/lib-a'); - expect(result.packages).toHaveProperty('workspace_modules/@myorg/lib-b'); - }); - }); }); function uniq(str: string) { diff --git a/packages/nx/src/plugins/js/lock-file/npm-parser.ts b/packages/nx/src/plugins/js/lock-file/npm-parser.ts index abbbfedb..4ffe442b 100644 --- a/packages/nx/src/plugins/js/lock-file/npm-parser.ts +++ b/packages/nx/src/plugins/js/lock-file/npm-parser.ts @@ -444,52 +444,36 @@ export function stringifyNpmLockfile( return JSON.stringify(output, null, 2); } -const WORKSPACE_DEP_TYPES = [ - 'dependencies', - 'optionalDependencies', - 'peerDependencies', -] as const; - function mapWorkspaceModules( packageJson: NormalizedPackageJson, rootLockFile: NpmLockFile, workspaceModules: Map ) { const output: Record = {}; - const snapshotsByName = new Map(); - for (const snapshot of Object.values( - rootLockFile.packages || rootLockFile.dependencies || {} + for (const [pkgName, pkgVersion] of Object.entries( + packageJson.dependencies ?? {} )) { - if (snapshot.name) snapshotsByName.set(snapshot.name, snapshot); - } - - // Walk transitive workspace deps so every workspace package - // copy-workspace-modules writes to disk has matching lockfile entries. - // Without this, `npm ci` errors with "Missing: from lock file". - const queue: string[] = Object.keys(packageJson.dependencies ?? {}); - const visited = new Set(); - while (queue.length > 0) { - const pkgName = queue.shift()!; - if (visited.has(pkgName) || !workspaceModules.has(pkgName)) continue; - visited.add(pkgName); - - const snapshot = snapshotsByName.get(pkgName); - - output[`node_modules/${pkgName}`] = { - version: `file:./workspace_modules/${pkgName}`, - resolved: `workspace_modules/${pkgName}`, - link: true, - }; - output[`workspace_modules/${pkgName}`] = { - name: pkgName, - version: `0.0.1`, - dependencies: snapshot?.dependencies, - }; + if (workspaceModules.has(pkgName)) { + let workspaceModuleDefinition: NpmDependencyV3 & NpmDependencyV1; + for (const [depName, depSnapshot] of Object.entries( + rootLockFile.packages || rootLockFile.dependencies + )) { + if (depSnapshot.name === pkgName) { + workspaceModuleDefinition = depSnapshot; + break; + } + } - for (const depType of WORKSPACE_DEP_TYPES) { - const deps = snapshot?.[depType]; - if (!deps) continue; - for (const depName of Object.keys(deps)) queue.push(depName); + output[`node_modules/${pkgName}`] = { + version: `file:./workspace_modules/${pkgName}`, + resolved: `workspace_modules/${pkgName}`, + link: true, + }; + output[`workspace_modules/${pkgName}`] = { + name: pkgName, + version: `0.0.1`, + dependencies: workspaceModuleDefinition.dependencies, + }; } } return output; diff --git a/packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts b/packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts index 1f00f752..7a2efbba 100644 --- a/packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts +++ b/packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts @@ -2543,294 +2543,4 @@ snapshots: `); }); }); - - describe('transitive workspace dependencies', () => { - beforeEach(() => { - vol.fromJSON( - { 'node_modules/.modules.yaml': `hoistedDependencies: {}` }, - '/root' - ); - }); - - function makeGraph( - workspaceProjects: Array<{ - projectName: string; - packageName: string; - root: string; - }>, - workspaceDeps: Record, - externalNodes: Record, - externalDeps: Record = {} - ): ProjectGraph { - const nodes: ProjectGraph['nodes'] = {}; - const dependencies: ProjectGraph['dependencies'] = {}; - for (const { projectName, packageName, root } of workspaceProjects) { - nodes[projectName] = { - name: projectName, - type: 'lib', - data: { - root, - metadata: { js: { packageName } }, - }, - } as any; - dependencies[projectName] = [ - ...(workspaceDeps[projectName] ?? []).map((target) => ({ - source: projectName, - target, - type: 'static' as any, - })), - ...(externalDeps[projectName] ?? []).map((target) => ({ - source: projectName, - target, - type: 'static' as any, - })), - ]; - } - return { nodes, dependencies, externalNodes }; - } - - it('should include importer blocks and npm packages for transitive workspace deps', () => { - // app -> @myorg/lib-a (workspace:*) -> @myorg/lib-b (workspace:*) -> lodash - const lockFile = `lockfileVersion: '9.0' - -importers: - - .: - dependencies: - '@myorg/lib-a': - specifier: workspace:* - version: link:libs/lib-a - - libs/lib-a: - dependencies: - '@myorg/lib-b': - specifier: workspace:* - version: link:../lib-b - - libs/lib-b: - dependencies: - lodash: - specifier: ^4.17.21 - version: 4.17.21 - -packages: - - lodash@4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} - -snapshots: - - lodash@4.17.21: {}`; - - const packageJson = { - name: 'test-app', - version: '1.0.0', - dependencies: { '@myorg/lib-a': 'workspace:*' }, - }; - - const graph = makeGraph( - [ - { - projectName: '@myorg/lib-a', - packageName: '@myorg/lib-a', - root: 'libs/lib-a', - }, - { - projectName: '@myorg/lib-b', - packageName: '@myorg/lib-b', - root: 'libs/lib-b', - }, - ], - { - '@myorg/lib-a': ['@myorg/lib-b'], - }, - { - 'npm:lodash': { - type: 'npm', - name: 'npm:lodash', - data: { - version: '4.17.21', - packageName: 'lodash', - hash: 'sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==', - }, - }, - }, - { - '@myorg/lib-b': ['npm:lodash'], - } - ); - - const prunedGraph = pruneProjectGraph(graph, packageJson); - const result = stringifyPnpmLockfile( - prunedGraph, - lockFile, - packageJson, - '/virtual' - ); - - expect(result).toContain(`workspace_modules/@myorg/lib-a:`); - expect(result).toContain(`workspace_modules/@myorg/lib-b:`); - // Specifier must be `file:` to match what copy-workspace-modules writes - // to package.json — `workspace:*` would produce ERR_PNPM_OUTDATED_LOCKFILE. - expect(result).toMatch( - /'@myorg\/lib-a':\s+specifier: file:\.\/workspace_modules\/@myorg\/lib-a/ - ); - expect(result).toMatch( - /'@myorg\/lib-b':\s+specifier: file:\.\.\/lib-b\s+version: link:\.\.\/lib-b/ - ); - expect(result).toContain(`lodash@4.17.21:`); - }); - - it('should not infinite-loop on circular workspace dependencies', () => { - const lockFile = `lockfileVersion: '9.0' - -importers: - - .: - dependencies: - '@myorg/lib-a': - specifier: workspace:* - version: link:libs/lib-a - - libs/lib-a: - dependencies: - '@myorg/lib-b': - specifier: workspace:* - version: link:../lib-b - - libs/lib-b: - dependencies: - '@myorg/lib-a': - specifier: workspace:* - version: link:../lib-a - -packages: {} - -snapshots: {}`; - - const packageJson = { - name: 'test-app', - version: '1.0.0', - dependencies: { '@myorg/lib-a': 'workspace:*' }, - }; - - const graph = makeGraph( - [ - { - projectName: '@myorg/lib-a', - packageName: '@myorg/lib-a', - root: 'libs/lib-a', - }, - { - projectName: '@myorg/lib-b', - packageName: '@myorg/lib-b', - root: 'libs/lib-b', - }, - ], - { - '@myorg/lib-a': ['@myorg/lib-b'], - '@myorg/lib-b': ['@myorg/lib-a'], - }, - {} - ); - - const prunedGraph = pruneProjectGraph(graph, packageJson); - const result = stringifyPnpmLockfile( - prunedGraph, - lockFile, - packageJson, - '/virtual' - ); - - expect(result).toContain(`workspace_modules/@myorg/lib-a:`); - expect(result).toContain(`workspace_modules/@myorg/lib-b:`); - }); - - it('should produce a single importer for diamond workspace dependency shapes', () => { - // app -> lib-a -> shared - // app -> lib-b -> shared - const lockFile = `lockfileVersion: '9.0' - -importers: - - .: - dependencies: - '@myorg/lib-a': - specifier: workspace:* - version: link:libs/lib-a - '@myorg/lib-b': - specifier: workspace:* - version: link:libs/lib-b - - libs/lib-a: - dependencies: - '@myorg/shared': - specifier: workspace:* - version: link:../shared - - libs/lib-b: - dependencies: - '@myorg/shared': - specifier: workspace:* - version: link:../shared - - libs/shared: - dependencies: {} - -packages: {} - -snapshots: {}`; - - const packageJson = { - name: 'test-app', - version: '1.0.0', - dependencies: { - '@myorg/lib-a': 'workspace:*', - '@myorg/lib-b': 'workspace:*', - }, - }; - - const graph = makeGraph( - [ - { - projectName: '@myorg/lib-a', - packageName: '@myorg/lib-a', - root: 'libs/lib-a', - }, - { - projectName: '@myorg/lib-b', - packageName: '@myorg/lib-b', - root: 'libs/lib-b', - }, - { - projectName: '@myorg/shared', - packageName: '@myorg/shared', - root: 'libs/shared', - }, - ], - { - '@myorg/lib-a': ['@myorg/shared'], - '@myorg/lib-b': ['@myorg/shared'], - }, - {} - ); - - const prunedGraph = pruneProjectGraph(graph, packageJson); - const result = stringifyPnpmLockfile( - prunedGraph, - lockFile, - packageJson, - '/virtual' - ); - - // Exactly one importer block for shared. - const sharedImporters = - result.match(/workspace_modules\/@myorg\/shared:/g) ?? []; - expect(sharedImporters).toHaveLength(1); - // Both consumers point at it via the flat layout. - expect(result).toMatch( - /'@myorg\/shared':\s+specifier: file:\.\.\/shared\s+version: link:\.\.\/shared/ - ); - }); - }); }); diff --git a/packages/nx/src/plugins/js/lock-file/pnpm-parser.ts b/packages/nx/src/plugins/js/lock-file/pnpm-parser.ts index 90dc36ed..313e65d6 100644 --- a/packages/nx/src/plugins/js/lock-file/pnpm-parser.ts +++ b/packages/nx/src/plugins/js/lock-file/pnpm-parser.ts @@ -28,16 +28,9 @@ import { hashArray } from '../../../hasher/file-hasher'; import { CreateDependenciesContext } from '../../../project-graph/plugins'; import { getCatalogManager } from '../../../utils/catalog'; import { findNodeMatchingVersion } from './project-graph-pruning'; -import { join, relative, sep } from 'path'; +import { join } from 'path'; import { getWorkspacePackagesFromGraph } from '../utils/get-workspace-packages-from-graph'; import { satisfies, validRange } from 'semver'; - -const WORKSPACE_DEP_TYPES = [ - 'dependencies', - 'optionalDependencies', - 'peerDependencies', -] as const; - let currentLockFileHash: string; let parsedLockFile: Lockfile; @@ -596,55 +589,13 @@ export function stringifyPnpmLockfile( +lockfileVersion ); - const workspaceModules = getWorkspacePackagesFromGraph(graph); - - // Walk transitive workspace deps so every package copy-workspace-modules - // writes to disk has a matching importer block. Without this, pnpm errors - // with ERR_PNPM_OUTDATED_LOCKFILE on transitive workspace chains. - const allRequiredImporters: Record = { ...requiredImporters }; - const queue = Object.keys(requiredImporters); - while (queue.length > 0) { - const pkgName = queue.shift()!; - const importer = importers[allRequiredImporters[pkgName]]; - if (!importer) continue; - for (const depType of WORKSPACE_DEP_TYPES) { - const deps = importer[depType]; - if (!deps) continue; - for (const depName of Object.keys(deps)) { - if (workspaceModules.has(depName) && !allRequiredImporters[depName]) { - allRequiredImporters[depName] = - workspaceModules.get(depName)!.data.root; - queue.push(depName); - } - } - } - } - const workspaceDependencyImporters: Record = {}; - for (const [packageName, importerPath] of Object.entries( - allRequiredImporters - )) { + for (const [packageName, importerPath] of Object.entries(requiredImporters)) { const baseImporter = importers[importerPath]; - if (!baseImporter) continue; - const importer: ProjectSnapshot = structuredClone(baseImporter); - - for (const depType of WORKSPACE_DEP_TYPES) { - const deps = importer[depType] as Record | undefined; - if (!deps) continue; - for (const depName of Object.keys(deps)) { - if (!workspaceModules.has(depName)) continue; - // All workspace modules are siblings under workspace_modules/, so the - // relative path between them is relative(packageName, depName). - // Specifier must match the file: ref copy-workspace-modules writes - // to the package's package.json — pnpm errors on a mismatch. - const rel = relative(packageName, depName).split(sep).join('/'); - if (!importer.specifiers) importer.specifiers = {}; - importer.specifiers[depName] = `file:${rel}`; - deps[depName] = `link:${rel}`; - } + if (baseImporter) { + workspaceDependencyImporters[`workspace_modules/${packageName}`] = + baseImporter; } - - workspaceDependencyImporters[`workspace_modules/${packageName}`] = importer; } const output: Lockfile = { diff --git a/packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts b/packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts index a1c48123..4d604028 100644 --- a/packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts +++ b/packages/nx/src/plugins/js/lock-file/project-graph-pruning.ts @@ -188,20 +188,12 @@ function traverseNode( function traverseWorkspaceNode( graph: ProjectGraph, builder: ProjectGraphBuilder, - node: ProjectGraphProjectNode, - visited: Set = new Set() + node: ProjectGraphProjectNode ) { - if (visited.has(node.name)) return; - visited.add(node.name); graph.dependencies[node.name]?.forEach((dep) => { - const externalDepNode = graph.externalNodes[dep.target]; - if (externalDepNode) { - traverseNode(graph, builder, externalDepNode); - return; - } - const workspaceDepNode = graph.nodes[dep.target]; - if (workspaceDepNode) { - traverseWorkspaceNode(graph, builder, workspaceDepNode, visited); + const depNode = graph.externalNodes[dep.target]; + if (depNode) { + traverseNode(graph, builder, depNode); } }); } diff --git a/packages/nx/src/plugins/package-json/create-nodes.spec.ts b/packages/nx/src/plugins/package-json/create-nodes.spec.ts index 0cb2f7f3..84e7b4ed 100644 --- a/packages/nx/src/plugins/package-json/create-nodes.spec.ts +++ b/packages/nx/src/plugins/package-json/create-nodes.spec.ts @@ -1,30 +1,15 @@ import '../../internal-testing-utils/mock-fs'; -import { join } from 'node:path'; import { vol } from 'memfs'; import { createNodeFromPackageJson, createNodesV2 } from './create-nodes'; -import { workspaceDataDirectory } from '../../utils/cache-directory'; import { PluginCache } from '../../utils/plugin-cache-utils'; -const packageJsonCachePath = join(workspaceDataDirectory, 'package-json.hash'); - describe('nx package.json workspaces plugin', () => { const context = { workspaceRoot: '/root', nxJsonConfiguration: {}, }; - const packageManagerCommand = { - run: (script: string) => `npm run ${script}`, - } as any; - - beforeEach(() => { - // Ensure deterministic package manager detection: without a lockfile the - // detector falls back to npm_config_user_agent, which makes test output - // depend on whoever invoked jest (npm vs pnpm vs yarn). - vol.fromJSON({ 'package-lock.json': '{}' }, '/root'); - }); - afterEach(() => { vol.reset(); }); @@ -67,9 +52,8 @@ describe('nx package.json workspaces plugin', () => { createNodeFromPackageJson( 'package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ) ).toMatchInlineSnapshot(` { @@ -122,9 +106,8 @@ describe('nx package.json workspaces plugin', () => { createNodeFromPackageJson( 'packages/lib-a/package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ) ).toMatchInlineSnapshot(` { @@ -177,9 +160,8 @@ describe('nx package.json workspaces plugin', () => { createNodeFromPackageJson( 'packages/lib-b/package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ) ).toMatchInlineSnapshot(` { @@ -822,9 +804,8 @@ describe('nx package.json workspaces plugin', () => { createNodeFromPackageJson( 'apps/myapp/package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ).projects['apps/myapp'].projectType ).toEqual('application'); @@ -832,9 +813,8 @@ describe('nx package.json workspaces plugin', () => { createNodeFromPackageJson( 'packages/mylib/package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ).projects['packages/mylib'].projectType ).toEqual('library'); }); @@ -860,9 +840,8 @@ describe('nx package.json workspaces plugin', () => { createNodeFromPackageJson( 'package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ).projects['.'].projectType ).toEqual('library'); }); @@ -891,18 +870,16 @@ describe('nx package.json workspaces plugin', () => { createNodeFromPackageJson( 'packages/mylib/package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ).projects['packages/mylib'].projectType ).toEqual('library'); expect( createNodeFromPackageJson( 'example/package.json', '/root', - new PluginCache(packageJsonCachePath), - false, - packageManagerCommand + new PluginCache(), + false ).projects['example'].projectType ).toBeUndefined(); }); diff --git a/packages/nx/src/plugins/package-json/create-nodes.ts b/packages/nx/src/plugins/package-json/create-nodes.ts index fe3e932f..83e72da1 100644 --- a/packages/nx/src/plugins/package-json/create-nodes.ts +++ b/packages/nx/src/plugins/package-json/create-nodes.ts @@ -15,11 +15,6 @@ import { getTagsFromPackageJson, readTargetsFromPackageJson, } from '../../utils/package-json'; -import { - detectPackageManager, - getPackageManagerCommand, - PackageManagerCommands, -} from '../../utils/package-manager'; import { joinPathFragments } from '../../utils/path'; import { nxVersion } from '../../utils/versions'; import { @@ -64,11 +59,6 @@ export const createNodesV2: CreateNodesV2 = [ const cache = readPackageJsonConfigurationCache(); - const packageManagerCommand = getPackageManagerCommand( - detectPackageManager(context.workspaceRoot), - context.workspaceRoot - ); - return createNodesFromFiles( (packageJsonPath, options, context) => { const isInPackageManagerWorkspaces = @@ -85,8 +75,7 @@ export const createNodesV2: CreateNodesV2 = [ packageJsonPath, context.workspaceRoot, cache, - isInPackageManagerWorkspaces, - packageManagerCommand + isInPackageManagerWorkspaces ); }, packageJsons, @@ -184,8 +173,7 @@ export function createNodeFromPackageJson( pkgJsonPath: string, workspaceRoot: string, cache: PackageJsonConfigurationCache, - isInPackageManagerWorkspaces: boolean, - packageManagerCommand: PackageManagerCommands + isInPackageManagerWorkspaces: boolean ) { const json: PackageJson = readJsonFile(join(workspaceRoot, pkgJsonPath)); @@ -212,8 +200,7 @@ export function createNodeFromPackageJson( workspaceRoot, pkgJsonPath, readNxJson(workspaceRoot), - isInPackageManagerWorkspaces, - packageManagerCommand + isInPackageManagerWorkspaces ); cache.set(hash, project); @@ -229,8 +216,7 @@ export function buildProjectConfigurationFromPackageJson( workspaceRoot: string, packageJsonPath: string, nxJson: NxJsonConfiguration, - isInPackageManagerWorkspaces: boolean, - packageManagerCommand: PackageManagerCommands + isInPackageManagerWorkspaces: boolean ): ProjectConfiguration & { name: string } { const normalizedPath = packageJsonPath.split('\\').join('/'); const projectRoot = dirname(normalizedPath); @@ -270,8 +256,7 @@ export function buildProjectConfigurationFromPackageJson( packageJson, nxJson, projectRoot, - workspaceRoot, - packageManagerCommand + workspaceRoot ), tags: getTagsFromPackageJson(packageJson), metadata: getMetadataFromPackageJson( diff --git a/packages/nx/src/tasks-runner/batch/run-batch.ts b/packages/nx/src/tasks-runner/batch/run-batch.ts index d512c0f4..3c272c87 100644 --- a/packages/nx/src/tasks-runner/batch/run-batch.ts +++ b/packages/nx/src/tasks-runner/batch/run-batch.ts @@ -6,7 +6,7 @@ import { BatchResults, } from './batch-messages'; import { workspaceRoot } from '../../utils/workspace-root'; -import { combineOptionsForExecutor, Options } from '../../utils/params'; +import { combineOptionsForExecutor } from '../../utils/params'; import { TaskGraph } from '../../config/task-graph'; import { ExecutorContext } from '../../config/misc-interfaces'; import { readProjectsConfigurationFromProjectGraph } from '../../project-graph/project-graph'; @@ -62,7 +62,7 @@ async function runTasks( const targetConfiguration = projectConfiguration.targets[task.target.target]; input[task.id] = combineOptionsForExecutor( - task.overrides as Options, + task.overrides, task.target.configuration, targetConfiguration, batchExecutor.schema, diff --git a/packages/nx/src/tasks-runner/create-task-graph.ts b/packages/nx/src/tasks-runner/create-task-graph.ts index 510dedaf..37364441 100644 --- a/packages/nx/src/tasks-runner/create-task-graph.ts +++ b/packages/nx/src/tasks-runner/create-task-graph.ts @@ -42,7 +42,7 @@ export class ProcessTasks { projectNames: string[], targets: string[], configuration: string, - overrides: Record, + overrides: Object, excludeTaskDependencies: boolean ): string[] { for (const projectName of projectNames) { @@ -132,7 +132,7 @@ export class ProcessTasks { task: Task, projectUsedToDeriveDependencies: string, configuration: string, - overrides: Record + overrides: Object ): void { const seenKey = `${task.id}-${projectUsedToDeriveDependencies}`; if (this.seen.has(seenKey)) { @@ -187,10 +187,8 @@ export class ProcessTasks { dependencyConfig: TargetDependencyConfig, configuration: string, task: Task, - taskOverrides: - | Record - | { __overrides_unparsed__: string[] }, - overrides: Record + taskOverrides: Object | { __overrides_unparsed__: any[] }, + overrides: Object ) { if (dependencyConfig.projects.length === 0) { output.warn({ @@ -217,10 +215,8 @@ export class ProcessTasks { projectName: string, dependencyConfig: TargetDependencyConfig, configuration: string, - taskOverrides: - | Record - | { __overrides_unparsed__: string[] }, - overrides: Record + taskOverrides: Object | { __overrides_unparsed__: any[] }, + overrides: Object ) { const selfProject = this.projectGraph.nodes[ projectName @@ -270,10 +266,8 @@ export class ProcessTasks { dependencyConfig: TargetDependencyConfig, configuration: string, task: Task, - taskOverrides: - | Record - | { __overrides_unparsed__: string[] }, - overrides: Record + taskOverrides: Object | { __overrides_unparsed__: any[] }, + overrides: Object ): void { if ( !this.projectGraph.dependencies.hasOwnProperty( @@ -368,7 +362,7 @@ export class ProcessTasks { project: ProjectGraphProjectNode, target: string, resolvedConfiguration: string | undefined, - overrides: Record + overrides: Object ): Task { if (!project.data.targets[target]) { throw new Error( @@ -430,7 +424,7 @@ export function createTaskGraph( projectNames: string[], targets: string[], configuration: string | undefined, - overrides: Record, + overrides: Object, excludeTaskDependencies: boolean = false ): TaskGraph { const p = new ProcessTasks(extraTargetDependencies, projectGraph); diff --git a/packages/nx/src/tasks-runner/life-cycle.ts b/packages/nx/src/tasks-runner/life-cycle.ts index 724f7186..b3565c23 100644 --- a/packages/nx/src/tasks-runner/life-cycle.ts +++ b/packages/nx/src/tasks-runner/life-cycle.ts @@ -3,23 +3,23 @@ import { BatchInfo, BatchStatus, ExternalObject, - TaskResult, TaskStatus as NativeTaskStatus, } from '../native'; import { TaskStatus } from './tasks-runner'; /** - * The result of a completed {@link Task}. - * - * Defined as a Rust struct in `packages/nx/src/native/tasks/types.rs` and - * exposed to TypeScript via NAPI. Re-exported here so existing imports - * keep working. + * The result of a completed {@link Task} * * Task timing information (start and end timestamps) is available * on the {@link Task} object itself via {@link Task.startTime} and * {@link Task.endTime}. */ -export type { TaskResult }; +export interface TaskResult { + task: Task; + status: TaskStatus; + code: number; + terminalOutput?: string; +} /** * A map of {@link TaskResult} keyed by the ID of the completed {@link Task}s diff --git a/packages/nx/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.ts b/packages/nx/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.ts index a803833e..1aecf95d 100644 --- a/packages/nx/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.ts +++ b/packages/nx/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.ts @@ -1,9 +1,6 @@ import { output } from '../../utils/output'; import { TaskStatus } from '../tasks-runner'; -import { - getPrintableCommandArgsForTask, - getUnparsedOverrideArgs, -} from '../utils'; +import { getPrintableCommandArgsForTask } from '../utils'; import type { LifeCycle, TaskResult } from '../life-cycle'; import { Task } from '../../config/task-graph'; @@ -17,12 +14,14 @@ export class InvokeRunnerTerminalOutputLifeCycle implements LifeCycle { output.log({ color: 'cyan', title: `Running ${this.tasks.length} tasks:`, - bodyLines: this.tasks.map((task) => { - const unparsed = getUnparsedOverrideArgs(task); - return `- Task ${task.id} ${ - unparsed.length > 0 ? `Overrides: ${unparsed.join(' ')}` : '' - }`; - }), + bodyLines: this.tasks.map( + (task) => + `- Task ${task.id} ${ + task.overrides.__overrides_unparsed__.length > 0 + ? `Overrides: ${task.overrides.__overrides_unparsed__.join(' ')}` + : '' + }` + ), }); output.addVerticalSeparatorWithoutNewLines('cyan'); @@ -33,9 +32,10 @@ export class InvokeRunnerTerminalOutputLifeCycle implements LifeCycle { const taskIds = this.tasks.map((task) => { const cached = this.cachedTasks.indexOf(task) !== -1; const failed = this.failedTasks.indexOf(task) !== -1; - const unparsed = getUnparsedOverrideArgs(task); return `- Task ${task.id} ${ - unparsed.length > 0 ? `Overrides: ${unparsed.join(' ')}` : '' + task.overrides.__overrides_unparsed__.length > 0 + ? `Overrides: ${task.overrides.__overrides_unparsed__.join(' ')}` + : '' } ${cached ? 'CACHED' : ''} ${failed ? 'FAILED' : ''}`; }); if (this.failedTasks.length === 0) { diff --git a/packages/nx/src/tasks-runner/task-orchestrator.ts b/packages/nx/src/tasks-runner/task-orchestrator.ts index 7340ad04..1510cb0b 100644 --- a/packages/nx/src/tasks-runner/task-orchestrator.ts +++ b/packages/nx/src/tasks-runner/task-orchestrator.ts @@ -23,7 +23,7 @@ import { import { NxArgs } from '../utils/command-line-utils'; import { getLocalDbConnection } from '../utils/db-connection'; import { output } from '../utils/output'; -import { combineOptionsForExecutor, Options } from '../utils/params'; +import { combineOptionsForExecutor } from '../utils/params'; import { workspaceRoot } from '../utils/workspace-root'; import { EXPECTED_TERMINATION_SIGNALS, @@ -1044,7 +1044,7 @@ export class TaskOrchestrator { try { const { schema } = getExecutorForTask(task, this.projects); const combinedOptions = combineOptionsForExecutor( - task.overrides as Options, + task.overrides, task.target.configuration ?? targetConfiguration.defaultConfiguration, targetConfiguration, schema, diff --git a/packages/nx/src/tasks-runner/utils.ts b/packages/nx/src/tasks-runner/utils.ts index 9a922653..6b208ba5 100644 --- a/packages/nx/src/tasks-runner/utils.ts +++ b/packages/nx/src/tasks-runner/utils.ts @@ -325,9 +325,7 @@ export function getOutputsForTargetAndConfiguration( 'id' in taskTargetOrTask ? taskTargetOrTask.target : taskTargetOrTask; const overrides = 'id' in taskTargetOrTask ? taskTargetOrTask.overrides : overridesOrNode; - node = ( - 'id' in taskTargetOrTask ? overridesOrNode : node - ) as ProjectGraphProjectNode; + node = 'id' in taskTargetOrTask ? overridesOrNode : node; const { target, configuration } = taskTarget; @@ -584,13 +582,8 @@ export function getCliPath() { return require.resolve(`../../bin/run-executor.js`); } -export function getUnparsedOverrideArgs(task: Task): string[] { - return (task.overrides as { __overrides_unparsed__: string[] }) - .__overrides_unparsed__; -} - export function getPrintableCommandArgsForTask(task: Task) { - const args = getUnparsedOverrideArgs(task); + const args: string[] = task.overrides['__overrides_unparsed__']; const target = task.target.target.includes(':') ? `"${task.target.target}"` diff --git a/packages/nx/src/utils/child-process.ts b/packages/nx/src/utils/child-process.ts index c7a363ce..791589f9 100644 --- a/packages/nx/src/utils/child-process.ts +++ b/packages/nx/src/utils/child-process.ts @@ -21,8 +21,8 @@ export function getRunNxBaseCommand( ): string { if (existsSync(join(workspaceRoot, 'package.json'))) { if (!packageManagerCommand) { - const pm = detectPackageManager(workspaceRoot); - packageManagerCommand = getPackageManagerCommand(pm, workspaceRoot); + const pm = detectPackageManager(); + packageManagerCommand = getPackageManagerCommand(pm); } return `${packageManagerCommand.exec} nx`; } else { diff --git a/packages/nx/src/utils/package-json.spec.ts b/packages/nx/src/utils/package-json.spec.ts index 37202265..e84a992b 100644 --- a/packages/nx/src/utils/package-json.spec.ts +++ b/packages/nx/src/utils/package-json.spec.ts @@ -76,9 +76,15 @@ describe('installPackageToTmp', () => { }); describe('readTargetsFromPackageJson', () => { - const packageManagerCommand = { - run: (script: string) => `npm run ${script}`, - } as any; + beforeEach(() => { + jest + .spyOn(pacakgeManager, 'getPackageManagerCommand') + .mockReturnValue({ run: (script) => `npm run ${script}` } as any); + }); + + afterEach(() => { + jest.restoreAllMocks(); + }); const packageJson: PackageJson = { name: 'my-app', @@ -111,8 +117,7 @@ describe('readTargetsFromPackageJson', () => { packageJson, nxJson1, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result1['nx-release-publish']).toMatchInlineSnapshot(` { @@ -138,8 +143,7 @@ describe('readTargetsFromPackageJson', () => { packageJson, nxJson2, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result2['nx-release-publish']).toMatchInlineSnapshot(` { @@ -158,8 +162,7 @@ describe('readTargetsFromPackageJson', () => { packageJson, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result).toMatchInlineSnapshot(` { @@ -202,8 +205,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result).toEqual({ build: { ...packageJsonBuildTarget, outputs: ['custom'] }, @@ -230,8 +232,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result).toMatchInlineSnapshot(` { @@ -274,8 +275,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result.build).toMatchInlineSnapshot(` { @@ -315,8 +315,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result.build).toMatchInlineSnapshot(` { @@ -348,8 +347,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result.build).toMatchInlineSnapshot(` { @@ -379,8 +377,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result.build).toMatchInlineSnapshot(` { @@ -410,8 +407,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result.build).toMatchInlineSnapshot(` { @@ -480,8 +476,7 @@ describe('readTargetsFromPackageJson', () => { }, {}, workspaceRoot, - '/root', - packageManagerCommand + '/root' ); expect(result.test).toMatchInlineSnapshot(` { diff --git a/packages/nx/src/utils/package-json.ts b/packages/nx/src/utils/package-json.ts index ca3d6767..07e6b2d3 100644 --- a/packages/nx/src/utils/package-json.ts +++ b/packages/nx/src/utils/package-json.ts @@ -187,6 +187,8 @@ export function buildTargetFromScript( }; } +let packageManagerCommand: PackageManagerCommands | undefined; + export function getMetadataFromPackageJson( packageJson: PackageJson, isInPackageManagerWorkspaces: boolean @@ -224,13 +226,13 @@ export function readTargetsFromPackageJson( packageJson: PackageJson, nxJson: NxJsonConfiguration, projectRoot: string, - workspaceRoot: string, - packageManagerCommand: PackageManagerCommands + workspaceRoot: string ) { const { scripts, nx, private: isPrivate } = packageJson ?? {}; const res: Record = {}; const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {}); for (const script of includedScripts) { + packageManagerCommand ??= getPackageManagerCommand(); res[script] = buildTargetFromScript(script, scripts, packageManagerCommand); } for (const targetName in nx?.targets) { @@ -370,12 +372,12 @@ function preparePackageInstallation(pkg: string, requiredVersion: string) { }; console.log(`Fetching ${pkg}...`); - const packageManager = detectPackageManager(workspaceRoot); + const packageManager = detectPackageManager(); const isVerbose = process.env.NX_VERBOSE_LOGGING === 'true'; generatePackageManagerFiles(tempDir, packageManager); + const preInstallCommand = getPackageManagerCommand(packageManager).preInstall; const pmCommands = getPackageManagerCommand(packageManager); - const preInstallCommand = pmCommands.preInstall; let addCommand = pmCommands.addDev; if (packageManager === 'pnpm') { addCommand = 'pnpm add -D'; // we need to ensure that we are not using workspace command diff --git a/packages/nx/src/utils/plugin-cache-utils.spec.ts b/packages/nx/src/utils/plugin-cache-utils.spec.ts index 1950561e..c520151e 100644 --- a/packages/nx/src/utils/plugin-cache-utils.spec.ts +++ b/packages/nx/src/utils/plugin-cache-utils.spec.ts @@ -11,20 +11,18 @@ import { PluginCache, safeWriteFileCache } from './plugin-cache-utils'; describe('plugin-cache-utils', () => { let tempDir: string; - let cachePath: string; beforeEach(() => { tempDir = mkdtempSync(join(tmpdir(), 'nx-cache-utils-test-')); - cachePath = join(tempDir, 'plugin-cache.json'); }); describe('PluginCache', () => { it('should track access in session log on get', () => { - const cache = new PluginCache( - cachePath, - { a: '1', b: '2', c: '3' }, - ['a', 'b', 'c'] - ); + const cache = new PluginCache({ a: '1', b: '2', c: '3' }, [ + 'a', + 'b', + 'c', + ]); cache.get('a'); // access 'a', moves to end @@ -33,7 +31,7 @@ describe('plugin-cache-utils', () => { }); it('should track access in session log on set', () => { - const cache = new PluginCache(cachePath, {}, []); + const cache = new PluginCache({}, []); cache.set('x', 'hello'); cache.set('y', 'world'); @@ -44,10 +42,7 @@ describe('plugin-cache-utils', () => { }); it('should move existing key to end on set', () => { - const cache = new PluginCache(cachePath, { a: '1', b: '2' }, [ - 'a', - 'b', - ]); + const cache = new PluginCache({ a: '1', b: '2' }, ['a', 'b']); cache.set('a', 'updated'); // re-set 'a', moves to end const serialized = cache.toSerializable(); @@ -55,10 +50,7 @@ describe('plugin-cache-utils', () => { }); it('should NOT track access on has()', () => { - const cache = new PluginCache(cachePath, { a: '1', b: '2' }, [ - 'a', - 'b', - ]); + const cache = new PluginCache({ a: '1', b: '2' }, ['a', 'b']); expect(cache.has('a')).toBe(true); expect(cache.has('c')).toBe(false); @@ -68,7 +60,7 @@ describe('plugin-cache-utils', () => { }); it('should return undefined for missing keys on get', () => { - const cache = new PluginCache(cachePath, { a: '1' }, ['a']); + const cache = new PluginCache({ a: '1' }, ['a']); expect(cache.get('missing')).toBeUndefined(); // Missing key should not appear in session log @@ -77,11 +69,11 @@ describe('plugin-cache-utils', () => { }); it('should dedup session log at serialization: access a→b→a expects [b, a]', () => { - const cache = new PluginCache( - cachePath, - { a: '1', b: '2', c: '3' }, - ['a', 'b', 'c'] - ); + const cache = new PluginCache({ a: '1', b: '2', c: '3' }, [ + 'a', + 'b', + 'c', + ]); cache.get('a'); cache.get('b'); @@ -94,7 +86,7 @@ describe('plugin-cache-utils', () => { }); it('should place new keys (from set) after unaccessed but before accessed', () => { - const cache = new PluginCache(cachePath, { a: '1' }, ['a']); + const cache = new PluginCache({ a: '1' }, ['a']); cache.set('new1', 'v1'); cache.get('a'); @@ -106,8 +98,9 @@ describe('plugin-cache-utils', () => { }); }); - describe('PluginCache constructor reading from disk', () => { + describe('PluginCache constructor from cachePath', () => { it('should read current format with entries and accessOrder', () => { + const cachePath = join(tempDir, 'cache.json'); writeFileSync( cachePath, JSON.stringify({ @@ -123,6 +116,7 @@ describe('plugin-cache-utils', () => { }); it('should return empty cache for unrecognized format', () => { + const cachePath = join(tempDir, 'legacy-cache.json'); writeFileSync(cachePath, JSON.stringify({ a: '1', b: '2' })); const cache = new PluginCache(cachePath); @@ -135,45 +129,20 @@ describe('plugin-cache-utils', () => { }); it('should return empty cache if file is corrupted', () => { + const cachePath = join(tempDir, 'bad.json'); writeFileSync(cachePath, 'not json!!!'); const cache = new PluginCache(cachePath); expect(cache.has('anything')).toBe(false); }); - - it('should not read from disk when entries are provided', () => { - writeFileSync( - cachePath, - JSON.stringify({ - entries: { stale: 'on-disk' }, - accessOrder: ['stale'], - }) - ); - - const cache = new PluginCache(cachePath, { fresh: 'in-memory' }, [ - 'fresh', - ]); - expect(cache.has('stale')).toBe(false); - expect(cache.get('fresh')).toBe('in-memory'); - }); }); describe('writeToDisk', () => { it('should write cache with entries and accessOrder', () => { - const cache = new PluginCache(cachePath, { a: '1' }, ['a']); - - cache.writeToDisk(); + const cachePath = join(tempDir, 'plugin-cache.json'); + const cache = new PluginCache({ a: '1' }, ['a']); - const written = JSON.parse(readFileSync(cachePath, 'utf-8')); - expect(written.entries).toEqual({ a: '1' }); - expect(written.accessOrder).toEqual(['a']); - }); - - it('should write to the path passed at construction', () => { - const cache = new PluginCache(cachePath); - cache.set('a', '1'); - - cache.writeToDisk(); + cache.writeToDisk(cachePath); const written = JSON.parse(readFileSync(cachePath, 'utf-8')); expect(written.entries).toEqual({ a: '1' }); @@ -181,6 +150,8 @@ describe('plugin-cache-utils', () => { }); it('should evict oldest 50% when RangeError and retry', () => { + const cachePath = join(tempDir, 'plugin-cache.json'); + const entries: Record = {}; const accessOrder: string[] = []; for (let i = 0; i < 10; i++) { @@ -194,8 +165,8 @@ describe('plugin-cache-utils', () => { }, }; - const cache = new PluginCache(cachePath, entries, accessOrder); - cache.writeToDisk(); + const cache = new PluginCache(entries, accessOrder); + cache.writeToDisk(cachePath); // key0-key4 evicted (front of queue), key5-key9 remain const written = JSON.parse(readFileSync(cachePath, 'utf-8')); @@ -213,11 +184,12 @@ describe('plugin-cache-utils', () => { }); it('should write empty cache when circular ref (TypeError) is encountered', () => { + const cachePath = join(tempDir, 'plugin-cache.json'); const circular: any = { self: null }; circular.self = circular; - const cache = new PluginCache(cachePath, { a: circular }, ['a']); - cache.writeToDisk(); + const cache = new PluginCache({ a: circular }, ['a']); + cache.writeToDisk(cachePath); // Circular refs are a hard error — skips eviction, writes empty cache expect(existsSync(cachePath)).toBe(true); @@ -227,6 +199,7 @@ describe('plugin-cache-utils', () => { }); it('should write empty cache when RangeError persists after eviction', () => { + const cachePath = join(tempDir, 'plugin-cache.json'); const entries: Record = {}; const accessOrder: string[] = []; for (let i = 0; i < 4; i++) { @@ -238,8 +211,8 @@ describe('plugin-cache-utils', () => { accessOrder.push(`key${i}`); } - const cache = new PluginCache(cachePath, entries, accessOrder); - cache.writeToDisk(); + const cache = new PluginCache(entries, accessOrder); + cache.writeToDisk(cachePath); // Should write an empty cache (not delete the file) expect(existsSync(cachePath)).toBe(true); @@ -249,6 +222,8 @@ describe('plugin-cache-utils', () => { }); it('should evict based on LRU order when accessed keys exist', () => { + const cachePath = join(tempDir, 'plugin-cache.json'); + const entries: Record = {}; const accessOrder: string[] = []; for (let i = 0; i < 10; i++) { @@ -263,12 +238,12 @@ describe('plugin-cache-utils', () => { }, }; - const cache = new PluginCache(cachePath, entries, accessOrder); + const cache = new PluginCache(entries, accessOrder); // Access key0 to move it to the end (most recently used) cache.get('key0'); - cache.writeToDisk(); + cache.writeToDisk(cachePath); // After access, order is: [key1..key9, key0] // Evict first 5: [key1, key2, key3, key4, key5] diff --git a/packages/nx/src/utils/plugin-cache-utils.ts b/packages/nx/src/utils/plugin-cache-utils.ts index abdf4d03..0b5f21fa 100644 --- a/packages/nx/src/utils/plugin-cache-utils.ts +++ b/packages/nx/src/utils/plugin-cache-utils.ts @@ -27,31 +27,24 @@ interface PluginCacheData { export class PluginCache { private entries: Record; private accessOrder: Set; - private cachePath: string; - /** - * Constructs a `PluginCache`. The `cachePath` is the single source of truth - * for both reading and writing — `writeToDisk()` writes to it. - * - * If `entries` is omitted, the cache is loaded from `cachePath` on disk. - * If `entries` is provided, those entries are used as the in-memory state - * and the on-disk file is not read (useful for tests or for seeding the - * cache with known state). - */ + constructor(cachePath: string); constructor( - cachePath: string, entries?: Record, accessOrder?: string[] | Set + ); + constructor( + cachePathOrEntries?: string | Record, + accessOrder?: string[] | Set ) { - this.cachePath = cachePath; - if (entries !== undefined) { - this.entries = entries; - this.accessOrder = - accessOrder instanceof Set ? accessOrder : new Set(accessOrder ?? []); - } else { - const loaded = loadFromDisk(cachePath); + if (typeof cachePathOrEntries === 'string') { + const loaded = loadFromDisk(cachePathOrEntries); this.entries = loaded.entries; this.accessOrder = loaded.accessOrder; + } else { + this.entries = cachePathOrEntries ?? {}; + this.accessOrder = + accessOrder instanceof Set ? accessOrder : new Set(accessOrder ?? []); } } @@ -101,7 +94,7 @@ export class PluginCache { } /** - * Safely writes this cache to the path it was constructed with. + * Safely writes this cache to disk. * * Strategy: * 1. Serialize to JSON @@ -112,8 +105,9 @@ export class PluginCache { * 3. On total serialization failure (even after eviction), * write an empty cache so the file is valid */ - writeToDisk(): void { - mkdirSync(dirname(this.cachePath), { recursive: true }); + + writeToDisk(cachePath: string): void { + mkdirSync(dirname(cachePath), { recursive: true }); let content: string | undefined; @@ -145,10 +139,10 @@ export class PluginCache { // Attempt to write the serialized content to disk try { - writeFileSync(this.cachePath, content); + writeFileSync(cachePath, content); } catch { // Filesystem error — wipe cache so a corrupted file doesn't persist - tryRemoveFile(this.cachePath); + tryRemoveFile(cachePath); } } diff --git a/packages/playwright/src/plugins/plugin.ts b/packages/playwright/src/plugins/plugin.ts index cb9992ad..b31a7b0a 100644 --- a/packages/playwright/src/plugins/plugin.ts +++ b/packages/playwright/src/plugins/plugin.ts @@ -50,26 +50,19 @@ export const createNodes: CreateNodesV2 = [ `playwright-${optionsHash}.hash` ); const pluginCache = new PluginCache(cachePath); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => - createNodesInternal( - configFile, - options, - context, - pluginCache, - pmc, - lockFileName - ), + createNodesInternal(configFile, options, context, pluginCache, pmc), configFilePaths, options, context ); } finally { - pluginCache.writeToDisk(); + pluginCache.writeToDisk(cachePath); } }, ]; @@ -81,8 +74,7 @@ async function createNodesInternal( options: PlaywrightPluginOptions, context: CreateNodesContextV2, pluginCache: PluginCache, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { const projectRoot = dirname(configFilePath); @@ -109,7 +101,10 @@ async function createNodesInternal( CI: process.env.CI, }, context, - [lockFileName, ...externalTsconfigInputs] + [ + getLockFileName(detectPackageManager(context.workspaceRoot)), + ...externalTsconfigInputs, + ] ); if (!pluginCache.has(hash)) { diff --git a/packages/react-native/plugins/plugin.ts b/packages/react-native/plugins/plugin.ts index 70f7ea7a..1fa175c0 100644 --- a/packages/react-native/plugins/plugin.ts +++ b/packages/react-native/plugins/plugin.ts @@ -47,26 +47,17 @@ export const createNodes: CreateNodesV2 = [ `react-native-${optionsHash}.hash` ); const targetsCache = new PluginCache(cachePath); - const lockFileName = getLockFileName( - detectPackageManager(context.workspaceRoot) - ); try { return await createNodesFromFiles( (configFile, options, context) => - createNodesInternal( - configFile, - options, - context, - targetsCache, - lockFileName - ), + createNodesInternal(configFile, options, context, targetsCache), configFiles, options, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -77,8 +68,7 @@ async function createNodesInternal( configFile: string, options: ReactNativePluginOptions, context: CreateNodesContextV2, - targetsCache: PluginCache, - lockFileName: string + targetsCache: PluginCache ): Promise { options = normalizeOptions(options); const projectRoot = dirname(configFile); @@ -109,7 +99,7 @@ async function createNodesInternal( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { diff --git a/packages/react/src/plugins/router-plugin.ts b/packages/react/src/plugins/router-plugin.ts index ee5f74a1..74dba99e 100644 --- a/packages/react/src/plugins/router-plugin.ts +++ b/packages/react/src/plugins/router-plugin.ts @@ -129,7 +129,7 @@ export const createNodesV2: CreateNodesV2 = [ context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; diff --git a/packages/remix/src/plugins/plugin.ts b/packages/remix/src/plugins/plugin.ts index 09a37c42..3b694e82 100644 --- a/packages/remix/src/plugins/plugin.ts +++ b/packages/remix/src/plugins/plugin.ts @@ -53,9 +53,9 @@ export const createNodes: CreateNodesV2 = [ const optionsHash = hashObject(options); const cachePath = join(workspaceDataDirectory, `remix-${optionsHash}.hash`); const targetsCache = new PluginCache(cachePath); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => @@ -65,15 +65,14 @@ export const createNodes: CreateNodesV2 = [ context, targetsCache, _isUsingTsSolutionSetup(), - pmc, - lockFileName + pmc ), configFilePaths, options, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -86,8 +85,7 @@ async function createNodesInternal( context: CreateNodesContextV2, targetsCache: PluginCache, isUsingTsSolutionSetup: boolean, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { const projectRoot = dirname(configFilePath); const fullyQualifiedProjectRoot = join(context.workspaceRoot, projectRoot); @@ -116,7 +114,7 @@ async function createNodesInternal( projectRoot, { ...options, isUsingTsSolutionSetup }, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] )) + configFilePath; if (!targetsCache.has(hash)) { diff --git a/packages/rollup/src/plugins/plugin.ts b/packages/rollup/src/plugins/plugin.ts index 7771f3f8..639e062e 100644 --- a/packages/rollup/src/plugins/plugin.ts +++ b/packages/rollup/src/plugins/plugin.ts @@ -53,9 +53,9 @@ export const createNodes: CreateNodesV2 = [ ); const targetsCache = new PluginCache(cachePath); const isTsSolutionSetup = isUsingTsSolutionSetup(); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( @@ -66,15 +66,14 @@ export const createNodes: CreateNodesV2 = [ context, targetsCache, isTsSolutionSetup, - pmc, - lockFileName + pmc ), configFilePaths, normalizedOptions, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -87,8 +86,7 @@ async function createNodesInternal( context: CreateNodesContextV2, targetsCache: PluginCache, isTsSolutionSetup: boolean, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { const projectRoot = dirname(configFilePath); const fullyQualifiedProjectRoot = join(context.workspaceRoot, projectRoot); @@ -106,7 +104,7 @@ async function createNodesInternal( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { diff --git a/packages/rsbuild/src/plugins/plugin.ts b/packages/rsbuild/src/plugins/plugin.ts index d0fdd6c7..9a2bac35 100644 --- a/packages/rsbuild/src/plugins/plugin.ts +++ b/packages/rsbuild/src/plugins/plugin.ts @@ -47,9 +47,9 @@ export const createNodesV2: CreateNodesV2 = [ ); const targetsCache = new PluginCache(cachePath); const isUsingTsSolutionSetup = _isUsingTsSolutionSetup(); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => @@ -59,15 +59,14 @@ export const createNodesV2: CreateNodesV2 = [ context, targetsCache, isUsingTsSolutionSetup, - pmc, - lockFileName + pmc ), configFilePaths, options, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -78,8 +77,7 @@ async function createNodesInternal( context: CreateNodesContextV2, targetsCache: PluginCache, isUsingTsSolutionSetup: boolean, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { const projectRoot = dirname(configFilePath); // Do not create a project if package.json and project.json isn't there. @@ -99,7 +97,7 @@ async function createNodesInternal( projectRoot, { ...normalizedOptions, isUsingTsSolutionSetup }, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { diff --git a/packages/rspack/src/plugins/plugin.ts b/packages/rspack/src/plugins/plugin.ts index f263ee12..bdc91f10 100644 --- a/packages/rspack/src/plugins/plugin.ts +++ b/packages/rspack/src/plugins/plugin.ts @@ -47,9 +47,9 @@ export const createNodesV2: CreateNodesV2 = [ ); const targetsCache = new PluginCache(cachePath); const isTsSolutionSetup = isUsingTsSolutionSetup(); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => @@ -59,15 +59,14 @@ export const createNodesV2: CreateNodesV2 = [ context, targetsCache, isTsSolutionSetup, - pmc, - lockFileName + pmc ), configFilePaths, options, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -78,8 +77,7 @@ async function createNodesInternal( context: CreateNodesContextV2, targetsCache: PluginCache, isTsSolutionSetup: boolean, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { const projectRoot = dirname(configFilePath); // Do not create a project if package.json and project.json isn't there. @@ -101,7 +99,12 @@ async function createNodesInternal( const normalizedOptions = normalizeOptions(options); const lockFileHash = - hashFile(join(context.workspaceRoot, lockFileName)) ?? ''; + hashFile( + join( + context.workspaceRoot, + getLockFileName(detectPackageManager(context.workspaceRoot)) + ) + ) ?? ''; const nodeHash = hashArray([ hashFile(join(context.workspaceRoot, configFilePath)), diff --git a/packages/storybook/src/plugins/plugin.ts b/packages/storybook/src/plugins/plugin.ts index 76db5aec..e9b94617 100644 --- a/packages/storybook/src/plugins/plugin.ts +++ b/packages/storybook/src/plugins/plugin.ts @@ -54,9 +54,9 @@ export const createNodes: CreateNodesV2 = [ `storybook-${optionsHash}.hash` ); const targetsCache = new PluginCache(cachePath); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( @@ -66,15 +66,14 @@ export const createNodes: CreateNodesV2 = [ normalizedOptions, context, targetsCache, - pmc, - lockFileName + pmc ), configFilePaths, normalizedOptions, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -86,8 +85,7 @@ async function createNodesInternal( options: Required, context: CreateNodesContextV2, targetsCache: PluginCache, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ) { let projectRoot = ''; if (configFilePath.includes('/.storybook')) { @@ -113,7 +111,7 @@ async function createNodesInternal( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); const projectName = buildProjectName(projectRoot, context.workspaceRoot); diff --git a/packages/vite/src/plugins/plugin.ts b/packages/vite/src/plugins/plugin.ts index 03054f08..1b9a9c2c 100644 --- a/packages/vite/src/plugins/plugin.ts +++ b/packages/vite/src/plugins/plugin.ts @@ -174,7 +174,7 @@ export const createNodes: CreateNodesV2 = [ context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; diff --git a/packages/vitest/src/plugins/plugin.ts b/packages/vitest/src/plugins/plugin.ts index 50e20f78..700d8bd7 100644 --- a/packages/vitest/src/plugins/plugin.ts +++ b/packages/vitest/src/plugins/plugin.ts @@ -152,7 +152,7 @@ export const createNodes: CreateNodesV2 = [ context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; diff --git a/packages/web/package.json b/packages/web/package.json index 4e288226..e99fa98f 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -32,7 +32,7 @@ "migrations": "./migrations.json" }, "dependencies": { - "detect-port": "^2.1.0", + "detect-port": "^1.5.1", "http-server": "^14.1.0", "picocolors": "catalog:", "tslib": "catalog:typescript", diff --git a/packages/web/src/executors/file-server/file-server.impl.ts b/packages/web/src/executors/file-server/file-server.impl.ts index 3475eac7..8c93afdb 100644 --- a/packages/web/src/executors/file-server/file-server.impl.ts +++ b/packages/web/src/executors/file-server/file-server.impl.ts @@ -15,7 +15,7 @@ import { readModulePackageJson } from 'nx/src/utils/package-json'; import { daemonClient } from 'nx/src/daemon/client/client'; import { interpolate } from 'nx/src/tasks-runner/utils'; import { stripGlobToBaseDir } from '@nx/js/src/utils/strip-glob-to-base-dir'; -import detectPort from 'detect-port'; +const detectPort = require('detect-port'); // platform specific command name const pmCmd = platform() === 'win32' ? `npx.cmd` : 'npx'; diff --git a/packages/webpack/src/plugins/plugin.ts b/packages/webpack/src/plugins/plugin.ts index c5535a4d..a266bea5 100644 --- a/packages/webpack/src/plugins/plugin.ts +++ b/packages/webpack/src/plugins/plugin.ts @@ -60,9 +60,9 @@ export const createNodes: CreateNodesV2 = [ const targetsCache = new PluginCache(cachePath); const normalizedOptions = normalizeOptions(options); const isTsSolutionSetup = isUsingTsSolutionSetup(); - const packageManager = detectPackageManager(context.workspaceRoot); - const pmc = getPackageManagerCommand(packageManager); - const lockFileName = getLockFileName(packageManager); + const pmc = getPackageManagerCommand( + detectPackageManager(context.workspaceRoot) + ); try { return await createNodesFromFiles( (configFile, options, context) => @@ -72,15 +72,14 @@ export const createNodes: CreateNodesV2 = [ context, targetsCache, isTsSolutionSetup, - pmc, - lockFileName + pmc ), configFilePaths, normalizedOptions, context ); } finally { - targetsCache.writeToDisk(); + targetsCache.writeToDisk(cachePath); } }, ]; @@ -93,8 +92,7 @@ async function createNodesInternal( context: CreateNodesContextV2, targetsCache: PluginCache, isTsSolutionSetup: boolean, - pmc: ReturnType, - lockFileName: string + pmc: ReturnType ): Promise { const projectRoot = dirname(configFilePath); @@ -111,7 +109,7 @@ async function createNodesInternal( projectRoot, options, context, - [lockFileName] + [getLockFileName(detectPackageManager(context.workspaceRoot))] ); if (!targetsCache.has(hash)) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5f1788ab..e05976ed 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -915,8 +915,8 @@ importers: specifier: ^1.4.0 version: 1.12.0 detect-port: - specifier: ^2.1.0 - version: 2.1.0 + specifier: ^1.5.1 + version: 1.6.1 dotenv: specifier: ~16.4.5 version: 16.4.7 @@ -2582,8 +2582,8 @@ importers: specifier: '>= 13 < 16' version: 14.3.0 detect-port: - specifier: ^2.1.0 - version: 2.1.0 + specifier: ^1.5.1 + version: 1.6.1 semver: specifier: 'catalog:' version: 7.7.4 @@ -2999,8 +2999,8 @@ importers: specifier: ^1.6.0 version: 1.6.0 detect-port: - specifier: ^2.1.0 - version: 2.1.0 + specifier: ^1.5.1 + version: 1.6.1 ignore: specifier: ^7.0.5 version: 7.0.5 @@ -4003,8 +4003,8 @@ importers: specifier: workspace:* version: link:../webpack detect-port: - specifier: ^2.1.0 - version: 2.1.0 + specifier: ^1.5.1 + version: 1.6.1 http-server: specifier: ^14.1.0 version: 14.1.0 @@ -14049,10 +14049,6 @@ packages: resolution: {integrity: sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==} engines: {node: '>= 10.0.0'} - address@2.0.3: - resolution: {integrity: sha512-XNAb/a6TCqou+TufU8/u11HCu9x1gYvOoxLwtlXgIqmkrYQADVv6ljyW2zwiPhHz9R1gItAWpuDrdJMmrOBFEA==} - engines: {node: '>= 16.0.0'} - adjust-sourcemap-loader@4.0.0: resolution: {integrity: sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==} engines: {node: '>=8.9'} @@ -16317,11 +16313,6 @@ packages: engines: {node: '>= 4.0.0'} hasBin: true - detect-port@2.1.0: - resolution: {integrity: sha512-epZuWb/6Q62L+nDHJc/hQAqf8pylsqgk3BpZXVBx1CDnr3nkrVNn73Uu1rXcFzkNcc+hkP3whuOg7JZYaQB65Q==} - engines: {node: '>= 16.0.0'} - hasBin: true - detective-amd@6.0.1: resolution: {integrity: sha512-TtyZ3OhwUoEEIhTFoc1C9IyJIud3y+xYkSRjmvCt65+ycQuc3VcBrPRTMWoO/AnuCyOB8T5gky+xf7Igxtjd3g==} engines: {node: '>=18'} @@ -41379,8 +41370,6 @@ snapshots: address@1.2.2: {} - address@2.0.3: {} - adjust-sourcemap-loader@4.0.0: dependencies: loader-utils: 2.0.3 @@ -44393,10 +44382,6 @@ snapshots: transitivePeerDependencies: - supports-color - detect-port@2.1.0: - dependencies: - address: 2.0.3 - detective-amd@6.0.1: dependencies: ast-module-types: 6.0.1