1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-23 15:49:44 -05:00

chore: use @std prefix for internal module specifiers (#24543)

This change aims to replace all relative import specifiers targeted at
`tests/util/std` with mapped ones (using a `deno.json` file). Towards
updating the `std` git submodule.
This commit is contained in:
Asher Gomez 2024-07-25 10:26:54 +10:00 committed by David Sherret
parent 4edb86496c
commit ef64585d13
52 changed files with 96 additions and 81 deletions

View file

@ -826,7 +826,7 @@ const ci = {
"!startsWith(github.ref, 'refs/tags/')",
].join("\n"),
run:
"target/release/deno run -A --unstable ext/websocket/autobahn/fuzzingclient.js",
"target/release/deno run -A --unstable --config tests/config/deno.json ext/websocket/autobahn/fuzzingclient.js",
},
{
name: "Test (full, debug)",
@ -879,9 +879,9 @@ const ci = {
DENO_BIN: "./target/debug/deno",
},
run: [
"deno run -A --unstable --lock=tools/deno.lock.json \\",
"deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\\",
" ./tests/wpt/wpt.ts setup",
"deno run -A --unstable --lock=tools/deno.lock.json \\",
"deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\\",
' ./tests/wpt/wpt.ts run --quiet --binary="$DENO_BIN"',
].join("\n"),
},
@ -892,9 +892,9 @@ const ci = {
DENO_BIN: "./target/release/deno",
},
run: [
"deno run -A --unstable --lock=tools/deno.lock.json \\",
"deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\\",
" ./tests/wpt/wpt.ts setup",
"deno run -A --unstable --lock=tools/deno.lock.json \\",
"deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\\",
" ./tests/wpt/wpt.ts run --quiet --release \\",
' --binary="$DENO_BIN" \\',
" --json=wpt.json \\",

View file

@ -494,7 +494,7 @@ jobs:
matrix.job == 'test' &&
matrix.profile == 'release' &&
!startsWith(github.ref, 'refs/tags/'))
run: target/release/deno run -A --unstable ext/websocket/autobahn/fuzzingclient.js
run: target/release/deno run -A --unstable --config tests/config/deno.json ext/websocket/autobahn/fuzzingclient.js
- name: 'Test (full, debug)'
if: |-
!(matrix.skip) && (matrix.job == 'test' &&
@ -531,18 +531,18 @@ jobs:
env:
DENO_BIN: ./target/debug/deno
run: |-
deno run -A --unstable --lock=tools/deno.lock.json \
deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\
./tests/wpt/wpt.ts setup
deno run -A --unstable --lock=tools/deno.lock.json \
deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\
./tests/wpt/wpt.ts run --quiet --binary="$DENO_BIN"
- name: Run web platform tests (release)
if: '!(matrix.skip) && (matrix.wpt && matrix.profile == ''release'')'
env:
DENO_BIN: ./target/release/deno
run: |-
deno run -A --unstable --lock=tools/deno.lock.json \
deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\
./tests/wpt/wpt.ts setup
deno run -A --unstable --lock=tools/deno.lock.json \
deno run -A --unstable --lock=tools/deno.lock.json --config tests/config/deno.json\
./tests/wpt/wpt.ts run --quiet --release \
--binary="$DENO_BIN" \
--json=wpt.json \

View file

@ -1,5 +1,5 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { parse } from "../../../tests/util/std/flags/mod.ts";
import { parse } from "@std/flags/mod.ts";
const { port } = parse(Deno.args, {
number: ["port"],

View file

@ -11,7 +11,8 @@ const AUTOBAHN_TESTSUITE_DOCKER =
"crossbario/autobahn-testsuite:0.8.2@sha256:5d4ba3aa7d6ab2fdbf6606f3f4ecbe4b66f205ce1cbc176d6cdf650157e52242";
const self = Deno.execPath();
$`${self} run -A --unstable ${pwd}/autobahn_server.js`.spawn();
$`${self} run -A --unstable --config ${pwd}/../../../tests/config/deno.json ${pwd}/autobahn_server.js`
.spawn();
for (let i = 0; i < 6; i++) {
try {

5
import_map.json Normal file
View file

@ -0,0 +1,5 @@
{
"imports": {
"@std/": "./tests/util/std/"
}
}

View file

@ -1,6 +1,4 @@
{
"imports": {
"@test_util/": "../../test_util/",
"@std/": "../util/std/"
}
"lock": false,
"importMap": "../../import_map.json"
}

View file

@ -195,6 +195,8 @@ fn standalone_follow_redirects() {
"compile",
"--output",
&exe.to_string_lossy(),
"--config",
"../config/deno.json",
"./compile/standalone_follow_redirects.ts",
])
.run()

View file

@ -216,6 +216,8 @@ fn no_snaps_included(test_name: &str, extension: &str) {
"--quiet".to_string(),
"--allow-read".to_string(),
format!("--coverage={}", tempdir),
"--config".to_string(),
"../config/deno.json".to_string(),
format!("coverage/no_snaps_included/{test_name}_test.{extension}"),
])
.run();
@ -256,6 +258,8 @@ fn no_tests_included(test_name: &str, extension: &str) {
"--quiet".to_string(),
"--allow-read".to_string(),
format!("--coverage={}", tempdir),
"--config".to_string(),
"../config/deno.json".to_string(),
format!("coverage/no_tests_included/{test_name}.test.{extension}"),
])
.run();
@ -337,6 +341,8 @@ fn no_transpiled_lines() {
"test".to_string(),
"--quiet".to_string(),
format!("--coverage={}", tempdir),
"--config".to_string(),
"../config/deno.json".to_string(),
"coverage/no_transpiled_lines/".to_string(),
])
.run();

View file

@ -206,7 +206,7 @@ itest!(_033_import_map_data_uri {
});
itest!(onload {
args: "run --quiet --reload run/onload/main.ts",
args: "run --quiet --reload --config ../config/deno.json run/onload/main.ts",
output: "run/onload/main.out",
});
@ -3163,12 +3163,12 @@ mod permissions {
}
itest!(tls_starttls {
args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem run/tls_starttls.js",
args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem --config ../config/deno.json run/tls_starttls.js",
output: "run/tls.out",
});
itest!(tls_connecttls {
args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem run/tls_connecttls.js",
args: "run --quiet --reload --allow-net --allow-read --cert tls/RootCA.pem --config ../config/deno.json run/tls_connecttls.js",
output: "run/tls.out",
});
@ -4512,6 +4512,8 @@ async fn websocket_server_idletimeout() {
.arg("--allow-net")
.arg("--cert")
.arg(root_ca)
.arg("--config")
.arg("./config/deno.json")
.arg(script)
.stdout_piped()
.spawn()
@ -5377,6 +5379,8 @@ async fn listen_tls_alpn_fail() {
.arg("--quiet")
.arg("--allow-net")
.arg("--allow-read")
.arg("--config")
.arg("../config/deno.json")
.arg("./cert/listen_tls_alpn_fail.ts")
.arg("4505")
.stdout_piped()

View file

@ -251,13 +251,13 @@ itest!(no_run {
});
itest!(allow_all {
args: "test --allow-all test/allow_all.ts",
args: "test --config ../config/deno.json --allow-all test/allow_all.ts",
exit_code: 0,
output: "test/allow_all.out",
});
itest!(allow_none {
args: "test test/allow_none.ts",
args: "test --config ../config/deno.json test/allow_none.ts",
exit_code: 1,
output: "test/allow_none.out",
});

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --allow-read=. --allow-write=. --allow-run=git
#!/usr/bin/env -S deno run --allow-read=. --allow-write=. --allow-run=git --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
/** This copies the test files according to the config file `tests/node_compat/config.jsonc` */

View file

@ -1,14 +1,14 @@
{
"steps": [
{
"args": "run -A --unstable-fs main.js",
"args": "run -A --unstable-fs --config ../../../config/deno.json main.js",
"output": "main.out",
"envs": {
"DENO_FUTURE": "1"
}
},
{
"args": "run -A --unstable-fs worker.js",
"args": "run -A --unstable-fs --config ../../../config/deno.json worker.js",
"output": "main.out",
"envs": {
"DENO_FUTURE": "1"

View file

@ -1,4 +1,4 @@
import { delay } from "../../../util/std/async/delay.ts";
import { delay } from "@std/async/delay.ts";
const worker = new Worker(import.meta.resolve("./main.js"), { type: "module" });
await delay(1_000);

View file

@ -2,7 +2,7 @@
"steps": [
{
// Notice `--unstable-*` flags are not needed anymore
"args": "run -A main.js",
"args": "run -A --config ../../../config/deno.json main.js",
"output": "main.out",
"envs": {
"DENO_FUTURE": "1"
@ -10,7 +10,7 @@
},
{
// Notice `--unstable-*` flags are not needed anymore
"args": "run -A worker.js",
"args": "run -A --config ../../../config/deno.json worker.js",
"output": "main.out",
"envs": {
"DENO_FUTURE": "1"

View file

@ -1,4 +1,4 @@
import { delay } from "../../../util/std/async/delay.ts";
import { delay } from "@std/async/delay.ts";
const worker = new Worker(import.meta.resolve("./main.js"), { type: "module" });
await delay(1_000);

View file

@ -1,4 +1,4 @@
{
"args": "run -L debug --allow-net --allow-env --allow-run --allow-read --reload --quiet proxy_test.ts",
"args": "run -L debug --allow-net --allow-env --allow-run --allow-read --reload --quiet --config ../../../config/deno.json proxy_test.ts",
"output": "proxy_test.ts.out"
}

View file

@ -1,5 +1,5 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { Server } from "../../../util/std/http/server.ts";
import { Server } from "@std/http/server.ts";
const addr = Deno.args[1] || "localhost:4555";

View file

@ -1,5 +1,5 @@
{
"args": "run -A main.js",
"args": "run -A --config ../../../config/deno.json main.js",
"exitCode": 0,
"output": "main.out"
}

View file

@ -1,4 +1,4 @@
import { emptyDir } from "../../../util/std/fs/empty_dir.ts";
import { emptyDir } from "@std/fs/empty_dir.ts";
const DIR = "./coverage";
const COMMAND = new Deno.Command(Deno.execPath(), {

View file

@ -1,5 +1,5 @@
import { sum } from "./sum.js";
import { assertEquals } from "../../../util/std/assert/assert_equals.ts";
import { assertEquals } from "@std/assert/assert_equals.ts";
Deno.test("sum()", () => {
assertEquals(sum(1, 2), 3);

View file

@ -1,4 +1,4 @@
import { assertRejects } from "../../../tests/util/std/assert/mod.ts";
import { assertRejects } from "@std/assert/mod.ts";
const listener = Deno.listenTls({
port: Number(Deno.args[0]),

View file

@ -1,15 +1,11 @@
import { join } from "../../../../tests/util/std/path/mod.ts";
console.log("Starting the main module");
// We load the dynamic import path from the file system, to make sure any
// improvements in static analysis can't defeat the purpose of this test, which
// is to make sure the `--include` flag works to add non-analyzed imports to the
// module graph.
const IMPORT_PATH_FILE_PATH = join(
Deno.cwd(),
"tests/testdata/compile/dynamic_imports/import_path",
);
const IMPORT_PATH_FILE_PATH =
"./tests/testdata/compile/dynamic_imports/import_path";
setTimeout(async () => {
console.log("Dynamic importing");

View file

@ -2,4 +2,4 @@
import {
assertNotEquals as _a,
assertStrictEquals as _b,
} from "../../../tests/util/std/assert/mod.ts";
} from "@std/assert/mod.ts";

View file

@ -1,4 +1,4 @@
import { assertSnapshot } from "../../../../tests/util/std/testing/snapshot.ts";
import { assertSnapshot } from "@std/testing/snapshot.ts";
import { truth } from "./no_snaps_included.ts";
Deno.test("the truth", () => {

View file

@ -1,5 +1,5 @@
import { addNumbers } from "./foo.ts";
import { assertEquals } from "../../../../tests/util/std/assert/mod.ts";
import { assertEquals } from "@std/assert/mod.ts";
Deno.test("addNumbers works", () => {
assertEquals(addNumbers(1, 2), 3);

View file

@ -1,5 +1,5 @@
import { addNumbers } from "./foo.ts";
import { assertEquals } from "../../../../tests/util/std/assert/mod.ts";
import { assertEquals } from "@std/assert/mod.ts";
Deno.test("addNumbers works", () => {
assertEquals(addNumbers(1, 2), 3);

View file

@ -1,5 +1,5 @@
import { addNumbers } from "./foo.ts";
import { assertEquals } from "../../../../tests/util/std/assert/mod.ts";
import { assertEquals } from "@std/assert/mod.ts";
Deno.test("addNumbers works", () => {
assertEquals(addNumbers(1, 2), 3);

View file

@ -1,3 +1,3 @@
export { assertStrictEquals } from "../../../../tests/util/std/assert/mod.ts";
export { assertStrictEquals } from "@std/assert/mod.ts";
export * from "./interface.ts";

View file

@ -1,4 +1,4 @@
import { copy } from "../../tests/util/std/io/copy.ts";
import { copy } from "@std/io/copy.ts";
const addr = Deno.args[0] || "0.0.0.0:4544";
const [hostname, port] = addr.split(":");
const listener = Deno.listen({ hostname, port: Number(port) });

View file

@ -1,5 +1,7 @@
{
"imports": {
"@std/": "../../../util/std/",
"bare": "https://example.com/",
"https://example.com/rewrite": "https://example.com/rewritten",

View file

@ -1,4 +1,4 @@
import { assertThrows } from "../../../../tests/util/std/assert/mod.ts";
import { assertThrows } from "@std/assert/mod.ts";
import "http://localhost:4545/run/import_meta/other.ts";
import "./other.ts";

View file

@ -1,5 +1,5 @@
// deno-lint-ignore-file no-window-prefix
import { assert } from "../../../../tests/util/std/assert/mod.ts";
import { assert } from "@std/assert/mod.ts";
import "./nest_imported.ts";
const handler = (e: Event) => {

View file

@ -1,5 +1,5 @@
// deno-lint-ignore-file no-window-prefix no-prototype-builtins
import { assert } from "../../../../tests/util/std/assert/mod.ts";
import { assert } from "@std/assert/mod.ts";
import "./imported.ts";
assert(window.hasOwnProperty("onload"));

View file

@ -1,5 +1,5 @@
// deno-lint-ignore-file no-window-prefix
import { assert } from "../../../../tests/util/std/assert/mod.ts";
import { assert } from "@std/assert/mod.ts";
const handler = (e: Event) => {
assert(e.type === "beforeunload" ? e.cancelable : !e.cancelable);

View file

@ -14,11 +14,8 @@
* @module
*/
import type {
BufReader,
ReadLineResult,
} from "../../../tests/util/std/io/buf_reader.ts";
import { concat } from "../../../tests/util/std/bytes/concat.ts";
import type { BufReader, ReadLineResult } from "@std/io/buf_reader.ts";
import { concat } from "@std/bytes/concat.ts";
// Constants created for DRY
const CHAR_SPACE: number = " ".charCodeAt(0);

View file

@ -1,5 +1,5 @@
import { assert, assertEquals } from "../../../tests/util/std/assert/mod.ts";
import { BufReader, BufWriter } from "../../../tests/util/std/io/mod.ts";
import { assert, assertEquals } from "@std/assert/mod.ts";
import { BufReader, BufWriter } from "@std/io/mod.ts";
import { TextProtoReader } from "./textproto.ts";
const encoder = new TextEncoder();

View file

@ -1,6 +1,6 @@
import { assert, assertEquals } from "../../../tests/util/std/assert/mod.ts";
import { BufReader } from "../../../tests/util/std/io/buf_reader.ts";
import { BufWriter } from "../../../tests/util/std/io/buf_writer.ts";
import { assert, assertEquals } from "@std/assert/mod.ts";
import { BufReader } from "@std/io/buf_reader.ts";
import { BufWriter } from "@std/io/buf_writer.ts";
import { TextProtoReader } from "./textproto.ts";
const encoder = new TextEncoder();

View file

@ -1,4 +1,4 @@
import { assertEquals } from "../../../tests/util/std/assert/mod.ts";
import { assertEquals } from "@std/assert/mod.ts";
const errorDeferred = Promise.withResolvers<void>();
const closeDeferred = Promise.withResolvers<void>();

View file

@ -1,4 +1,4 @@
import { assertEquals } from "../../../tests/util/std/assert/mod.ts";
import { assertEquals } from "@std/assert/mod.ts";
const permissions: Deno.PermissionName[] = [
"read",

View file

@ -1,4 +1,4 @@
import { unreachable } from "../../../tests/util/std/assert/mod.ts";
import { unreachable } from "@std/assert/mod.ts";
const permissions: Deno.PermissionName[] = [
"read",

View file

@ -1,4 +1,4 @@
import { assert } from "../../../tests/util/std/assert/mod.ts";
import { assert } from "@std/assert/mod.ts";
onmessage = function (e) {
if (typeof self.Deno === "undefined") {

View file

@ -11,7 +11,7 @@ import {
assertRejects,
assertThrows,
} from "./test_util.ts";
import { writeAllSync } from "../util/std/io/write_all.ts";
import { writeAllSync } from "@std/io/write_all.ts";
const MAX_SIZE = 2 ** 32 - 2;
// N controls how many iterations of certain checks are performed.

View file

@ -1,7 +1,7 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
/// FLAGS
import { parse } from "../../util/std/flags/mod.ts";
import { parse } from "@std/flags/mod.ts";
import { join, resolve, ROOT_PATH } from "../../../tools/util.js";
export const {

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --allow-write --allow-read --allow-net --allow-env --allow-run
#!/usr/bin/env -S deno run --allow-write --allow-read --allow-net --allow-env --allow-run --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
// This script is used to run WPT tests for Deno.
@ -32,9 +32,9 @@ import {
updateManifest,
wptreport,
} from "./runner/utils.ts";
import { pooledMap } from "../util/std/async/pool.ts";
import { blue, bold, green, red, yellow } from "../util/std/fmt/colors.ts";
import { writeAll, writeAllSync } from "../util/std/io/write_all.ts";
import { pooledMap } from "@std/async/pool.ts";
import { blue, bold, green, red, yellow } from "@std/fmt/colors.ts";
import { writeAll, writeAllSync } from "@std/io/write_all.ts";
import { saveExpectation } from "./runner/utils.ts";
class TestFilter {

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --allow-read=. --allow-run=git
#!/usr/bin/env -S deno run --allow-read=. --allow-run=git --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { getSources, ROOT_PATH } from "./util.js";

4
tools/deno.json Normal file
View file

@ -0,0 +1,4 @@
{
"lock": false,
"importMap": "../import_map.json"
}

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --allow-write --allow-read --allow-run --allow-net
#!/usr/bin/env -S deno run --allow-write --allow-read --allow-run --allow-net --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { join, ROOT_PATH } from "./util.js";

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --unstable --allow-write --allow-read --allow-net
#!/usr/bin/env -S deno run --unstable --allow-write --allow-read --allow-net --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { getPrebuilt } from "./util.js";

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --allow-read --allow-env --allow-sys
#!/usr/bin/env -S deno run --allow-read --allow-env --allow-sys --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { Node, Project, ts } from "npm:ts-morph@22.0.0";
import { join, ROOT_PATH } from "./util.js";

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --allow-write --allow-read --allow-run --allow-net
#!/usr/bin/env -S deno run --allow-write --allow-read --allow-run --allow-net --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { buildMode, getPrebuilt, getSources, join, ROOT_PATH } from "./util.js";
import { checkCopyright } from "./copyright_checker.js";

View file

@ -5,12 +5,12 @@ import {
join,
resolve,
toFileUrl,
} from "../tests/util/std/path/mod.ts";
} from "@std/path/mod.ts";
import { wait } from "https://deno.land/x/wait@0.1.13/mod.ts";
export { dirname, fromFileUrl, join, resolve, toFileUrl };
export { existsSync, walk } from "../tests/util/std/fs/mod.ts";
export { TextLineStream } from "../tests/util/std/streams/text_line_stream.ts";
export { delay } from "../tests/util/std/async/delay.ts";
export { existsSync, walk } from "@std/fs/mod.ts";
export { TextLineStream } from "@std/streams/text_line_stream.ts";
export { delay } from "@std/async/delay.ts";
// [toolName] --version output
const versions = {

View file

@ -1,4 +1,4 @@
#!/usr/bin/env -S deno run --unstable --allow-read --allow-write --allow-run
#!/usr/bin/env -S deno run --unstable --allow-read --allow-write --allow-run --config=tests/config/deno.json
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
import { join, ROOT_PATH } from "./util.js";