From 78368f67c042e4d7790455c8d8716226fdfb6463 Mon Sep 17 00:00:00 2001 From: Yuki Tanaka Date: Tue, 16 Jul 2024 22:39:14 +0900 Subject: [PATCH] deps: bump `deno_std` to the latest version (#444) * Bump `@std/assert` to v1.0.0 * Bump `@std/async` to v1.0.0-rc.4 * Bump `@std/bytes` to v1.0.2 * Bump `@std/io` to v0.224.3 * Bump `@std/testing` to v1.0.0-rc.4 --- deno.json | 2 +- deno.lock | 65 ++++++++++++-------------------------- deps/std/assert.ts | 2 +- deps/std/async.ts | 2 +- deps/std/bytes.ts | 2 +- deps/std/io.ts | 5 ++- deps/std/streams.ts | 1 - deps/std/testing.ts | 2 +- tests/cluster/test_util.ts | 3 +- tools/make_mod.ts | 3 +- 10 files changed, 32 insertions(+), 55 deletions(-) delete mode 100644 deps/std/streams.ts diff --git a/deno.json b/deno.json index b1090aaf..a318ab83 100644 --- a/deno.json +++ b/deno.json @@ -13,7 +13,7 @@ "exclude": ["benchmark/", "tmp/", "vendor/"] }, "tasks": { - "cache": "deno cache mod.ts experimental/**/mod.ts tests/**/*.ts", + "lock": "rm deno.lock && deno cache mod.ts experimental/**/mod.ts tests/**/*.ts", "check:deno-json": "deno run --allow-read=deno.json tools/check_deno_json.js", "test": "DENO_FUTURE=1 deno test --allow-net --allow-read=tests --allow-write=tests/tmp --allow-run=redis-server,redis-cli --coverage=coverage --trace-leaks --frozen-lockfile", "test:doc": "deno test --doc --no-run --import-map=import_map.test.json", diff --git a/deno.lock b/deno.lock index 541ac194..aa182d54 100644 --- a/deno.lock +++ b/deno.lock @@ -2,63 +2,40 @@ "version": "3", "packages": { "specifiers": { - "jsr:@std/assert@0.224.0": "jsr:@std/assert@0.224.0", - "jsr:@std/assert@^0.224.0": "jsr:@std/assert@0.224.0", - "jsr:@std/async@0.224.0": "jsr:@std/async@0.224.0", - "jsr:@std/bytes@0.224.0": "jsr:@std/bytes@0.224.0", - "jsr:@std/bytes@^0.224.0": "jsr:@std/bytes@0.224.0", - "jsr:@std/fmt@^0.224.0": "jsr:@std/fmt@0.224.0", - "jsr:@std/internal@^0.224.0": "jsr:@std/internal@0.224.0", - "jsr:@std/io@0.224.0": "jsr:@std/io@0.224.0", - "jsr:@std/io@^0.224.0": "jsr:@std/io@0.224.0", - "jsr:@std/streams@0.224.0": "jsr:@std/streams@0.224.0", - "jsr:@std/testing@0.224.0": "jsr:@std/testing@0.224.0", + "jsr:@std/assert@^1.0.0": "jsr:@std/assert@1.0.0", + "jsr:@std/async@1.0.0-rc.4": "jsr:@std/async@1.0.0-rc.4", + "jsr:@std/bytes@^1.0.1-rc.3": "jsr:@std/bytes@1.0.2", + "jsr:@std/bytes@^1.0.2": "jsr:@std/bytes@1.0.2", + "jsr:@std/internal@^1.0.1": "jsr:@std/internal@1.0.1", + "jsr:@std/io@0.224.3": "jsr:@std/io@0.224.3", + "jsr:@std/testing@1.0.0-rc.4": "jsr:@std/testing@1.0.0-rc.4", "npm:cluster-key-slot@1.1.0": "npm:cluster-key-slot@1.1.0", "npm:lodash-es@4.17.21": "npm:lodash-es@4.17.21" }, "jsr": { - "@std/assert@0.224.0": { - "integrity": "8643233ec7aec38a940a8264a6e3eed9bfa44e7a71cc6b3c8874213ff401967f", + "@std/assert@1.0.0": { + "integrity": "0e4f6d873f7f35e2a1e6194ceee39686c996b9e5d134948e644d35d4c4df2008", "dependencies": [ - "jsr:@std/fmt@^0.224.0", - "jsr:@std/internal@^0.224.0" + "jsr:@std/internal@^1.0.1" ] }, - "@std/async@0.224.0": { - "integrity": "b6da423eeafbd0003fe88d950e069368c6a156f8b5293b7adbd9c8903a8f8d66", - "dependencies": [ - "jsr:@std/assert@^0.224.0" - ] - }, - "@std/bytes@0.224.0": { - "integrity": "a2250e1d0eb7d1c5a426f21267ab9bdeac2447fa87a3d0d1a467d3f7a6058e49" - }, - "@std/fmt@0.224.0": { - "integrity": "e20e9a2312a8b5393272c26191c0a68eda8d2c4b08b046bad1673148f1d69851" + "@std/async@1.0.0-rc.4": { + "integrity": "6d16ba99f2df32a7aa587c99e2a87140cc1eb8f38321dab3415b624bce90cc14" }, - "@std/internal@0.224.0": { - "integrity": "afc50644f9cdf4495eeb80523a8f6d27226b4b36c45c7c195dfccad4b8509291", - "dependencies": [ - "jsr:@std/fmt@^0.224.0" - ] + "@std/bytes@1.0.2": { + "integrity": "fbdee322bbd8c599a6af186a1603b3355e59a5fb1baa139f8f4c3c9a1b3e3d57" }, - "@std/io@0.224.0": { - "integrity": "0aff885d21d829c050b8a08b1d71b54aed5841aecf227f8d77e99ec529a11e8e", - "dependencies": [ - "jsr:@std/assert@^0.224.0", - "jsr:@std/bytes@^0.224.0" - ] + "@std/internal@1.0.1": { + "integrity": "6f8c7544d06a11dd256c8d6ba54b11ed870aac6c5aeafff499892662c57673e6" }, - "@std/streams@0.224.0": { - "integrity": "9c21feb45113abfc67dd536029624d1792d56dfbb029b8c1baf4ad5a2c35769e", + "@std/io@0.224.3": { + "integrity": "b402edeb99c6b3778d9ae3e9927bc9085b170b41e5a09bbb7064ab2ee394ae2f", "dependencies": [ - "jsr:@std/assert@^0.224.0", - "jsr:@std/bytes@^0.224.0", - "jsr:@std/io@^0.224.0" + "jsr:@std/bytes@^1.0.1-rc.3" ] }, - "@std/testing@0.224.0": { - "integrity": "371b8a929aa7132240d5dd766a439be8f780ef5c176ab194e0bcab72370c761e" + "@std/testing@1.0.0-rc.4": { + "integrity": "d4881746a7a322dae16ab68a59f990a5ebb6f779d546eef0c627240016d39852" } }, "npm": { diff --git a/deps/std/assert.ts b/deps/std/assert.ts index 0ca195b5..c39a4f19 100644 --- a/deps/std/assert.ts +++ b/deps/std/assert.ts @@ -1 +1 @@ -export * from "jsr:@std/assert@0.224.0"; +export * from "jsr:@std/assert@^1.0.0"; diff --git a/deps/std/async.ts b/deps/std/async.ts index 68b87557..d580ef19 100644 --- a/deps/std/async.ts +++ b/deps/std/async.ts @@ -1 +1 @@ -export * from "jsr:@std/async@0.224.0"; +export * from "jsr:@std/async@1.0.0-rc.4/delay"; diff --git a/deps/std/bytes.ts b/deps/std/bytes.ts index 947565be..90736f8d 100644 --- a/deps/std/bytes.ts +++ b/deps/std/bytes.ts @@ -1 +1 @@ -export * from "jsr:@std/bytes@0.224.0"; +export * from "jsr:@std/bytes@^1.0.2/concat"; diff --git a/deps/std/io.ts b/deps/std/io.ts index d5295c33..b9f0d0c5 100644 --- a/deps/std/io.ts +++ b/deps/std/io.ts @@ -1 +1,4 @@ -export * from "jsr:@std/io@0.224.0"; +export { BufReader } from "jsr:@std/io@0.224.3/buf-reader"; +export { BufWriter } from "jsr:@std/io@0.224.3/buf-writer"; +export { readerFromStreamReader } from "jsr:@std/io@0.224.3/reader-from-stream-reader"; +export { readAll } from "jsr:@std/io@0.224.3/read-all"; diff --git a/deps/std/streams.ts b/deps/std/streams.ts deleted file mode 100644 index 2b4a915f..00000000 --- a/deps/std/streams.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "jsr:@std/streams@0.224.0"; diff --git a/deps/std/testing.ts b/deps/std/testing.ts index 2291fcb3..235d91e4 100644 --- a/deps/std/testing.ts +++ b/deps/std/testing.ts @@ -1 +1 @@ -export * from "jsr:@std/testing@0.224.0/bdd"; +export * from "jsr:@std/testing@1.0.0-rc.4/bdd"; diff --git a/tests/cluster/test_util.ts b/tests/cluster/test_util.ts index 42b56ddf..c4f47f07 100644 --- a/tests/cluster/test_util.ts +++ b/tests/cluster/test_util.ts @@ -5,8 +5,7 @@ import { stopRedis, } from "../test_util.ts"; import type { TestServer } from "../test_util.ts"; -import { readAll } from "../../deps/std/io.ts"; -import { readerFromStreamReader } from "../../deps/std/streams.ts"; +import { readAll, readerFromStreamReader } from "../../deps/std/io.ts"; import { delay } from "../../deps/std/async.ts"; export interface TestCluster { diff --git a/tools/make_mod.ts b/tools/make_mod.ts index 7014693b..c8039136 100755 --- a/tools/make_mod.ts +++ b/tools/make_mod.ts @@ -1,7 +1,6 @@ #!/usr/bin/env deno run --allow-read --allow-write --allow-run -import { readAll } from "../deps/std/io.ts"; -import { readerFromStreamReader } from "../deps/std/streams.ts"; +import { readAll, readerFromStreamReader } from "../deps/std/io.ts"; const encoder = new TextEncoder(); const decoder = new TextDecoder();