From eb218c0f3344eabfa8abf4c7ecac148f14fc6294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Wed, 5 Jun 2024 00:09:29 +0100 Subject: [PATCH] chore: upgrade dlint to 0.60.0 (#24041) Factoring out `dlint` upgrade from https://github.com/denoland/deno/pull/24034 as it requires us to change the lint step on mac to use ARM runners. --------- Co-authored-by: Luca Casonato Co-authored-by: David Sherret --- cli/bench/deno_common.js | 1 + ext/net/lib.deno_net.d.ts | 1 - tests/testdata/import_attributes/dynamic_import.ts | 1 + tests/testdata/import_attributes/json_with_shebang.ts | 1 + tests/testdata/import_attributes/static_import.ts | 1 + tests/testdata/import_attributes/type_check.out | 4 ++-- tests/testdata/import_attributes/type_check.ts | 1 + tests/testdata/workers/http_worker.js | 3 +++ tests/unit/command_test.ts | 2 -- tests/unit/event_target_test.ts | 10 +++++----- tests/unit/globals_test.ts | 3 ++- tests/unit/http_test.ts | 5 +++-- tests/unit/resources_test.ts | 3 +++ tests/unit/stat_test.ts | 3 +++ tests/unit/tty_test.ts | 3 +++ tests/unit/utime_test.ts | 3 +++ tests/unit_node/_fs/_fs_fstat_test.ts | 3 +++ tests/unit_node/crypto/crypto_cipher_gcm_test.ts | 4 ++-- tools/lint.js | 1 + tools/util.js | 4 ++-- 20 files changed, 40 insertions(+), 17 deletions(-) diff --git a/cli/bench/deno_common.js b/cli/bench/deno_common.js index 554015c6cd..ba88c79ca4 100644 --- a/cli/bench/deno_common.js +++ b/cli/bench/deno_common.js @@ -46,6 +46,7 @@ Deno.bench("b64_rt_short", { n: 1e6 }, () => { const buf = new Uint8Array(100); const file = Deno.openSync("/dev/zero"); Deno.bench("read_zero", { n: 5e5 }, () => { + // deno-lint-ignore no-deprecated-deno-api Deno.readSync(file.rid, buf); }); } diff --git a/ext/net/lib.deno_net.d.ts b/ext/net/lib.deno_net.d.ts index 4b88b154aa..f036bcd39a 100644 --- a/ext/net/lib.deno_net.d.ts +++ b/ext/net/lib.deno_net.d.ts @@ -149,7 +149,6 @@ declare namespace Deno { } /** @category Network */ - // deno-lint-ignore no-empty-interface export interface TcpListenOptions extends ListenOptions { } diff --git a/tests/testdata/import_attributes/dynamic_import.ts b/tests/testdata/import_attributes/dynamic_import.ts index 73f348697e..afff52e1a7 100644 --- a/tests/testdata/import_attributes/dynamic_import.ts +++ b/tests/testdata/import_attributes/dynamic_import.ts @@ -1,4 +1,5 @@ const data1 = await import("./data.json", { with: { type: "json" } }); +// deno-lint-ignore no-import-assertions const data2 = await import("./data.json", { assert: { type: "json" } }); console.log(data1); diff --git a/tests/testdata/import_attributes/json_with_shebang.ts b/tests/testdata/import_attributes/json_with_shebang.ts index 523bf87729..0a785210fc 100644 --- a/tests/testdata/import_attributes/json_with_shebang.ts +++ b/tests/testdata/import_attributes/json_with_shebang.ts @@ -1,3 +1,4 @@ +// deno-lint-ignore no-import-assertions import json from "./json_with_shebang.json" assert { type: "json" }; console.log(json); diff --git a/tests/testdata/import_attributes/static_import.ts b/tests/testdata/import_attributes/static_import.ts index d46d93b4ab..1538a4a2f0 100644 --- a/tests/testdata/import_attributes/static_import.ts +++ b/tests/testdata/import_attributes/static_import.ts @@ -1,4 +1,5 @@ import data1 from "./data.json" with { type: "json" }; +// deno-lint-ignore no-import-assertions import data2 from "./data.json" assert { type: "json" }; console.log(data1); diff --git a/tests/testdata/import_attributes/type_check.out b/tests/testdata/import_attributes/type_check.out index 5ecdec82d4..2fc26dae36 100644 --- a/tests/testdata/import_attributes/type_check.out +++ b/tests/testdata/import_attributes/type_check.out @@ -2,11 +2,11 @@ Check file:///[WILDCARD]/type_check.ts error: TS2339 [ERROR]: Property 'foo' does not exist on type '{ a: string; c: { d: number; }; }'. console.log(data1.foo); ~~~ - at [WILDCARD]type_check.ts:4:19 + at [WILDCARD]type_check.ts:5:19 TS2339 [ERROR]: Property 'foo' does not exist on type '{ a: string; c: { d: number; }; }'. console.log(data2.foo); ~~~ - at [WILDCARD]type_check.ts:5:19 + at [WILDCARD]type_check.ts:6:19 Found 2 errors. diff --git a/tests/testdata/import_attributes/type_check.ts b/tests/testdata/import_attributes/type_check.ts index ddf28e67a8..36e47bd5b8 100644 --- a/tests/testdata/import_attributes/type_check.ts +++ b/tests/testdata/import_attributes/type_check.ts @@ -1,4 +1,5 @@ import data1 from "./data.json" with { type: "json" }; +// deno-lint-ignore no-import-assertions import data2 from "./data.json" assert { type: "json" }; console.log(data1.foo); diff --git a/tests/testdata/workers/http_worker.js b/tests/testdata/workers/http_worker.js index 3cd1625ab6..c617e2e92f 100644 --- a/tests/testdata/workers/http_worker.js +++ b/tests/testdata/workers/http_worker.js @@ -1,4 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +// deno-lint-ignore-file no-deprecated-deno-api + const listener = Deno.listen({ hostname: "127.0.0.1", port: 4506 }); postMessage("ready"); for await (const conn of listener) { diff --git a/tests/unit/command_test.ts b/tests/unit/command_test.ts index 770a568c49..dd83525473 100644 --- a/tests/unit/command_test.ts +++ b/tests/unit/command_test.ts @@ -269,8 +269,6 @@ Deno.test( Deno.test( { permissions: { run: true, read: true } }, - // deno lint bug, see https://github.com/denoland/deno_lint/issues/1206 - // deno-lint-ignore require-await async function childProcessExplicitResourceManagement() { let dead = undefined; { diff --git a/tests/unit/event_target_test.ts b/tests/unit/event_target_test.ts index b084eaf906..3577587d19 100644 --- a/tests/unit/event_target_test.ts +++ b/tests/unit/event_target_test.ts @@ -1,5 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -// deno-lint-ignore-file no-window-prefix + import { assertEquals, assertThrows } from "./test_util.ts"; Deno.test(function addEventListenerTest() { @@ -134,18 +134,18 @@ Deno.test(function eventTargetThisShouldDefaultToWindow() { }; addEventListener("hello", listener); - window.dispatchEvent(event); + globalThis.dispatchEvent(event); assertEquals(n, 2); n = 1; removeEventListener("hello", listener); - window.dispatchEvent(event); + globalThis.dispatchEvent(event); assertEquals(n, 1); - window.addEventListener("hello", listener); + globalThis.addEventListener("hello", listener); dispatchEvent(event); assertEquals(n, 2); n = 1; - window.removeEventListener("hello", listener); + globalThis.removeEventListener("hello", listener); dispatchEvent(event); assertEquals(n, 1); }); diff --git a/tests/unit/globals_test.ts b/tests/unit/globals_test.ts index 00be3f4511..8e07cf0056 100644 --- a/tests/unit/globals_test.ts +++ b/tests/unit/globals_test.ts @@ -1,5 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -// deno-lint-ignore-file no-window-prefix + +// deno-lint-ignore-file no-window-prefix no-window import { assert, assertEquals, assertRejects } from "./test_util.ts"; Deno.test(function globalThisExists() { diff --git a/tests/unit/http_test.ts b/tests/unit/http_test.ts index f4fa62fa6b..6968c6f880 100644 --- a/tests/unit/http_test.ts +++ b/tests/unit/http_test.ts @@ -1,4 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +// deno-lint-ignore-file no-deprecated-deno-api + import { Buffer, BufReader, BufWriter } from "@std/io/mod.ts"; import { TextProtoReader } from "../testdata/run/textproto.ts"; import { @@ -2094,7 +2097,6 @@ Deno.test({ "--header", "Accept-Encoding: deflate, gzip", ]; - // deno-lint-ignore no-deprecated-deno-api const proc = Deno.run({ cmd, stdout: "piped", stderr: "null" }); const status = await proc.status(); assert(status.success); @@ -2157,7 +2159,6 @@ Deno.test({ "--header", "Accept-Encoding: deflate, gzip", ]; - // deno-lint-ignore no-deprecated-deno-api const proc = Deno.run({ cmd, stdout: "piped", stderr: "null" }); const status = await proc.status(); assert(status.success); diff --git a/tests/unit/resources_test.ts b/tests/unit/resources_test.ts index bb0b9f2f8f..921a8af8f9 100644 --- a/tests/unit/resources_test.ts +++ b/tests/unit/resources_test.ts @@ -1,4 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +// deno-lint-ignore-file no-deprecated-deno-api + import { assert, assertEquals, assertThrows } from "./test_util.ts"; const listenPort = 4505; diff --git a/tests/unit/stat_test.ts b/tests/unit/stat_test.ts index 6882edf25e..e64b47536e 100644 --- a/tests/unit/stat_test.ts +++ b/tests/unit/stat_test.ts @@ -1,4 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +// deno-lint-ignore-file no-deprecated-deno-api + import { assert, assertEquals, diff --git a/tests/unit/tty_test.ts b/tests/unit/tty_test.ts index f135ae7cfe..0c1140804e 100644 --- a/tests/unit/tty_test.ts +++ b/tests/unit/tty_test.ts @@ -1,4 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +// deno-lint-ignore-file no-deprecated-deno-api + import { assert } from "./test_util.ts"; // Note tests for Deno.stdin.setRaw is in integration tests. diff --git a/tests/unit/utime_test.ts b/tests/unit/utime_test.ts index 9f5f25beea..49bc966230 100644 --- a/tests/unit/utime_test.ts +++ b/tests/unit/utime_test.ts @@ -1,4 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +// deno-lint-ignore-file no-deprecated-deno-api + import { assertEquals, assertRejects, diff --git a/tests/unit_node/_fs/_fs_fstat_test.ts b/tests/unit_node/_fs/_fs_fstat_test.ts index 37f79f475f..1464b05c52 100644 --- a/tests/unit_node/_fs/_fs_fstat_test.ts +++ b/tests/unit_node/_fs/_fs_fstat_test.ts @@ -1,4 +1,7 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. + +// deno-lint-ignore-file no-deprecated-deno-api + import { fstat, fstatSync } from "node:fs"; import { fail } from "@std/assert/mod.ts"; import { assertStats, assertStatsBigInt } from "./_fs_stat_test.ts"; diff --git a/tests/unit_node/crypto/crypto_cipher_gcm_test.ts b/tests/unit_node/crypto/crypto_cipher_gcm_test.ts index 57e40d2ace..f25c81036b 100644 --- a/tests/unit_node/crypto/crypto_cipher_gcm_test.ts +++ b/tests/unit_node/crypto/crypto_cipher_gcm_test.ts @@ -2,8 +2,8 @@ import crypto from "node:crypto"; import { Buffer } from "node:buffer"; -import testVectors128 from "./gcmEncryptExtIV128.json" assert { type: "json" }; -import testVectors256 from "./gcmEncryptExtIV256.json" assert { type: "json" }; +import testVectors128 from "./gcmEncryptExtIV128.json" with { type: "json" }; +import testVectors256 from "./gcmEncryptExtIV256.json" with { type: "json" }; import { assertEquals } from "@std/assert/mod.ts"; const aesGcm = (bits: string, key: Uint8Array) => { diff --git a/tools/lint.js b/tools/lint.js index ec8e147a51..aeab48c1a4 100755 --- a/tools/lint.js +++ b/tools/lint.js @@ -66,6 +66,7 @@ async function dlint() { ":!:cli/tsc/*typescript.js", ":!:cli/tsc/compiler.d.ts", ":!:tests/wpt/suite/**", + ":!:tests/wpt/runner/**", ]); if (!sourceFiles.length) { diff --git a/tools/util.js b/tools/util.js index f9cc2d911e..75ee1b5272 100644 --- a/tools/util.js +++ b/tools/util.js @@ -14,7 +14,7 @@ export { delay } from "../tests/util/std/async/delay.ts"; // [toolName] --version output const versions = { - "dlint": "dlint 0.52.2", + "dlint": "dlint 0.60.0", }; const compressed = new Set(["ld64.lld", "rcodesign"]); @@ -175,7 +175,7 @@ export function getPrebuiltToolPath(toolName) { return join(PREBUILT_TOOL_DIR, toolName + executableSuffix); } -const commitId = "5f2097d8247c7fbe30ba227f894d70ae5c1524c7"; +const commitId = "b8aac22e0cd7c1c6557a56a813fe0c25486fafee"; const downloadUrl = `https://raw.githubusercontent.com/denoland/deno_third_party/${commitId}/prebuilt/${platformDirName}`;