chore: cleanup remaining internals.future code (#25624)

This commit is contained in:
Asher Gomez 2024-09-16 09:28:35 +10:00 committed by GitHub
parent a666c8c9f9
commit e4ea9be874
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 1 additions and 64 deletions

View File

@ -11,7 +11,6 @@ const {
ObjectPrototypeIsPrototypeOf,
PromiseResolve,
SymbolAsyncIterator,
ObjectDefineProperty,
} = primordials;
import { SymbolDispose } from "ext:deno_web/00_infra.js";
@ -21,13 +20,6 @@ class FsWatcher {
#promise;
constructor(paths, options) {
if (internals.future) {
ObjectDefineProperty(this, "rid", {
__proto__: null,
enumerable: false,
value: undefined,
});
}
const { recursive } = options;
this.#rid = op_fs_events_open({ recursive, paths });
}

View File

@ -112,7 +112,6 @@ const mainRuntimeGlobalProperties = {
Location: location.locationConstructorDescriptor,
location: location.locationDescriptor,
Window: globalInterfaces.windowConstructorDescriptor,
window: core.propGetterOnly(() => globalThis),
self: core.propGetterOnly(() => globalThis),
Navigator: core.propNonEnumerable(Navigator),
navigator: core.propGetterOnly(() => navigator),

View File

@ -641,11 +641,6 @@ function bootstrapMainRuntime(runtimeOptions, warmup = false) {
});
}
// TODO(iuioiua): remove in Deno v2. This allows us to dynamically delete
// class properties within constructors for classes that are not defined
// within the Deno namespace.
internals.future = true;
removeImportedOps();
performance.setTimeOrigin(DateNow());
@ -834,9 +829,6 @@ function bootstrapMainRuntime(runtimeOptions, warmup = false) {
nodeDebug,
});
}
if (internals.future) {
delete globalThis.window;
}
} else {
// Warmup
}
@ -865,11 +857,6 @@ function bootstrapWorkerRuntime(
7: nodeDebug,
} = runtimeOptions;
// TODO(iuioiua): remove in Deno v2. This allows us to dynamically delete
// class properties within constructors for classes that are not defined
// within the Deno namespace.
internals.future = true;
performance.setTimeOrigin(DateNow());
globalThis_ = globalThis;

View File

@ -3318,11 +3318,6 @@ itest!(import_attributes_type_check {
exit_code: 1,
});
itest!(delete_window {
args: "run run/delete_window.js",
output_str: Some("true\n"),
});
itest!(colors_without_global_this {
args: "run run/colors_without_globalThis.js",
output_str: Some("true\n"),

View File

@ -18,4 +18,3 @@ globalThis.performance = performance;
globalThis.setImmediate = setImmediate;
globalThis.setInterval = setInterval;
globalThis.setTimeout = setTimeout;
delete globalThis.window;

View File

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

View File

@ -1,15 +0,0 @@
console.log("window is", globalThis.window);
try {
new Deno.FsFile(0);
} catch (error) {
if (
error instanceof TypeError &&
error.message ===
"`Deno.FsFile` cannot be constructed, use `Deno.open()` or `Deno.openSync()` instead."
) {
console.log("Deno.FsFile constructor is illegal");
}
}
self.close();

View File

@ -1,2 +0,0 @@
window is undefined
Deno.FsFile constructor is illegal

View File

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

View File

@ -1 +0,0 @@
console.log(delete globalThis.window);

View File

@ -220,7 +220,7 @@ async function ensureNoNewITests() {
"pm_tests.rs": 0,
"publish_tests.rs": 0,
"repl_tests.rs": 0,
"run_tests.rs": 336,
"run_tests.rs": 335,
"shared_library_tests.rs": 0,
"task_tests.rs": 4,
"test_tests.rs": 74,