summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/args/flags.rs15
-rw-r--r--cli/args/mod.rs4
-rw-r--r--cli/factory.rs5
-rw-r--r--cli/main.rs25
-rw-r--r--cli/standalone/binary.rs2
-rw-r--r--cli/standalone/mod.rs7
-rw-r--r--cli/tools/installer.rs34
-rw-r--r--cli/worker.rs3
-rw-r--r--runtime/js/90_deno_ns.js25
-rw-r--r--runtime/js/99_main.js99
-rw-r--r--runtime/ops/bootstrap.rs6
-rw-r--r--runtime/worker_bootstrap.rs6
-rw-r--r--tests/integration/node_unit_tests.rs4
-rw-r--r--tests/integration/run_tests.rs2
-rw-r--r--tests/specs/run/045_proxy/proxy_test.ts2
15 files changed, 60 insertions, 179 deletions
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index bd92d878f..8e62152da 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -570,6 +570,7 @@ fn parse_packages_allowed_scripts(s: &str) -> Result<String, AnyError> {
Clone, Default, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize,
)]
pub struct UnstableConfig {
+ // TODO(bartlomieju): remove in Deno 2.5
pub legacy_flag_enabled: bool, // --unstable
pub bare_node_builtins: bool, // --unstable-bare-node-builts
pub sloppy_imports: bool,
@@ -5476,6 +5477,7 @@ fn unstable_args_parse(
matches: &mut ArgMatches,
cfg: UnstableArgsConfig,
) {
+ // TODO(bartlomieju): remove in Deno 2.5
if matches.get_flag("unstable") {
flags.unstable_config.legacy_flag_enabled = true;
}
@@ -8765,7 +8767,7 @@ mod tests {
#[test]
fn test_with_flags() {
#[rustfmt::skip]
- let r = flags_from_vec(svec!["deno", "test", "--unstable", "--no-npm", "--no-remote", "--trace-leaks", "--no-run", "--filter", "- foo", "--coverage=cov", "--clean", "--location", "https:foo", "--allow-net", "--permit-no-files", "dir1/", "dir2/", "--", "arg1", "arg2"]);
+ let r = flags_from_vec(svec!["deno", "test", "--no-npm", "--no-remote", "--trace-leaks", "--no-run", "--filter", "- foo", "--coverage=cov", "--clean", "--location", "https:foo", "--allow-net", "--permit-no-files", "dir1/", "dir2/", "--", "arg1", "arg2"]);
assert_eq!(
r.unwrap(),
Flags {
@@ -8789,10 +8791,6 @@ mod tests {
junit_path: None,
hide_stacktraces: false,
}),
- unstable_config: UnstableConfig {
- legacy_flag_enabled: true,
- ..Default::default()
- },
no_npm: true,
no_remote: true,
location: Some(Url::parse("https://foo/").unwrap()),
@@ -10200,7 +10198,6 @@ mod tests {
"deno",
"bench",
"--json",
- "--unstable",
"--no-npm",
"--no-remote",
"--no-run",
@@ -10228,10 +10225,6 @@ mod tests {
},
watch: Default::default(),
}),
- unstable_config: UnstableConfig {
- legacy_flag_enabled: true,
- ..Default::default()
- },
no_npm: true,
no_remote: true,
type_check_mode: TypeCheckMode::Local,
@@ -10802,10 +10795,10 @@ mod tests {
conn_file: None,
}),
unstable_config: UnstableConfig {
- legacy_flag_enabled: false,
bare_node_builtins: true,
sloppy_imports: false,
features: svec!["ffi", "worker-options"],
+ ..Default::default()
},
..Flags::default()
}
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index f7623323f..203ceec50 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -1548,10 +1548,6 @@ impl CliOptions {
&self.flags.unsafely_ignore_certificate_errors
}
- pub fn legacy_unstable_flag(&self) -> bool {
- self.flags.unstable_config.legacy_flag_enabled
- }
-
pub fn unstable_bare_node_builtins(&self) -> bool {
self.flags.unstable_config.bare_node_builtins
|| self.workspace().has_unstable("bare-node-builtins")
diff --git a/cli/factory.rs b/cli/factory.rs
index a51bc771e..1ec2104ed 100644
--- a/cli/factory.rs
+++ b/cli/factory.rs
@@ -714,10 +714,6 @@ impl CliFactory {
let mut checker = FeatureChecker::default();
checker.set_exit_cb(Box::new(crate::unstable_exit_cb));
checker.set_warn_cb(Box::new(crate::unstable_warn_cb));
- if cli_options.legacy_unstable_flag() {
- checker.enable_legacy_unstable();
- checker.warn_on_legacy_unstable();
- }
let unstable_features = cli_options.unstable_features();
for granular_flag in crate::UNSTABLE_GRANULAR_FLAGS {
if unstable_features.contains(&granular_flag.name.to_string()) {
@@ -856,7 +852,6 @@ impl CliFactory {
unsafely_ignore_certificate_errors: cli_options
.unsafely_ignore_certificate_errors()
.clone(),
- unstable: cli_options.legacy_unstable_flag(),
create_hmr_runner,
create_coverage_collector,
node_ipc: cli_options.node_ipc_fd(),
diff --git a/cli/main.rs b/cli/main.rs
index c1f0c7910..6caeaa5dd 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -478,25 +478,14 @@ fn resolve_flags_and_init(
Err(err) => exit_for_error(AnyError::from(err)),
};
- // TODO(bartlomieju): remove when `--unstable` flag is removed.
+ // TODO(bartlomieju): remove in Deno v2.5 and hard error then.
if flags.unstable_config.legacy_flag_enabled {
- #[allow(clippy::print_stderr)]
- if matches!(flags.subcommand, DenoSubcommand::Check(_)) {
- // can't use log crate because that's not setup yet
- eprintln!(
- "⚠️ {}",
- colors::yellow(
- "The `--unstable` flag is not needed for `deno check` anymore."
- )
- );
- } else {
- eprintln!(
- "⚠️ {}",
- colors::yellow(
- "The `--unstable` flag is deprecated and will be removed in Deno 2.0. Use granular `--unstable-*` flags instead.\nLearn more at: https://docs.deno.com/runtime/manual/tools/unstable_flags"
- )
- );
- }
+ log::warn!(
+ "⚠️ {}",
+ colors::yellow(
+ "The `--unstable` flag has been removed in Deno 2.0. Use granular `--unstable-*` flags instead.\nLearn more at: https://docs.deno.com/runtime/manual/tools/unstable_flags"
+ )
+ );
}
let default_v8_flags = match flags.subcommand {
diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs
index 27308c901..1e84e1398 100644
--- a/cli/standalone/binary.rs
+++ b/cli/standalone/binary.rs
@@ -624,7 +624,7 @@ impl<'a> DenoCompileBinaryWriter<'a> {
},
node_modules,
unstable_config: UnstableConfig {
- legacy_flag_enabled: cli_options.legacy_unstable_flag(),
+ legacy_flag_enabled: false,
bare_node_builtins: cli_options.unstable_bare_node_builtins(),
sloppy_imports: cli_options.unstable_sloppy_imports(),
features: cli_options.unstable_features(),
diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
index f1f687eed..0a08296d9 100644
--- a/cli/standalone/mod.rs
+++ b/cli/standalone/mod.rs
@@ -682,12 +682,6 @@ pub async fn run(
let feature_checker = Arc::new({
let mut checker = FeatureChecker::default();
checker.set_exit_cb(Box::new(crate::unstable_exit_cb));
- // TODO(bartlomieju): enable, once we deprecate `--unstable` in favor
- // of granular --unstable-* flags.
- // feature_checker.set_warn_cb(Box::new(crate::unstable_warn_cb));
- if metadata.unstable_config.legacy_flag_enabled {
- checker.enable_legacy_unstable();
- }
for feature in metadata.unstable_config.features {
// `metadata` is valid for the whole lifetime of the program, so we
// can leak the string here.
@@ -733,7 +727,6 @@ pub async fn run(
seed: metadata.seed,
unsafely_ignore_certificate_errors: metadata
.unsafely_ignore_certificate_errors,
- unstable: metadata.unstable_config.legacy_flag_enabled,
create_hmr_runner: None,
create_coverage_collector: None,
node_ipc: None,
diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs
index 065c5aa1c..bc8769de1 100644
--- a/cli/tools/installer.rs
+++ b/cli/tools/installer.rs
@@ -490,10 +490,6 @@ async fn resolve_shim_data(
TypeCheckMode::Local => executable_args.push("--check".to_string()),
}
- if flags.unstable_config.legacy_flag_enabled {
- executable_args.push("--unstable".to_string());
- }
-
for feature in &flags.unstable_config.features {
executable_args.push(format!("--unstable-{}", feature));
}
@@ -822,13 +818,7 @@ mod tests {
create_install_shim(
&HttpClientProvider::new(None, None),
- &Flags {
- unstable_config: UnstableConfig {
- legacy_flag_enabled: true,
- ..Default::default()
- },
- ..Flags::default()
- },
+ &Flags::default(),
InstallFlagsGlobal {
module_url: "http://localhost:4545/echo_server.ts".to_string(),
args: vec![],
@@ -850,12 +840,11 @@ mod tests {
let content = fs::read_to_string(file_path).unwrap();
if cfg!(windows) {
assert!(content.contains(
- r#""run" "--unstable" "--no-config" "http://localhost:4545/echo_server.ts""#
+ r#""run" "--no-config" "http://localhost:4545/echo_server.ts""#
));
} else {
- assert!(content.contains(
- r#"run --unstable --no-config 'http://localhost:4545/echo_server.ts'"#
- ));
+ assert!(content
+ .contains(r#"run --no-config 'http://localhost:4545/echo_server.ts'"#));
}
}
@@ -886,13 +875,7 @@ mod tests {
async fn install_unstable_legacy() {
let shim_data = resolve_shim_data(
&HttpClientProvider::new(None, None),
- &Flags {
- unstable_config: UnstableConfig {
- legacy_flag_enabled: true,
- ..Default::default()
- },
- ..Default::default()
- },
+ &Default::default(),
&InstallFlagsGlobal {
module_url: "http://localhost:4545/echo_server.ts".to_string(),
args: vec![],
@@ -907,12 +890,7 @@ mod tests {
assert_eq!(shim_data.name, "echo_server");
assert_eq!(
shim_data.args,
- vec![
- "run",
- "--unstable",
- "--no-config",
- "http://localhost:4545/echo_server.ts",
- ]
+ vec!["run", "--no-config", "http://localhost:4545/echo_server.ts",]
);
}
diff --git a/cli/worker.rs b/cli/worker.rs
index 64400af20..94884ff82 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -112,7 +112,6 @@ pub struct CliMainWorkerOptions {
pub origin_data_folder_path: Option<PathBuf>,
pub seed: Option<u64>,
pub unsafely_ignore_certificate_errors: Option<Vec<String>>,
- pub unstable: bool,
pub skip_op_registration: bool,
pub create_hmr_runner: Option<CreateHmrRunnerCb>,
pub create_coverage_collector: Option<CreateCoverageCollectorCb>,
@@ -580,7 +579,6 @@ impl CliMainWorkerFactory {
is_stdout_tty: deno_terminal::is_stdout_tty(),
is_stderr_tty: deno_terminal::is_stderr_tty(),
color_level: colors::get_color_level(),
- unstable: shared.options.unstable,
unstable_features,
user_agent: version::DENO_VERSION_INFO.user_agent.to_string(),
inspect: shared.options.is_inspecting,
@@ -775,7 +773,6 @@ fn create_web_worker_callback(
color_level: colors::get_color_level(),
is_stdout_tty: deno_terminal::is_stdout_tty(),
is_stderr_tty: deno_terminal::is_stderr_tty(),
- unstable: shared.options.unstable,
unstable_features,
user_agent: version::DENO_VERSION_INFO.user_agent.to_string(),
inspect: shared.options.is_inspecting,
diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js
index e14dc506e..23f7da95c 100644
--- a/runtime/js/90_deno_ns.js
+++ b/runtime/js/90_deno_ns.js
@@ -194,27 +194,4 @@ denoNsUnstableById[unstableIds.webgpu] = {
// denoNsUnstableById[unstableIds.workerOptions] = { __proto__: null }
-// when editing this list, also update unstableDenoProps in cli/tsc/99_main_compiler.js
-const denoNsUnstable = {
- listenDatagram: net.createListenDatagram(
- op_net_listen_udp,
- op_net_listen_unixpacket,
- ),
- umask: fs.umask,
- HttpClient: httpClient.HttpClient,
- createHttpClient: httpClient.createHttpClient,
- dlopen: ffi.dlopen,
- UnsafeCallback: ffi.UnsafeCallback,
- UnsafePointer: ffi.UnsafePointer,
- UnsafePointerView: ffi.UnsafePointerView,
- UnsafeFnPointer: ffi.UnsafeFnPointer,
- UnsafeWindowSurface: webgpuSurface.UnsafeWindowSurface,
- openKv: kv.openKv,
- AtomicOperation: kv.AtomicOperation,
- Kv: kv.Kv,
- KvU64: kv.KvU64,
- KvListIterator: kv.KvListIterator,
- cron: cron.cron,
-};
-
-export { denoNs, denoNsUnstable, denoNsUnstableById, unstableIds };
+export { denoNs, denoNsUnstableById, unstableIds };
diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
index 2d5c96f6a..f81ab3d8f 100644
--- a/runtime/js/99_main.js
+++ b/runtime/js/99_main.js
@@ -37,7 +37,6 @@ const {
ObjectKeys,
ObjectPrototypeIsPrototypeOf,
ObjectSetPrototypeOf,
- ObjectValues,
PromisePrototypeThen,
PromiseResolve,
StringPrototypePadEnd,
@@ -67,7 +66,6 @@ import * as fetch from "ext:deno_fetch/26_fetch.js";
import * as messagePort from "ext:deno_web/13_message_port.js";
import {
denoNs,
- denoNsUnstable,
denoNsUnstableById,
unstableIds,
} from "ext:runtime/90_deno_ns.js";
@@ -439,28 +437,19 @@ ObjectDefineProperties(globalThis, windowOrWorkerGlobalScope);
// Set up global properties shared by main and worker runtime that are exposed
// by unstable features if those are enabled.
-function exposeUnstableFeaturesForWindowOrWorkerGlobalScope(options) {
- const { unstableFlag, unstableFeatures } = options;
- if (unstableFlag) {
- const all = ObjectValues(unstableForWindowOrWorkerGlobalScope);
- for (let i = 0; i <= all.length; i++) {
- const props = all[i];
- ObjectDefineProperties(globalThis, { ...props });
- }
- } else {
- const featureIds = ArrayPrototypeMap(
- ObjectKeys(
- unstableForWindowOrWorkerGlobalScope,
- ),
- (k) => k | 0,
- );
+function exposeUnstableFeaturesForWindowOrWorkerGlobalScope(unstableFeatures) {
+ const featureIds = ArrayPrototypeMap(
+ ObjectKeys(
+ unstableForWindowOrWorkerGlobalScope,
+ ),
+ (k) => k | 0,
+ );
- for (let i = 0; i <= featureIds.length; i++) {
- const featureId = featureIds[i];
- if (ArrayPrototypeIncludes(unstableFeatures, featureId)) {
- const props = unstableForWindowOrWorkerGlobalScope[featureId];
- ObjectDefineProperties(globalThis, { ...props });
- }
+ for (let i = 0; i <= featureIds.length; i++) {
+ const featureId = featureIds[i];
+ if (ArrayPrototypeIncludes(unstableFeatures, featureId)) {
+ const props = unstableForWindowOrWorkerGlobalScope[featureId];
+ ObjectDefineProperties(globalThis, { ...props });
}
}
}
@@ -572,17 +561,16 @@ function bootstrapMainRuntime(runtimeOptions, warmup = false) {
const {
0: denoVersion,
1: location_,
- 2: unstableFlag,
- 3: unstableFeatures,
- 4: inspectFlag,
- 6: hasNodeModulesDir,
- 7: argv0,
- 8: nodeDebug,
- 9: mode,
- 10: servePort,
- 11: serveHost,
- 12: serveIsMain,
- 13: serveWorkerCount,
+ 2: unstableFeatures,
+ 3: inspectFlag,
+ 5: hasNodeModulesDir,
+ 6: argv0,
+ 7: nodeDebug,
+ 8: mode,
+ 9: servePort,
+ 10: serveHost,
+ 11: serveIsMain,
+ 12: serveWorkerCount,
} = runtimeOptions;
if (mode === executionModes.serve) {
@@ -692,10 +680,7 @@ function bootstrapMainRuntime(runtimeOptions, warmup = false) {
location.setLocationHref(location_);
}
- exposeUnstableFeaturesForWindowOrWorkerGlobalScope({
- unstableFlag,
- unstableFeatures,
- });
+ exposeUnstableFeaturesForWindowOrWorkerGlobalScope(unstableFeatures);
ObjectDefineProperties(globalThis, mainRuntimeGlobalProperties);
ObjectDefineProperties(globalThis, {
// TODO(bartlomieju): in the future we might want to change the
@@ -742,14 +727,9 @@ function bootstrapMainRuntime(runtimeOptions, warmup = false) {
},
});
- // TODO(bartlomieju): deprecate --unstable
- if (unstableFlag) {
- ObjectAssign(finalDenoNs, denoNsUnstable);
- } else {
- for (let i = 0; i <= unstableFeatures.length; i++) {
- const id = unstableFeatures[i];
- ObjectAssign(finalDenoNs, denoNsUnstableById[id]);
- }
+ for (let i = 0; i <= unstableFeatures.length; i++) {
+ const id = unstableFeatures[i];
+ ObjectAssign(finalDenoNs, denoNsUnstableById[id]);
}
if (!ArrayPrototypeIncludes(unstableFeatures, unstableIds.unsafeProto)) {
@@ -825,12 +805,11 @@ function bootstrapWorkerRuntime(
const {
0: denoVersion,
1: location_,
- 2: unstableFlag,
- 3: unstableFeatures,
- 5: enableTestingFeaturesFlag,
- 6: hasNodeModulesDir,
- 7: argv0,
- 8: nodeDebug,
+ 2: unstableFeatures,
+ 4: enableTestingFeaturesFlag,
+ 5: hasNodeModulesDir,
+ 6: argv0,
+ 7: nodeDebug,
} = runtimeOptions;
// TODO(iuioiua): remove in Deno v2. This allows us to dynamically delete
@@ -846,10 +825,7 @@ function bootstrapWorkerRuntime(
delete globalThis.bootstrap;
hasBootstrapped = true;
- exposeUnstableFeaturesForWindowOrWorkerGlobalScope({
- unstableFlag,
- unstableFeatures,
- });
+ exposeUnstableFeaturesForWindowOrWorkerGlobalScope(unstableFeatures);
ObjectDefineProperties(globalThis, workerRuntimeGlobalProperties);
ObjectDefineProperties(globalThis, {
name: core.propWritable(name),
@@ -891,14 +867,9 @@ function bootstrapWorkerRuntime(
globalThis.pollForMessages = pollForMessages;
globalThis.hasMessageEventListener = hasMessageEventListener;
- // TODO(bartlomieju): deprecate --unstable
- if (unstableFlag) {
- ObjectAssign(finalDenoNs, denoNsUnstable);
- } else {
- for (let i = 0; i <= unstableFeatures.length; i++) {
- const id = unstableFeatures[i];
- ObjectAssign(finalDenoNs, denoNsUnstableById[id]);
- }
+ for (let i = 0; i <= unstableFeatures.length; i++) {
+ const id = unstableFeatures[i];
+ ObjectAssign(finalDenoNs, denoNsUnstableById[id]);
}
// Not available in workers
diff --git a/runtime/ops/bootstrap.rs b/runtime/ops/bootstrap.rs
index a60544534..bbbddc61b 100644
--- a/runtime/ops/bootstrap.rs
+++ b/runtime/ops/bootstrap.rs
@@ -95,11 +95,7 @@ pub fn op_bootstrap_user_agent(state: &mut OpState) -> String {
#[serde]
pub fn op_bootstrap_unstable_args(state: &mut OpState) -> Vec<String> {
let options = state.borrow::<BootstrapOptions>();
- if options.unstable {
- return vec!["--unstable".to_string()];
- }
-
- let mut flags = Vec::new();
+ let mut flags = Vec::with_capacity(options.unstable_features.len());
for granular_flag in crate::UNSTABLE_GRANULAR_FLAGS.iter() {
if options.unstable_features.contains(&granular_flag.id) {
flags.push(format!("--unstable-{}", granular_flag.name));
diff --git a/runtime/worker_bootstrap.rs b/runtime/worker_bootstrap.rs
index b137efae2..3f3c25c5e 100644
--- a/runtime/worker_bootstrap.rs
+++ b/runtime/worker_bootstrap.rs
@@ -106,8 +106,6 @@ pub struct BootstrapOptions {
pub is_stdout_tty: bool,
pub is_stderr_tty: bool,
pub color_level: deno_terminal::colors::ColorLevel,
- // --unstable flag, deprecated
- pub unstable: bool,
// --unstable-* flags
pub unstable_features: Vec<i32>,
pub user_agent: String,
@@ -144,7 +142,6 @@ impl Default for BootstrapOptions {
log_level: Default::default(),
locale: "en".to_string(),
location: Default::default(),
- unstable: Default::default(),
unstable_features: Default::default(),
inspect: Default::default(),
args: Default::default(),
@@ -174,8 +171,6 @@ struct BootstrapV8<'a>(
&'a str,
// location
Option<&'a str>,
- // unstable
- bool,
// granular unstable flags
&'a [i32],
// inspect
@@ -213,7 +208,6 @@ impl BootstrapOptions {
let bootstrap = BootstrapV8(
&self.deno_version,
self.location.as_ref().map(|l| l.as_str()),
- self.unstable,
self.unstable_features.as_ref(),
self.inspect,
self.enable_testing_features,
diff --git a/tests/integration/node_unit_tests.rs b/tests/integration/node_unit_tests.rs
index dfe15a11c..3bec6bb7d 100644
--- a/tests/integration/node_unit_tests.rs
+++ b/tests/integration/node_unit_tests.rs
@@ -111,7 +111,9 @@ fn node_unit_test(test: String) {
.arg("--config")
.arg(deno_config_path())
.arg("--no-lock")
- .arg("--unstable")
+ .arg("--unstable-broadcast-channel")
+ .arg("--unstable-http")
+ .arg("--unstable-net")
// TODO(kt3k): This option is required to pass tls_test.ts,
// but this shouldn't be necessary. tls.connect currently doesn't
// pass hostname option correctly and it causes cert errors.
diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
index ef688517f..a75ca4c15 100644
--- a/tests/integration/run_tests.rs
+++ b/tests/integration/run_tests.rs
@@ -4338,7 +4338,7 @@ async fn websocketstream_ping() {
let child = util::deno_cmd()
.arg("test")
- .arg("--unstable")
+ .arg("--unstable-net")
.arg("--allow-net")
.arg("--cert")
.arg(root_ca)
diff --git a/tests/specs/run/045_proxy/proxy_test.ts b/tests/specs/run/045_proxy/proxy_test.ts
index 70781f97d..8ef7cf3da 100644
--- a/tests/specs/run/045_proxy/proxy_test.ts
+++ b/tests/specs/run/045_proxy/proxy_test.ts
@@ -108,7 +108,7 @@ async function testFetchProgrammaticProxy() {
"--quiet",
"--reload",
"--allow-net=localhost:4545,localhost:4555",
- "--unstable",
+ "--unstable-http",
"programmatic_proxy_client.ts",
],
}).output();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 04:06:22 +0000