From 35220f0069931c6c4b9023c2d123f3b37f7e9c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Tue, 23 Apr 2024 16:21:06 +0100 Subject: [PATCH] fix(workspace): provide workspace members as 'imports' in import map (#23492) This commit changes the workspace support to provide all workspace members to be available as imports based on their names and versions. Closes https://github.com/denoland/deno/issues/23343 --- cli/args/import_map.rs | 29 +++++++++++++++++++ cli/args/mod.rs | 5 ++++ tests/integration/run_tests.rs | 29 ------------------- .../specs/run/workspaces/basic/__test__.jsonc | 5 ++++ .../run/workspaces/basic/bar/deno.json | 0 .../run/workspaces/basic/bar/fizz/buzz.ts | 0 .../run/workspaces/basic/bar/mod.ts | 0 .../workspaces/basic/bar/some_mod/hello.ts | 0 .../run/workspaces/basic/deno.json | 0 .../run/workspaces/basic/foo/bar/hello.ts | 0 .../run/workspaces/basic/foo/deno.json | 0 .../run/workspaces/basic/foo/fizz/buzz.ts | 0 .../run/workspaces/basic/foo/mod.ts | 0 .../run/workspaces/basic/main.out | 6 +++- .../run/workspaces/basic/main.ts | 0 .../member_outside_root_dir/__test__.jsonc | 6 ++++ .../member_outside_root_dir/deno.json | 0 .../member_outside_root_dir/foo/bar/hello.ts | 0 .../member_outside_root_dir/foo/deno.json | 0 .../member_outside_root_dir/foo/fizz/buzz.ts | 0 .../member_outside_root_dir/foo/mod.ts | 0 .../member_outside_root_dir/main.out | 0 .../member_outside_root_dir/main.ts | 0 .../members_are_imports/__test__.jsonc | 5 ++++ .../members_are_imports/bar/deno.jsonc | 7 +++++ .../workspaces/members_are_imports/bar/mod.ts | 1 + .../workspaces/members_are_imports/deno.json | 9 ++++++ .../members_are_imports/foo/deno.jsonc | 7 +++++ .../workspaces/members_are_imports/foo/mod.ts | 1 + .../workspaces/members_are_imports/main.out | 1 + .../workspaces/members_are_imports/main.ts | 4 +++ .../workspaces/nested_member/__test__.jsonc | 6 ++++ .../workspaces/nested_member/bar/deno.json | 0 .../workspaces/nested_member/bar/fizz/buzz.ts | 0 .../run/workspaces/nested_member/bar/mod.ts | 0 .../nested_member/bar/some_mod/hello.ts | 0 .../run/workspaces/nested_member/deno.json | 0 .../nested_member/foo/bar/deno.json | 0 .../workspaces/nested_member/foo/bar/hello.ts | 0 .../workspaces/nested_member/foo/deno.json | 0 .../workspaces/nested_member/foo/fizz/buzz.ts | 0 .../run/workspaces/nested_member/foo/mod.ts | 0 .../run/workspaces/nested_member/main.out | 0 .../run/workspaces/nested_member/main.ts | 0 tools/lint.js | 2 +- 45 files changed, 92 insertions(+), 31 deletions(-) create mode 100644 tests/specs/run/workspaces/basic/__test__.jsonc rename tests/{testdata => specs}/run/workspaces/basic/bar/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/basic/bar/fizz/buzz.ts (100%) rename tests/{testdata => specs}/run/workspaces/basic/bar/mod.ts (100%) rename tests/{testdata => specs}/run/workspaces/basic/bar/some_mod/hello.ts (100%) rename tests/{testdata => specs}/run/workspaces/basic/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/basic/foo/bar/hello.ts (100%) rename tests/{testdata => specs}/run/workspaces/basic/foo/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/basic/foo/fizz/buzz.ts (100%) rename tests/{testdata => specs}/run/workspaces/basic/foo/mod.ts (100%) rename tests/{testdata => specs}/run/workspaces/basic/main.out (64%) rename tests/{testdata => specs}/run/workspaces/basic/main.ts (100%) create mode 100644 tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc rename tests/{testdata => specs}/run/workspaces/member_outside_root_dir/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/member_outside_root_dir/foo/bar/hello.ts (100%) rename tests/{testdata => specs}/run/workspaces/member_outside_root_dir/foo/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts (100%) rename tests/{testdata => specs}/run/workspaces/member_outside_root_dir/foo/mod.ts (100%) rename tests/{testdata => specs}/run/workspaces/member_outside_root_dir/main.out (100%) rename tests/{testdata => specs}/run/workspaces/member_outside_root_dir/main.ts (100%) create mode 100644 tests/specs/run/workspaces/members_are_imports/__test__.jsonc create mode 100644 tests/specs/run/workspaces/members_are_imports/bar/deno.jsonc create mode 100644 tests/specs/run/workspaces/members_are_imports/bar/mod.ts create mode 100644 tests/specs/run/workspaces/members_are_imports/deno.json create mode 100644 tests/specs/run/workspaces/members_are_imports/foo/deno.jsonc create mode 100644 tests/specs/run/workspaces/members_are_imports/foo/mod.ts create mode 100644 tests/specs/run/workspaces/members_are_imports/main.out create mode 100644 tests/specs/run/workspaces/members_are_imports/main.ts create mode 100644 tests/specs/run/workspaces/nested_member/__test__.jsonc rename tests/{testdata => specs}/run/workspaces/nested_member/bar/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/bar/fizz/buzz.ts (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/bar/mod.ts (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/bar/some_mod/hello.ts (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/foo/bar/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/foo/bar/hello.ts (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/foo/deno.json (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/foo/fizz/buzz.ts (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/foo/mod.ts (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/main.out (100%) rename tests/{testdata => specs}/run/workspaces/nested_member/main.ts (100%) diff --git a/cli/args/import_map.rs b/cli/args/import_map.rs index d06c4d3859..767d0f770b 100644 --- a/cli/args/import_map.rs +++ b/cli/args/import_map.rs @@ -96,3 +96,32 @@ fn print_import_map_diagnostics(diagnostics: &[ImportMapDiagnostic]) { ); } } + +pub fn enhance_import_map_value_with_workspace_members( + mut import_map_value: serde_json::Value, + workspace_members: &[deno_config::WorkspaceMemberConfig], +) -> serde_json::Value { + let mut imports = + if let Some(imports) = import_map_value.get("imports").as_ref() { + imports.as_object().unwrap().clone() + } else { + serde_json::Map::new() + }; + + for workspace_member in workspace_members { + let name = &workspace_member.package_name; + let version = &workspace_member.package_version; + // Don't override existings, explicit imports + if imports.contains_key(name) { + continue; + } + + imports.insert( + name.to_string(), + serde_json::Value::String(format!("jsr:{}@^{}", name, version)), + ); + } + + import_map_value["imports"] = serde_json::Value::Object(imports); + ::import_map::ext::expand_import_map_value(import_map_value) +} diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 60d9710dec..6c84abac20 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -67,6 +67,7 @@ use std::path::PathBuf; use std::sync::Arc; use thiserror::Error; +use crate::args::import_map::enhance_import_map_value_with_workspace_members; use crate::file_fetcher::FileFetcher; use crate::util::fs::canonicalize_path_maybe_not_exists; use crate::version; @@ -975,6 +976,10 @@ impl CliOptions { base_import_map_config, children_configs, ); + let import_map = enhance_import_map_value_with_workspace_members( + import_map, + &workspace_config.members, + ); log::debug!( "Workspace config generated this import map {}", serde_json::to_string_pretty(&import_map).unwrap() diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs index c298e4f5b8..6419f6ff0f 100644 --- a/tests/integration/run_tests.rs +++ b/tests/integration/run_tests.rs @@ -4918,35 +4918,6 @@ itest!(explicit_resource_management { output: "run/explicit_resource_management/main.out", }); -itest!(workspaces_basic { - args: "run -L debug -A main.ts", - output: "run/workspaces/basic/main.out", - cwd: Some("run/workspaces/basic/"), - copy_temp_dir: Some("run/workspaces/basic/"), - envs: env_vars_for_npm_tests(), - http_server: true, -}); - -itest!(workspaces_member_outside_root_dir { - args: "run -A main.ts", - output: "run/workspaces/member_outside_root_dir/main.out", - cwd: Some("run/workspaces/member_outside_root_dir/"), - copy_temp_dir: Some("run/workspaces/member_outside_root_dir/"), - envs: env_vars_for_npm_tests(), - http_server: true, - exit_code: 1, -}); - -itest!(workspaces_nested_member { - args: "run -A main.ts", - output: "run/workspaces/nested_member/main.out", - cwd: Some("run/workspaces/nested_member/"), - copy_temp_dir: Some("run/workspaces/nested_member/"), - envs: env_vars_for_npm_tests(), - http_server: true, - exit_code: 1, -}); - itest!(unsafe_proto { args: "run -A run/unsafe_proto/main.js", output: "run/unsafe_proto/main.out", diff --git a/tests/specs/run/workspaces/basic/__test__.jsonc b/tests/specs/run/workspaces/basic/__test__.jsonc new file mode 100644 index 0000000000..ea467e51b4 --- /dev/null +++ b/tests/specs/run/workspaces/basic/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run -L debug -A main.ts", + "output": "main.out", + "tempDir": true +} diff --git a/tests/testdata/run/workspaces/basic/bar/deno.json b/tests/specs/run/workspaces/basic/bar/deno.json similarity index 100% rename from tests/testdata/run/workspaces/basic/bar/deno.json rename to tests/specs/run/workspaces/basic/bar/deno.json diff --git a/tests/testdata/run/workspaces/basic/bar/fizz/buzz.ts b/tests/specs/run/workspaces/basic/bar/fizz/buzz.ts similarity index 100% rename from tests/testdata/run/workspaces/basic/bar/fizz/buzz.ts rename to tests/specs/run/workspaces/basic/bar/fizz/buzz.ts diff --git a/tests/testdata/run/workspaces/basic/bar/mod.ts b/tests/specs/run/workspaces/basic/bar/mod.ts similarity index 100% rename from tests/testdata/run/workspaces/basic/bar/mod.ts rename to tests/specs/run/workspaces/basic/bar/mod.ts diff --git a/tests/testdata/run/workspaces/basic/bar/some_mod/hello.ts b/tests/specs/run/workspaces/basic/bar/some_mod/hello.ts similarity index 100% rename from tests/testdata/run/workspaces/basic/bar/some_mod/hello.ts rename to tests/specs/run/workspaces/basic/bar/some_mod/hello.ts diff --git a/tests/testdata/run/workspaces/basic/deno.json b/tests/specs/run/workspaces/basic/deno.json similarity index 100% rename from tests/testdata/run/workspaces/basic/deno.json rename to tests/specs/run/workspaces/basic/deno.json diff --git a/tests/testdata/run/workspaces/basic/foo/bar/hello.ts b/tests/specs/run/workspaces/basic/foo/bar/hello.ts similarity index 100% rename from tests/testdata/run/workspaces/basic/foo/bar/hello.ts rename to tests/specs/run/workspaces/basic/foo/bar/hello.ts diff --git a/tests/testdata/run/workspaces/basic/foo/deno.json b/tests/specs/run/workspaces/basic/foo/deno.json similarity index 100% rename from tests/testdata/run/workspaces/basic/foo/deno.json rename to tests/specs/run/workspaces/basic/foo/deno.json diff --git a/tests/testdata/run/workspaces/basic/foo/fizz/buzz.ts b/tests/specs/run/workspaces/basic/foo/fizz/buzz.ts similarity index 100% rename from tests/testdata/run/workspaces/basic/foo/fizz/buzz.ts rename to tests/specs/run/workspaces/basic/foo/fizz/buzz.ts diff --git a/tests/testdata/run/workspaces/basic/foo/mod.ts b/tests/specs/run/workspaces/basic/foo/mod.ts similarity index 100% rename from tests/testdata/run/workspaces/basic/foo/mod.ts rename to tests/specs/run/workspaces/basic/foo/mod.ts diff --git a/tests/testdata/run/workspaces/basic/main.out b/tests/specs/run/workspaces/basic/main.out similarity index 64% rename from tests/testdata/run/workspaces/basic/main.out rename to tests/specs/run/workspaces/basic/main.out index a955ac54cc..57d8c9f1ea 100644 --- a/tests/testdata/run/workspaces/basic/main.out +++ b/tests/specs/run/workspaces/basic/main.out @@ -1,7 +1,11 @@ [WILDCARD]Workspace config generated this import map { "imports": { "chalk": "npm:chalk", - "chalk/": "npm:/chalk/" + "chalk/": "npm:/chalk/", + "qwerqwer": "jsr:qwerqwer@^0.0.0", + "qwerqwer/": "jsr:/qwerqwer@^0.0.0/", + "asdfasdfasdf": "jsr:asdfasdfasdf@^0.0.0", + "asdfasdfasdf/": "jsr:/asdfasdfasdf@^0.0.0/" }, "scopes": { "./foo/": { diff --git a/tests/testdata/run/workspaces/basic/main.ts b/tests/specs/run/workspaces/basic/main.ts similarity index 100% rename from tests/testdata/run/workspaces/basic/main.ts rename to tests/specs/run/workspaces/basic/main.ts diff --git a/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc b/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc new file mode 100644 index 0000000000..a7669c1ec0 --- /dev/null +++ b/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc @@ -0,0 +1,6 @@ +{ + "args": "run -A main.ts", + "output": "main.out", + "tempDir": true, + "exitCode": 1 +} diff --git a/tests/testdata/run/workspaces/member_outside_root_dir/deno.json b/tests/specs/run/workspaces/member_outside_root_dir/deno.json similarity index 100% rename from tests/testdata/run/workspaces/member_outside_root_dir/deno.json rename to tests/specs/run/workspaces/member_outside_root_dir/deno.json diff --git a/tests/testdata/run/workspaces/member_outside_root_dir/foo/bar/hello.ts b/tests/specs/run/workspaces/member_outside_root_dir/foo/bar/hello.ts similarity index 100% rename from tests/testdata/run/workspaces/member_outside_root_dir/foo/bar/hello.ts rename to tests/specs/run/workspaces/member_outside_root_dir/foo/bar/hello.ts diff --git a/tests/testdata/run/workspaces/member_outside_root_dir/foo/deno.json b/tests/specs/run/workspaces/member_outside_root_dir/foo/deno.json similarity index 100% rename from tests/testdata/run/workspaces/member_outside_root_dir/foo/deno.json rename to tests/specs/run/workspaces/member_outside_root_dir/foo/deno.json diff --git a/tests/testdata/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts b/tests/specs/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts similarity index 100% rename from tests/testdata/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts rename to tests/specs/run/workspaces/member_outside_root_dir/foo/fizz/buzz.ts diff --git a/tests/testdata/run/workspaces/member_outside_root_dir/foo/mod.ts b/tests/specs/run/workspaces/member_outside_root_dir/foo/mod.ts similarity index 100% rename from tests/testdata/run/workspaces/member_outside_root_dir/foo/mod.ts rename to tests/specs/run/workspaces/member_outside_root_dir/foo/mod.ts diff --git a/tests/testdata/run/workspaces/member_outside_root_dir/main.out b/tests/specs/run/workspaces/member_outside_root_dir/main.out similarity index 100% rename from tests/testdata/run/workspaces/member_outside_root_dir/main.out rename to tests/specs/run/workspaces/member_outside_root_dir/main.out diff --git a/tests/testdata/run/workspaces/member_outside_root_dir/main.ts b/tests/specs/run/workspaces/member_outside_root_dir/main.ts similarity index 100% rename from tests/testdata/run/workspaces/member_outside_root_dir/main.ts rename to tests/specs/run/workspaces/member_outside_root_dir/main.ts diff --git a/tests/specs/run/workspaces/members_are_imports/__test__.jsonc b/tests/specs/run/workspaces/members_are_imports/__test__.jsonc new file mode 100644 index 0000000000..f9b8071429 --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/__test__.jsonc @@ -0,0 +1,5 @@ +{ + "args": "run -A main.ts", + "output": "main.out", + "tempDir": true +} diff --git a/tests/specs/run/workspaces/members_are_imports/bar/deno.jsonc b/tests/specs/run/workspaces/members_are_imports/bar/deno.jsonc new file mode 100644 index 0000000000..a6431c8d1f --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/bar/deno.jsonc @@ -0,0 +1,7 @@ +{ + "name": "@deno-test/bar", + "version": "0.0.1", + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/specs/run/workspaces/members_are_imports/bar/mod.ts b/tests/specs/run/workspaces/members_are_imports/bar/mod.ts new file mode 100644 index 0000000000..46d3ca8c61 --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/bar/mod.ts @@ -0,0 +1 @@ +export const value = 42; diff --git a/tests/specs/run/workspaces/members_are_imports/deno.json b/tests/specs/run/workspaces/members_are_imports/deno.json new file mode 100644 index 0000000000..56105365ab --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/deno.json @@ -0,0 +1,9 @@ +{ + "workspaces": [ + "foo", + "bar" + ], + "tasks": { + "dev": "deno run --watch main.ts" + } +} diff --git a/tests/specs/run/workspaces/members_are_imports/foo/deno.jsonc b/tests/specs/run/workspaces/members_are_imports/foo/deno.jsonc new file mode 100644 index 0000000000..3553500121 --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/foo/deno.jsonc @@ -0,0 +1,7 @@ +{ + "name": "@deno-test/foo", + "version": "0.0.1", + "exports": { + ".": "./mod.ts" + } +} diff --git a/tests/specs/run/workspaces/members_are_imports/foo/mod.ts b/tests/specs/run/workspaces/members_are_imports/foo/mod.ts new file mode 100644 index 0000000000..46d3ca8c61 --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/foo/mod.ts @@ -0,0 +1 @@ +export const value = 42; diff --git a/tests/specs/run/workspaces/members_are_imports/main.out b/tests/specs/run/workspaces/members_are_imports/main.out new file mode 100644 index 0000000000..af23dac2ec --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/main.out @@ -0,0 +1 @@ +[Module: null prototype] { value: 42 } [Module: null prototype] { value: 42 } diff --git a/tests/specs/run/workspaces/members_are_imports/main.ts b/tests/specs/run/workspaces/members_are_imports/main.ts new file mode 100644 index 0000000000..d2c2f2308e --- /dev/null +++ b/tests/specs/run/workspaces/members_are_imports/main.ts @@ -0,0 +1,4 @@ +import * as foo from "@deno-test/foo"; +import * as bar from "@deno-test/bar"; + +console.log(foo, bar); diff --git a/tests/specs/run/workspaces/nested_member/__test__.jsonc b/tests/specs/run/workspaces/nested_member/__test__.jsonc new file mode 100644 index 0000000000..a7669c1ec0 --- /dev/null +++ b/tests/specs/run/workspaces/nested_member/__test__.jsonc @@ -0,0 +1,6 @@ +{ + "args": "run -A main.ts", + "output": "main.out", + "tempDir": true, + "exitCode": 1 +} diff --git a/tests/testdata/run/workspaces/nested_member/bar/deno.json b/tests/specs/run/workspaces/nested_member/bar/deno.json similarity index 100% rename from tests/testdata/run/workspaces/nested_member/bar/deno.json rename to tests/specs/run/workspaces/nested_member/bar/deno.json diff --git a/tests/testdata/run/workspaces/nested_member/bar/fizz/buzz.ts b/tests/specs/run/workspaces/nested_member/bar/fizz/buzz.ts similarity index 100% rename from tests/testdata/run/workspaces/nested_member/bar/fizz/buzz.ts rename to tests/specs/run/workspaces/nested_member/bar/fizz/buzz.ts diff --git a/tests/testdata/run/workspaces/nested_member/bar/mod.ts b/tests/specs/run/workspaces/nested_member/bar/mod.ts similarity index 100% rename from tests/testdata/run/workspaces/nested_member/bar/mod.ts rename to tests/specs/run/workspaces/nested_member/bar/mod.ts diff --git a/tests/testdata/run/workspaces/nested_member/bar/some_mod/hello.ts b/tests/specs/run/workspaces/nested_member/bar/some_mod/hello.ts similarity index 100% rename from tests/testdata/run/workspaces/nested_member/bar/some_mod/hello.ts rename to tests/specs/run/workspaces/nested_member/bar/some_mod/hello.ts diff --git a/tests/testdata/run/workspaces/nested_member/deno.json b/tests/specs/run/workspaces/nested_member/deno.json similarity index 100% rename from tests/testdata/run/workspaces/nested_member/deno.json rename to tests/specs/run/workspaces/nested_member/deno.json diff --git a/tests/testdata/run/workspaces/nested_member/foo/bar/deno.json b/tests/specs/run/workspaces/nested_member/foo/bar/deno.json similarity index 100% rename from tests/testdata/run/workspaces/nested_member/foo/bar/deno.json rename to tests/specs/run/workspaces/nested_member/foo/bar/deno.json diff --git a/tests/testdata/run/workspaces/nested_member/foo/bar/hello.ts b/tests/specs/run/workspaces/nested_member/foo/bar/hello.ts similarity index 100% rename from tests/testdata/run/workspaces/nested_member/foo/bar/hello.ts rename to tests/specs/run/workspaces/nested_member/foo/bar/hello.ts diff --git a/tests/testdata/run/workspaces/nested_member/foo/deno.json b/tests/specs/run/workspaces/nested_member/foo/deno.json similarity index 100% rename from tests/testdata/run/workspaces/nested_member/foo/deno.json rename to tests/specs/run/workspaces/nested_member/foo/deno.json diff --git a/tests/testdata/run/workspaces/nested_member/foo/fizz/buzz.ts b/tests/specs/run/workspaces/nested_member/foo/fizz/buzz.ts similarity index 100% rename from tests/testdata/run/workspaces/nested_member/foo/fizz/buzz.ts rename to tests/specs/run/workspaces/nested_member/foo/fizz/buzz.ts diff --git a/tests/testdata/run/workspaces/nested_member/foo/mod.ts b/tests/specs/run/workspaces/nested_member/foo/mod.ts similarity index 100% rename from tests/testdata/run/workspaces/nested_member/foo/mod.ts rename to tests/specs/run/workspaces/nested_member/foo/mod.ts diff --git a/tests/testdata/run/workspaces/nested_member/main.out b/tests/specs/run/workspaces/nested_member/main.out similarity index 100% rename from tests/testdata/run/workspaces/nested_member/main.out rename to tests/specs/run/workspaces/nested_member/main.out diff --git a/tests/testdata/run/workspaces/nested_member/main.ts b/tests/specs/run/workspaces/nested_member/main.ts similarity index 100% rename from tests/testdata/run/workspaces/nested_member/main.ts rename to tests/specs/run/workspaces/nested_member/main.ts diff --git a/tools/lint.js b/tools/lint.js index 121812f4a1..9a001967e4 100755 --- a/tools/lint.js +++ b/tools/lint.js @@ -213,7 +213,7 @@ async function ensureNoNewITests() { "pm_tests.rs": 0, "publish_tests.rs": 28, "repl_tests.rs": 0, - "run_tests.rs": 382, + "run_tests.rs": 379, "shared_library_tests.rs": 0, "task_tests.rs": 30, "test_tests.rs": 80,