diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-1-Google-Chrome-linux.png index b235fa80b..867fbcfb7 100644 Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-1-Google-Chrome-linux.png differ diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-opening-window-1-Google-Chrome-linux.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-opening-window-1-Google-Chrome-linux.png index 30af707f3..ecf6568a4 100644 Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-opening-window-1-Google-Chrome-linux.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/code-color-goober-code-color-goober-opening-window-1-Google-Chrome-linux.png differ diff --git a/e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--edit-with-ai-example-snapshots--change-colour.snap.json b/e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--edit-with-ai-example-snapshots--change-colour.snap.json index caf73eebb..bed942ce2 100644 --- a/e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--edit-with-ai-example-snapshots--change-colour.snap.json +++ b/e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--edit-with-ai-example-snapshots--change-colour.snap.json @@ -29,5 +29,5 @@ } } ], - "kcl_version": "0.2.63" + "kcl_version": "0.2.66" } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 22e996d58..76d797331 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2139,7 +2139,6 @@ }, "node_modules/@clack/prompts/node_modules/is-unicode-supported": { "version": "1.3.0", - "extraneous": true, "inBundle": true, "license": "MIT", "engines": { diff --git a/rust/kcl-lib/src/std/extrude.rs b/rust/kcl-lib/src/std/extrude.rs index 24d0f8f44..0a14fcfc0 100644 --- a/rust/kcl-lib/src/std/extrude.rs +++ b/rust/kcl-lib/src/std/extrude.rs @@ -337,18 +337,6 @@ pub(crate) async fn do_post_extrude<'a>( let next_adjacent_edge_uuid = exec_state.next_uuid(); let get_all_edge_faces_opposite_uuid = exec_state.next_uuid(); let get_all_edge_faces_next_uuid = exec_state.next_uuid(); - #[cfg(any(not(test), not(feature = "artifact-graph"), not(target_arch = "wasm32")))] - #[allow(unused_variables)] - let single_threaded = false; - // When running in vitest, we need to run this in a single thread. - // Because their workers are complete shit. - #[cfg(target_arch = "wasm32")] - let single_threaded = crate::wasm::vitest::running_in_vitest(); - // If we are running in a test, for the arifact graph to be deterministic and not fail - // after say a fillet runs concurrently, we need to make sure that the - // async tasks are done before we return. - #[cfg(all(test, feature = "artifact-graph", not(target_arch = "wasm32")))] - let single_threaded = true; // Get faces for original edge // Since this one is batched we can just run it. @@ -361,57 +349,27 @@ pub(crate) async fn do_post_extrude<'a>( ) .await?; - if !single_threaded { - args.ctx - .engine - .async_tasks() - .spawn(get_bg_edge_info_opposite( - args_cloned.clone(), - curve_id, - sketch.id, - face_id, - opposite_edge_uuid, - get_all_edge_faces_opposite_uuid, - single_threaded, - )) - .await; + get_bg_edge_info_opposite( + args_cloned.clone(), + curve_id, + sketch.id, + face_id, + opposite_edge_uuid, + get_all_edge_faces_opposite_uuid, + true, + ) + .await?; - args.ctx - .engine - .async_tasks() - .spawn(get_bg_edge_info_next( - args_cloned, - curve_id, - sketch.id, - face_id, - next_adjacent_edge_uuid, - get_all_edge_faces_next_uuid, - single_threaded, - )) - .await; - } else { - get_bg_edge_info_opposite( - args_cloned.clone(), - curve_id, - sketch.id, - face_id, - opposite_edge_uuid, - get_all_edge_faces_opposite_uuid, - single_threaded, - ) - .await?; - - get_bg_edge_info_next( - args_cloned, - curve_id, - sketch.id, - face_id, - next_adjacent_edge_uuid, - get_all_edge_faces_next_uuid, - single_threaded, - ) - .await?; - } + get_bg_edge_info_next( + args_cloned, + curve_id, + sketch.id, + face_id, + next_adjacent_edge_uuid, + get_all_edge_faces_next_uuid, + true, + ) + .await?; } let Faces { diff --git a/rust/kcl-lib/tests/kcl_samples/bracket/rendered_model.png b/rust/kcl-lib/tests/kcl_samples/bracket/rendered_model.png index cbb37657c..df061cf03 100644 Binary files a/rust/kcl-lib/tests/kcl_samples/bracket/rendered_model.png and b/rust/kcl-lib/tests/kcl_samples/bracket/rendered_model.png differ diff --git a/rust/kcl-lib/tests/kcl_samples/dodecahedron/rendered_model.png b/rust/kcl-lib/tests/kcl_samples/dodecahedron/rendered_model.png index 46fff2ff0..3b3dbea4a 100644 Binary files a/rust/kcl-lib/tests/kcl_samples/dodecahedron/rendered_model.png and b/rust/kcl-lib/tests/kcl_samples/dodecahedron/rendered_model.png differ diff --git a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md index f2c5ff52b..a13d6eb9a 100644 --- a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md @@ -608,7 +608,7 @@ flowchart LR 83 --- 246 83 --- 289 90 --- 159 - 90 x--> 192 + 90 x--> 193 90 --- 226 90 --- 271 104 --- 151 @@ -910,7 +910,7 @@ flowchart LR 211 <--x 191 212 <--x 191 213 <--x 191 - 226 <--x 193 + 226 <--x 192 239 <--x 195 240 <--x 195 241 <--x 195 diff --git a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/rendered_model.png b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/rendered_model.png index ac38d909f..28f34b3ea 100644 Binary files a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/rendered_model.png and b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/rendered_model.png differ diff --git a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/rendered_model.png b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/rendered_model.png index 6e33f2152..3d8663e75 100644 Binary files a/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/rendered_model.png and b/rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/rendered_model.png differ diff --git a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md index 8b8a2e6b9..8eab47124 100644 --- a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md +++ b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md @@ -709,7 +709,6 @@ flowchart LR 115 --- 179 115 x--> 228 115 --- 256 - 115 x--> 307 115 --- 308 164 <--x 116 116 --- 184 diff --git a/rust/kcl-lib/tests/ssi_pattern/rendered_model.png b/rust/kcl-lib/tests/ssi_pattern/rendered_model.png index 0579f9bf0..fba4e2678 100644 Binary files a/rust/kcl-lib/tests/ssi_pattern/rendered_model.png and b/rust/kcl-lib/tests/ssi_pattern/rendered_model.png differ