diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 53a0f46e504ab9..87b8069c8ab688 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -5,7 +5,11 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify"; // Bump this number when you want to purge the cache. // Note: the tools/release/01_bump_crate_versions.ts script will update this version // automatically via regex, so ensure that this line maintains this format. +<<<<<<< HEAD const cacheVersion = 27; +======= +const cacheVersion = 28; +>>>>>>> 2039abe8d (2.1.2 (#27135)) const ubuntuX86Runner = "ubuntu-24.04"; const ubuntuX86XlRunner = "ubuntu-24.04-xl"; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee8527bcef3019..0b833e4d3f4a30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -361,8 +361,13 @@ jobs: path: |- ~/.cargo/registry/index ~/.cargo/registry/cache +<<<<<<< HEAD key: '27-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}' restore-keys: '27-cargo-home-${{ matrix.os }}-${{ matrix.arch }}' +======= + key: '28-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}' + restore-keys: '28-cargo-home-${{ matrix.os }}-${{ matrix.arch }}' +>>>>>>> 2039abe8d (2.1.2 (#27135)) if: '!(matrix.skip)' - name: Restore cache build output (PR) uses: actions/cache/restore@v4 @@ -375,7 +380,11 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: never_saved +<<<<<<< HEAD restore-keys: '27-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-' +======= + restore-keys: '28-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-' +>>>>>>> 2039abe8d (2.1.2 (#27135)) - name: Apply and update mtime cache if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))' uses: ./.github/mtime_cache @@ -685,7 +694,11 @@ jobs: !./target/*/*.zip !./target/*/*.sha256sum !./target/*/*.tar.gz +<<<<<<< HEAD key: '27-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' +======= + key: '28-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' +>>>>>>> 2039abe8d (2.1.2 (#27135)) publish-canary: name: publish canary runs-on: ubuntu-24.04 diff --git a/Cargo.lock b/Cargo.lock index fc567b4a380b78..51071d1d76e4ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1194,7 +1194,11 @@ dependencies = [ [[package]] name = "deno" +<<<<<<< HEAD version = "2.1.1" +======= +version = "2.1.2" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "anstream", "async-trait", @@ -1365,7 +1369,11 @@ dependencies = [ [[package]] name = "deno_bench_util" +<<<<<<< HEAD version = "0.173.0" +======= +version = "0.174.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "bencher", "deno_core", @@ -1374,7 +1382,11 @@ dependencies = [ [[package]] name = "deno_broadcast_channel" +<<<<<<< HEAD version = "0.173.0" +======= +version = "0.174.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "async-trait", "deno_core", @@ -1385,7 +1397,11 @@ dependencies = [ [[package]] name = "deno_cache" +<<<<<<< HEAD version = "0.111.0" +======= +version = "0.112.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "async-trait", "deno_core", @@ -1418,7 +1434,11 @@ dependencies = [ [[package]] name = "deno_canvas" +<<<<<<< HEAD version = "0.48.0" +======= +version = "0.49.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "deno_webgpu", @@ -1453,7 +1473,11 @@ dependencies = [ [[package]] name = "deno_console" +<<<<<<< HEAD version = "0.179.0" +======= +version = "0.180.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", ] @@ -1501,7 +1525,11 @@ checksum = "fe4dccb6147bb3f3ba0c7a48e993bfeb999d2c2e47a81badee80e2b370c8d695" [[package]] name = "deno_cron" +<<<<<<< HEAD version = "0.59.0" +======= +version = "0.60.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "anyhow", "async-trait", @@ -1514,7 +1542,11 @@ dependencies = [ [[package]] name = "deno_crypto" +<<<<<<< HEAD version = "0.193.0" +======= +version = "0.194.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "aes", "aes-gcm", @@ -1580,7 +1612,11 @@ dependencies = [ [[package]] name = "deno_fetch" +<<<<<<< HEAD version = "0.203.0" +======= +version = "0.204.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "base64 0.21.7", "bytes", @@ -1614,7 +1650,11 @@ dependencies = [ [[package]] name = "deno_ffi" +<<<<<<< HEAD version = "0.166.0" +======= +version = "0.167.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "deno_permissions", @@ -1634,7 +1674,11 @@ dependencies = [ [[package]] name = "deno_fs" +<<<<<<< HEAD version = "0.89.0" +======= +version = "0.90.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "async-trait", "base32", @@ -1687,7 +1731,11 @@ dependencies = [ [[package]] name = "deno_http" +<<<<<<< HEAD version = "0.177.0" +======= +version = "0.178.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "async-compression", "async-trait", @@ -1726,7 +1774,11 @@ dependencies = [ [[package]] name = "deno_io" +<<<<<<< HEAD version = "0.89.0" +======= +version = "0.90.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "async-trait", "deno_core", @@ -1747,7 +1799,11 @@ dependencies = [ [[package]] name = "deno_kv" +<<<<<<< HEAD version = "0.87.0" +======= +version = "0.88.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "anyhow", "async-trait", @@ -1820,7 +1876,11 @@ dependencies = [ [[package]] name = "deno_napi" +<<<<<<< HEAD version = "0.110.0" +======= +version = "0.111.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "deno_permissions", @@ -1848,7 +1908,11 @@ dependencies = [ [[package]] name = "deno_net" +<<<<<<< HEAD version = "0.171.0" +======= +version = "0.172.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "deno_permissions", @@ -1865,7 +1929,11 @@ dependencies = [ [[package]] name = "deno_node" +<<<<<<< HEAD version = "0.116.0" +======= +version = "0.117.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "aead-gcm-stream", "aes", @@ -2017,7 +2085,11 @@ dependencies = [ [[package]] name = "deno_permissions" +<<<<<<< HEAD version = "0.39.0" +======= +version = "0.40.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "deno_path_util", @@ -2035,7 +2107,11 @@ dependencies = [ [[package]] name = "deno_resolver" +<<<<<<< HEAD version = "0.11.0" +======= +version = "0.12.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "anyhow", "base32", @@ -2054,7 +2130,11 @@ dependencies = [ [[package]] name = "deno_runtime" +<<<<<<< HEAD version = "0.188.0" +======= +version = "0.189.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "color-print", "deno_ast", @@ -2153,7 +2233,11 @@ dependencies = [ [[package]] name = "deno_telemetry" +<<<<<<< HEAD version = "0.1.0" +======= +version = "0.2.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "async-trait", "deno_core", @@ -2194,7 +2278,11 @@ dependencies = [ [[package]] name = "deno_tls" +<<<<<<< HEAD version = "0.166.0" +======= +version = "0.167.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "deno_native_certs", @@ -2243,7 +2331,11 @@ dependencies = [ [[package]] name = "deno_url" +<<<<<<< HEAD version = "0.179.0" +======= +version = "0.180.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_bench_util", "deno_console", @@ -2255,7 +2347,11 @@ dependencies = [ [[package]] name = "deno_web" +<<<<<<< HEAD version = "0.210.0" +======= +version = "0.211.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "async-trait", "base64-simd 0.8.0", @@ -2277,7 +2373,11 @@ dependencies = [ [[package]] name = "deno_webgpu" +<<<<<<< HEAD version = "0.146.0" +======= +version = "0.147.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "raw-window-handle", @@ -2290,7 +2390,11 @@ dependencies = [ [[package]] name = "deno_webidl" +<<<<<<< HEAD version = "0.179.0" +======= +version = "0.180.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_bench_util", "deno_core", @@ -2298,7 +2402,11 @@ dependencies = [ [[package]] name = "deno_websocket" +<<<<<<< HEAD version = "0.184.0" +======= +version = "0.185.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "bytes", "deno_core", @@ -2320,7 +2428,11 @@ dependencies = [ [[package]] name = "deno_webstorage" +<<<<<<< HEAD version = "0.174.0" +======= +version = "0.175.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "deno_core", "deno_web", @@ -4833,7 +4945,11 @@ dependencies = [ [[package]] name = "napi_sym" +<<<<<<< HEAD version = "0.109.0" +======= +version = "0.110.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "quote", "serde", @@ -4888,7 +5004,11 @@ dependencies = [ [[package]] name = "node_resolver" +<<<<<<< HEAD version = "0.18.0" +======= +version = "0.19.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 652d55e071ab89..3a3375edbfeac9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,17 +49,29 @@ repository = "https://github.com/denoland/deno" deno_ast = { version = "=0.43.3", features = ["transpiling"] } deno_core = { version = "0.323.0" } +<<<<<<< HEAD deno_bench_util = { version = "0.173.0", path = "./bench_util" } +======= +deno_bench_util = { version = "0.174.0", path = "./bench_util" } +>>>>>>> 2039abe8d (2.1.2 (#27135)) deno_config = { version = "=0.39.2", features = ["workspace", "sync"] } deno_lockfile = "=0.23.1" deno_media_type = { version = "0.2.0", features = ["module_specifier"] } deno_npm = "=0.25.4" deno_path_util = "=0.2.1" +<<<<<<< HEAD deno_permissions = { version = "0.39.0", path = "./runtime/permissions" } deno_runtime = { version = "0.188.0", path = "./runtime" } deno_semver = "=0.5.16" deno_terminal = "0.2.0" napi_sym = { version = "0.109.0", path = "./ext/napi/sym" } +======= +deno_permissions = { version = "0.40.0", path = "./runtime/permissions" } +deno_runtime = { version = "0.189.0", path = "./runtime" } +deno_semver = "=0.5.16" +deno_terminal = "0.2.0" +napi_sym = { version = "0.110.0", path = "./ext/napi/sym" } +>>>>>>> 2039abe8d (2.1.2 (#27135)) test_util = { package = "test_server", path = "./tests/util/server" } denokv_proto = "0.8.4" @@ -68,6 +80,7 @@ denokv_remote = "0.8.4" denokv_sqlite = { default-features = false, version = "0.8.4" } # exts +<<<<<<< HEAD deno_broadcast_channel = { version = "0.173.0", path = "./ext/broadcast_channel" } deno_cache = { version = "0.111.0", path = "./ext/cache" } deno_canvas = { version = "0.48.0", path = "./ext/canvas" } @@ -95,6 +108,35 @@ deno_webstorage = { version = "0.174.0", path = "./ext/webstorage" } # resolvers deno_resolver = { version = "0.11.0", path = "./resolvers/deno" } node_resolver = { version = "0.18.0", path = "./resolvers/node" } +======= +deno_broadcast_channel = { version = "0.174.0", path = "./ext/broadcast_channel" } +deno_cache = { version = "0.112.0", path = "./ext/cache" } +deno_canvas = { version = "0.49.0", path = "./ext/canvas" } +deno_console = { version = "0.180.0", path = "./ext/console" } +deno_cron = { version = "0.60.0", path = "./ext/cron" } +deno_crypto = { version = "0.194.0", path = "./ext/crypto" } +deno_fetch = { version = "0.204.0", path = "./ext/fetch" } +deno_ffi = { version = "0.167.0", path = "./ext/ffi" } +deno_fs = { version = "0.90.0", path = "./ext/fs" } +deno_http = { version = "0.178.0", path = "./ext/http" } +deno_io = { version = "0.90.0", path = "./ext/io" } +deno_kv = { version = "0.88.0", path = "./ext/kv" } +deno_napi = { version = "0.111.0", path = "./ext/napi" } +deno_net = { version = "0.172.0", path = "./ext/net" } +deno_node = { version = "0.117.0", path = "./ext/node" } +deno_telemetry = { version = "0.2.0", path = "./ext/telemetry" } +deno_tls = { version = "0.167.0", path = "./ext/tls" } +deno_url = { version = "0.180.0", path = "./ext/url" } +deno_web = { version = "0.211.0", path = "./ext/web" } +deno_webgpu = { version = "0.147.0", path = "./ext/webgpu" } +deno_webidl = { version = "0.180.0", path = "./ext/webidl" } +deno_websocket = { version = "0.185.0", path = "./ext/websocket" } +deno_webstorage = { version = "0.175.0", path = "./ext/webstorage" } + +# resolvers +deno_resolver = { version = "0.12.0", path = "./resolvers/deno" } +node_resolver = { version = "0.19.0", path = "./resolvers/node" } +>>>>>>> 2039abe8d (2.1.2 (#27135)) aes = "=0.8.3" anyhow = "1.0.57" diff --git a/Releases.md b/Releases.md index 0e977d0311bc0b..c1a68ca657ad80 100644 --- a/Releases.md +++ b/Releases.md @@ -6,6 +6,53 @@ https://github.com/denoland/deno/releases We also have one-line install commands at: https://github.com/denoland/deno_install +<<<<<<< HEAD +======= +### 2.1.2 / 2024.11.28 + +- feat(unstable): Instrument Deno.serve (#26964) +- feat(unstable): Instrument fetch (#27057) +- feat(unstable): repurpose `--unstable-detect-cjs` to attempt loading more + modules as cjs (#27094) +- fix(check): support jsdoc `@import` tag (#26991) +- fix(compile): correct buffered reading of assets and files (#27008) +- fix(compile): do not error embedding same symlink via multiple methods + (#27015) +- fix(compile): handle TypeScript file included as asset (#27032) +- fix(ext/fetch): don't throw when `bodyUsed` inspect after upgrade (#27088) +- fix(ext/node): `tls.connect` socket upgrades (#27125) +- fix(ext/node): add `fs.promises.fstat` and `FileHandle#stat` (#26719) +- fix(ext/webgpu): normalize limits to number (#27072) +- fix(ext/webgpu): use correct variable name (#27108) +- fix(ext/websocket): don't throw exception when sending to closed socket + (#26932) +- fix(fmt): return `None` if sql fmt result is the same (#27014) +- fix(info): resolve bare specifier pointing to workspace member (#27020) +- fix(init): always force managed node modules (#27047) +- fix(init): support scoped npm packages (#27128) +- fix(install): don't re-set up node_modules if running lifecycle script + (#26984) +- fix(lsp): remove stray debug output (#27010) +- fix(lsp): support task object notation for tasks request (#27076) +- fix(lsp): wasm file import completions (#27018) +- fix(node): correct resolution of dynamic import of esm from cjs (#27071) +- fix(node/fs): add missing stat path argument validation (#27086) +- fix(node/fs): missing uv error context for readFile (#27011) +- fix(node/http): casing ignored in ServerResponse.hasHeader() (#27105) +- fix(node/timers): error when passing id to clearTimeout/clearInterval (#27130) +- fix(runtime/ops): Fix watchfs remove event (#27041) +- fix(streams): reject `string` in `ReadableStream.from` type (#25116) +- fix(task): handle carriage return in task description (#27099) +- fix(task): handle multiline descriptions properly (#27069) +- fix(task): strip ansi codes and control chars when printing tasks (#27100) +- fix(tools/doc): HTML resolve main entrypoint from config file (#27103) +- fix: support bun specifiers in JSR publish (#24588) +- fix: support non-function exports in Wasm modules (#26992) +- perf(compile): read embedded files as static references when UTF-8 and reading + as strings (#27033) +- perf(ext/webstorage): use object wrap for `Storage` (#26931) + +>>>>>>> 2039abe8d (2.1.2 (#27135)) ### 2.1.1 / 2024.11.21 - docs(add): clarification to add command (#26968) diff --git a/bench_util/Cargo.toml b/bench_util/Cargo.toml index 4d39ae30e4b61b..27e9b3fb9f81de 100644 --- a/bench_util/Cargo.toml +++ b/bench_util/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_bench_util" +<<<<<<< HEAD version = "0.173.0" +======= +version = "0.174.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/cli/Cargo.toml b/cli/Cargo.toml index fd28b315d41e55..a63d9baa6f3c20 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno" +<<<<<<< HEAD version = "2.1.1" +======= +version = "2.1.2" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true default-run = "deno" edition.workspace = true diff --git a/cli/args/flags.rs b/cli/args/flags.rs index 5ea28bfec19377..8ca943b84a4b09 100644 --- a/cli/args/flags.rs +++ b/cli/args/flags.rs @@ -3077,14 +3077,22 @@ Evaluate a task from string Arg::new("filter") .long("filter") .short('f') +<<<<<<< HEAD .help("Filter members of the workspace by name, implies --recursive flag") +======= + .help("Filter members of the workspace by name - should be used with --recursive") +>>>>>>> 2039abe8d (2.1.2 (#27135)) .value_parser(value_parser!(String)), ) .arg( Arg::new("eval") .long("eval") .help( +<<<<<<< HEAD "Evaluate the passed value as if it was a task in a configuration file", +======= + "Evaluate the passed value as if, it was a task in a configuration file", +>>>>>>> 2039abe8d (2.1.2 (#27135)) ).action(ArgAction::SetTrue) ) .arg(node_modules_dir_arg()) diff --git a/cli/tools/installer.rs b/cli/tools/installer.rs index df5981e6e7b85e..186d0cdb9781bb 100644 --- a/cli/tools/installer.rs +++ b/cli/tools/installer.rs @@ -359,7 +359,10 @@ async fn install_global( // ensure the module is cached let factory = CliFactory::from_flags(flags.clone()); +<<<<<<< HEAD let cli_options = factory.cli_options()?; +======= +>>>>>>> 2039abe8d (2.1.2 (#27135)) let http_client = factory.http_client_provider(); let deps_http_cache = factory.global_http_cache()?; let mut deps_file_fetcher = FileFetcher::new( @@ -382,6 +385,7 @@ async fn install_global( )); let entry_text = install_flags_global.module_url.as_str(); +<<<<<<< HEAD if !cli_options.initial_cwd().join(entry_text).exists() { // check for package requirement missing prefix if let Ok(Err(package_req)) = @@ -398,6 +402,22 @@ async fn install_global( crate::colors::yellow(format!("deno install -g npm:{package_req}")) ); } +======= + let req = super::registry::AddRmPackageReq::parse(entry_text); + + // found a package requirement but missing the prefix + if let Ok(Err(package_req)) = req { + if jsr_resolver.req_to_nv(&package_req).await.is_some() { + bail!( + "{entry_text} is missing a prefix. Did you mean `{}`?", + crate::colors::yellow(format!("deno install -g jsr:{package_req}")) + ); + } else if npm_resolver.req_to_nv(&package_req).await.is_some() { + bail!( + "{entry_text} is missing a prefix. Did you mean `{}`?", + crate::colors::yellow(format!("deno install -g npm:{package_req}")) + ); +>>>>>>> 2039abe8d (2.1.2 (#27135)) } } diff --git a/ext/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml index e7c3f584b61fbe..d81529fd881a80 100644 --- a/ext/broadcast_channel/Cargo.toml +++ b/ext/broadcast_channel/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_broadcast_channel" +<<<<<<< HEAD version = "0.173.0" +======= +version = "0.174.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/cache/Cargo.toml b/ext/cache/Cargo.toml index 9005bf5b24418f..57b3fa279fb9d3 100644 --- a/ext/cache/Cargo.toml +++ b/ext/cache/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_cache" +<<<<<<< HEAD version = "0.111.0" +======= +version = "0.112.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/canvas/Cargo.toml b/ext/canvas/Cargo.toml index 5dca4424376b8b..7c58d25c49c03a 100644 --- a/ext/canvas/Cargo.toml +++ b/ext/canvas/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_canvas" +<<<<<<< HEAD version = "0.48.0" +======= +version = "0.49.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/console/Cargo.toml b/ext/console/Cargo.toml index 1d76390b6e02d4..5f5d50fd51a3b4 100644 --- a/ext/console/Cargo.toml +++ b/ext/console/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_console" +<<<<<<< HEAD version = "0.179.0" +======= +version = "0.180.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/cron/Cargo.toml b/ext/cron/Cargo.toml index d1809da1354ca0..3e5c4da3bb614d 100644 --- a/ext/cron/Cargo.toml +++ b/ext/cron/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_cron" +<<<<<<< HEAD version = "0.59.0" +======= +version = "0.60.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/crypto/Cargo.toml b/ext/crypto/Cargo.toml index dfb81c62a32604..1b7a9d9a147d5e 100644 --- a/ext/crypto/Cargo.toml +++ b/ext/crypto/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_crypto" +<<<<<<< HEAD version = "0.193.0" +======= +version = "0.194.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml index 90b1b152d95778..c3b22767d53254 100644 --- a/ext/fetch/Cargo.toml +++ b/ext/fetch/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_fetch" +<<<<<<< HEAD version = "0.203.0" +======= +version = "0.204.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/ffi/Cargo.toml b/ext/ffi/Cargo.toml index 2f0813a58b9674..06a5884932fe65 100644 --- a/ext/ffi/Cargo.toml +++ b/ext/ffi/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_ffi" +<<<<<<< HEAD version = "0.166.0" +======= +version = "0.167.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml index 1d7d5d3d9aabed..e33ed1252f0d02 100644 --- a/ext/fs/Cargo.toml +++ b/ext/fs/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_fs" +<<<<<<< HEAD version = "0.89.0" +======= +version = "0.90.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/http/Cargo.toml b/ext/http/Cargo.toml index 5dc3cd9a7b83c0..fca5fd8ab8423e 100644 --- a/ext/http/Cargo.toml +++ b/ext/http/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_http" +<<<<<<< HEAD version = "0.177.0" +======= +version = "0.178.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/io/Cargo.toml b/ext/io/Cargo.toml index caaf67ab0b6b35..c7c7b0fd06c337 100644 --- a/ext/io/Cargo.toml +++ b/ext/io/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_io" +<<<<<<< HEAD version = "0.89.0" +======= +version = "0.90.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml index 972aabfbb7cdb7..9b2c53567fbab9 100644 --- a/ext/kv/Cargo.toml +++ b/ext/kv/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_kv" +<<<<<<< HEAD version = "0.87.0" +======= +version = "0.88.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/napi/Cargo.toml b/ext/napi/Cargo.toml index f9a1f73007ba5a..aacea368637730 100644 --- a/ext/napi/Cargo.toml +++ b/ext/napi/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_napi" +<<<<<<< HEAD version = "0.110.0" +======= +version = "0.111.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/napi/sym/Cargo.toml b/ext/napi/sym/Cargo.toml index 74d7b450ba67a0..65754d1e42964b 100644 --- a/ext/napi/sym/Cargo.toml +++ b/ext/napi/sym/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "napi_sym" +<<<<<<< HEAD version = "0.109.0" +======= +version = "0.110.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml index 8669f650e3f708..0592f6714f56ff 100644 --- a/ext/net/Cargo.toml +++ b/ext/net/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_net" +<<<<<<< HEAD version = "0.171.0" +======= +version = "0.172.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml index 5e47a74e1dc352..bcf48e9e8f758d 100644 --- a/ext/node/Cargo.toml +++ b/ext/node/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_node" +<<<<<<< HEAD version = "0.116.0" +======= +version = "0.117.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/telemetry/Cargo.toml b/ext/telemetry/Cargo.toml index 6e0c40e873c812..9c6792853c1398 100644 --- a/ext/telemetry/Cargo.toml +++ b/ext/telemetry/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_telemetry" +<<<<<<< HEAD version = "0.1.0" +======= +version = "0.2.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/tls/Cargo.toml b/ext/tls/Cargo.toml index 6b4bc98909a930..70cff1f12bbc5f 100644 --- a/ext/tls/Cargo.toml +++ b/ext/tls/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_tls" +<<<<<<< HEAD version = "0.166.0" +======= +version = "0.167.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/url/Cargo.toml b/ext/url/Cargo.toml index e2ea7dae581f8b..3382556a9a0229 100644 --- a/ext/url/Cargo.toml +++ b/ext/url/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_url" +<<<<<<< HEAD version = "0.179.0" +======= +version = "0.180.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/web/Cargo.toml b/ext/web/Cargo.toml index f56f21b72f6178..b0ca2e766653ff 100644 --- a/ext/web/Cargo.toml +++ b/ext/web/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_web" +<<<<<<< HEAD version = "0.210.0" +======= +version = "0.211.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml index 93be59b734c31a..c50040648c12ce 100644 --- a/ext/webgpu/Cargo.toml +++ b/ext/webgpu/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webgpu" +<<<<<<< HEAD version = "0.146.0" +======= +version = "0.147.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors = ["the Deno authors"] edition.workspace = true license = "MIT" diff --git a/ext/webidl/Cargo.toml b/ext/webidl/Cargo.toml index 9bf65335c04871..be76d0af865a7d 100644 --- a/ext/webidl/Cargo.toml +++ b/ext/webidl/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webidl" +<<<<<<< HEAD version = "0.179.0" +======= +version = "0.180.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/websocket/Cargo.toml b/ext/websocket/Cargo.toml index d6177dada0f39a..b595652c7321fa 100644 --- a/ext/websocket/Cargo.toml +++ b/ext/websocket/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_websocket" +<<<<<<< HEAD version = "0.184.0" +======= +version = "0.185.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/ext/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml index 580eb95e2fe074..2dd71ed5c32dc2 100644 --- a/ext/webstorage/Cargo.toml +++ b/ext/webstorage/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_webstorage" +<<<<<<< HEAD version = "0.174.0" +======= +version = "0.175.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/resolvers/deno/Cargo.toml b/resolvers/deno/Cargo.toml index b2c4bd2384ccb7..4d9cbadd3905f6 100644 --- a/resolvers/deno/Cargo.toml +++ b/resolvers/deno/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_resolver" +<<<<<<< HEAD version = "0.11.0" +======= +version = "0.12.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/resolvers/node/Cargo.toml b/resolvers/node/Cargo.toml index fb302705730a04..5184672ddb02b6 100644 --- a/resolvers/node/Cargo.toml +++ b/resolvers/node/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "node_resolver" +<<<<<<< HEAD version = "0.18.0" +======= +version = "0.19.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 1b960c2bdb93d6..3c235569fdc4aa 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_runtime" +<<<<<<< HEAD version = "0.188.0" +======= +version = "0.189.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true diff --git a/runtime/permissions/Cargo.toml b/runtime/permissions/Cargo.toml index efbc657055f23c..d065b1d7e96fb3 100644 --- a/runtime/permissions/Cargo.toml +++ b/runtime/permissions/Cargo.toml @@ -2,7 +2,11 @@ [package] name = "deno_permissions" +<<<<<<< HEAD version = "0.39.0" +======= +version = "0.40.0" +>>>>>>> 2039abe8d (2.1.2 (#27135)) authors.workspace = true edition.workspace = true license.workspace = true