From 4bc96c5d2ab46ff3ca1af1524c1913c2a5f2745c Mon Sep 17 00:00:00 2001 From: David Sherret Date: Tue, 11 Jun 2024 08:55:12 -0400 Subject: fix(npm): resolve dynamic npm imports individually (#24170) * https://github.com/denoland/deno_npm/pull/57 * https://github.com/denoland/deno_graph/pull/498 Closes https://github.com/denoland/deno/issues/17802 --- tests/integration/lsp_tests.rs | 8 ++------ tests/integration/npm_tests.rs | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'tests/integration') diff --git a/tests/integration/lsp_tests.rs b/tests/integration/lsp_tests.rs index 25fb695b4..62cb84457 100644 --- a/tests/integration/lsp_tests.rs +++ b/tests/integration/lsp_tests.rs @@ -12868,14 +12868,10 @@ fn lsp_uses_lockfile_for_npm_initialization() { client.initialize_default(); let mut skipping_count = 0; client.wait_until_stderr_line(|line| { - if line.contains("Skipping pending npm resolution.") { + if line.contains("Skipping npm resolution.") { skipping_count += 1; } - assert!( - !line.contains("Running pending npm resolution."), - "Line: {}", - line - ); + assert!(!line.contains("Running npm resolution."), "Line: {}", line); line.contains("Server ready.") }); assert_eq!(skipping_count, 1); diff --git a/tests/integration/npm_tests.rs b/tests/integration/npm_tests.rs index 2c074b86f..1d60d9e35 100644 --- a/tests/integration/npm_tests.rs +++ b/tests/integration/npm_tests.rs @@ -1822,6 +1822,7 @@ fn reload_info_not_found_cache_but_exists_remote() { .run(); output.assert_matches_text(concat!( "error: Could not find npm package '@denotest/esm-import-cjs-default' matching '1.0.0'.\n", + " at file:///[WILDCARD]/main.ts:1:8\n", )); output.assert_exit_code(1); -- cgit v1.2.3