diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/Cargo.toml | 2 | ||||
-rw-r--r-- | cli/args/mod.rs | 19 | ||||
-rw-r--r-- | cli/tests/integration/check_tests.rs | 27 | ||||
-rw-r--r-- | cli/tests/integration/run_tests.rs | 11 | ||||
-rw-r--r-- | cli/tests/testdata/check/broadcast_channel.ts.error.out | 4 | ||||
-rw-r--r-- | cli/tests/testdata/check/deno_unstable_not_found/deno.json | 3 | ||||
-rw-r--r-- | cli/tests/testdata/check/deno_unstable_not_found/main.out | 16 | ||||
-rw-r--r-- | cli/tests/testdata/check/deno_unstable_not_found/main.ts | 2 | ||||
-rw-r--r-- | cli/tests/testdata/run/unstable_disabled.out | 5 |
9 files changed, 8 insertions, 81 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 07bdc69c8..e42b22947 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -55,7 +55,7 @@ winres.workspace = true [dependencies] deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] } deno_cache_dir = "=0.6.1" -deno_config = "=0.8.0" +deno_config = "=0.8.1" deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] } deno_doc = { version = "=0.93.0", features = ["html"] } deno_emit = "=0.33.0" diff --git a/cli/args/mod.rs b/cli/args/mod.rs index c07df3a80..2657ed385 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -799,26 +799,11 @@ impl CliOptions { } pub fn ts_type_lib_window(&self) -> TsTypeLib { - if self.flags.unstable - || !self.flags.unstable_features.is_empty() - || self - .maybe_config_file - .as_ref() - .map(|f| !f.json.unstable.is_empty()) - .unwrap_or(false) - { - TsTypeLib::UnstableDenoWindow - } else { - TsTypeLib::DenoWindow - } + TsTypeLib::DenoWindow } pub fn ts_type_lib_worker(&self) -> TsTypeLib { - if self.flags.unstable { - TsTypeLib::UnstableDenoWorker - } else { - TsTypeLib::DenoWorker - } + TsTypeLib::DenoWorker } pub fn cache_setting(&self) -> CacheSetting { diff --git a/cli/tests/integration/check_tests.rs b/cli/tests/integration/check_tests.rs index 6b2bf96d4..f836957ce 100644 --- a/cli/tests/integration/check_tests.rs +++ b/cli/tests/integration/check_tests.rs @@ -99,20 +99,14 @@ itest!(check_node_builtin_modules_js { }); itest!(check_no_error_truncation { - args: "check --quiet check/no_error_truncation/main.ts --config check/no_error_truncation/deno.json", - output: "check/no_error_truncation/main.out", - envs: vec![("NO_COLOR".to_string(), "1".to_string())], - exit_code: 1, - }); - -itest!(check_broadcast_channel_stable { - args: "check --quiet check/broadcast_channel.ts", - output: "check/broadcast_channel.ts.error.out", + args: "check --quiet check/no_error_truncation/main.ts --config check/no_error_truncation/deno.json", + output: "check/no_error_truncation/main.out", + envs: vec![("NO_COLOR".to_string(), "1".to_string())], exit_code: 1, }); -itest!(check_broadcast_channel_unstable { - args: "check --quiet --unstable check/broadcast_channel.ts", +itest!(check_broadcast_channel { + args: "check --quiet check/broadcast_channel.ts", exit_code: 0, }); @@ -122,17 +116,6 @@ itest!(check_deno_not_found { exit_code: 1, }); -itest!(check_deno_unstable_not_found { - args: "check --quiet --no-config check/deno_unstable_not_found/main.ts", - output: "check/deno_unstable_not_found/main.out", - exit_code: 1, -}); - -itest!(check_deno_unstable_from_config { - args: "check --quiet --config check/deno_unstable_not_found/deno.json check/deno_unstable_not_found/main.ts", - output_str: Some(""), -}); - itest!(check_with_exclude_option_by_dir { args: "check --quiet --config check/exclude_option/deno.exclude_dir.json check/exclude_option/ignored/index.ts", diff --git a/cli/tests/integration/run_tests.rs b/cli/tests/integration/run_tests.rs index 3fd013376..4e3fa8de2 100644 --- a/cli/tests/integration/run_tests.rs +++ b/cli/tests/integration/run_tests.rs @@ -1566,17 +1566,6 @@ itest!(top_level_for_await_ts { output: "run/top_level_await/top_level_for_await.out", }); -itest!(unstable_disabled { - args: "run --reload --check run/unstable.ts", - exit_code: 1, - output: "run/unstable_disabled.out", -}); - -itest!(unstable_enabled { - args: "run --quiet --reload --unstable run/unstable.ts", - output: "run/unstable_enabled.out", -}); - itest!(unstable_disabled_js { args: "run --reload run/unstable.js", output: "run/unstable_disabled_js.out", diff --git a/cli/tests/testdata/check/broadcast_channel.ts.error.out b/cli/tests/testdata/check/broadcast_channel.ts.error.out deleted file mode 100644 index baa6727e3..000000000 --- a/cli/tests/testdata/check/broadcast_channel.ts.error.out +++ /dev/null @@ -1,4 +0,0 @@ -error: TS2304 [ERROR]: Cannot find name 'BroadcastChannel'. -const _channel = new BroadcastChannel("foo"); - ~~~~~~~~~~~~~~~~ - at [WILDCARD] diff --git a/cli/tests/testdata/check/deno_unstable_not_found/deno.json b/cli/tests/testdata/check/deno_unstable_not_found/deno.json deleted file mode 100644 index d7de05e18..000000000 --- a/cli/tests/testdata/check/deno_unstable_not_found/deno.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "unstable": ["cron", "http", "kv"] -} diff --git a/cli/tests/testdata/check/deno_unstable_not_found/main.out b/cli/tests/testdata/check/deno_unstable_not_found/main.out deleted file mode 100644 index 98e437267..000000000 --- a/cli/tests/testdata/check/deno_unstable_not_found/main.out +++ /dev/null @@ -1,16 +0,0 @@ -error: TS2551 [ERROR]: Property 'openKv' does not exist on type 'typeof Deno'. Did you mean 'open'? 'Deno.openKv' is an unstable API. Did you forget to run with the '--unstable' flag, or did you mean 'open'? If not, try changing the 'lib' compiler option to include 'deno.unstable' or add a triple-slash directive to the top of your entrypoint (main file): /// <reference lib="deno.unstable" /> -Deno.openKv; - ~~~~~~ - at file:///[WILDCARD]/deno_unstable_not_found/main.ts:1:6 - - 'open' is declared here. - export function open( - ~~~~ - at asset:///lib.deno.ns.d.ts:[WILDCARD]:19 - -TS2339 [ERROR]: Property 'createHttpClient' does not exist on type 'typeof Deno'. 'Deno.createHttpClient' is an unstable API. Did you forget to run with the '--unstable' flag? If not, try changing the 'lib' compiler option to include 'deno.unstable' or add a triple-slash directive to the top of your entrypoint (main file): /// <reference lib="deno.unstable" /> -Deno.createHttpClient; - ~~~~~~~~~~~~~~~~ - at file:///[WILDCARD]/deno_unstable_not_found/main.ts:2:6 - -Found 2 errors. diff --git a/cli/tests/testdata/check/deno_unstable_not_found/main.ts b/cli/tests/testdata/check/deno_unstable_not_found/main.ts deleted file mode 100644 index 6661bd205..000000000 --- a/cli/tests/testdata/check/deno_unstable_not_found/main.ts +++ /dev/null @@ -1,2 +0,0 @@ -Deno.openKv; -Deno.createHttpClient; diff --git a/cli/tests/testdata/run/unstable_disabled.out b/cli/tests/testdata/run/unstable_disabled.out deleted file mode 100644 index cf78e8ffc..000000000 --- a/cli/tests/testdata/run/unstable_disabled.out +++ /dev/null @@ -1,5 +0,0 @@ -[WILDCARD] -error: TS2339 [ERROR]: Property 'umask' does not exist on type 'typeof Deno'. 'Deno.umask' is an unstable API. Did you forget to run with the '--unstable' flag? If not, try changing the 'lib' compiler option to include 'deno.unstable' or add a triple-slash directive to the top of your entrypoint (main file): /// <reference lib="deno.unstable" /> -console.log(Deno.umask); - ~~~~~ - at [WILDCARD]/unstable.ts:1:18 |