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

yazan-abdalrahman · Sep 15, 2024 · e4ea9be · e4ea9be
1 parent a666c8c
commit e4ea9be
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 64 deletions.
diff --git a/runtime/js/40_fs_events.js b/runtime/js/40_fs_events.js
@@ -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 });
   }

diff --git a/runtime/js/98_global_scope_window.js b/runtime/js/98_global_scope_window.js
@@ -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),

diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js
@@ -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;
 

diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
@@ -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"),

diff --git a/tests/node_compat/polyfill_globals.js b/tests/node_compat/polyfill_globals.js
@@ -18,4 +18,3 @@ globalThis.performance = performance;
 globalThis.setImmediate = setImmediate;
 globalThis.setInterval = setInterval;
 globalThis.setTimeout = setTimeout;
-delete globalThis.window;
diff --git a/tests/specs/future/runtime_api/__test__.jsonc b/tests/specs/future/runtime_api/__test__.jsonc
diff --git a/tests/specs/future/runtime_api/main.js b/tests/specs/future/runtime_api/main.js
diff --git a/tests/specs/future/runtime_api/main.out b/tests/specs/future/runtime_api/main.out
diff --git a/tests/specs/future/runtime_api/worker.js b/tests/specs/future/runtime_api/worker.js
diff --git a/tests/testdata/run/delete_window.js b/tests/testdata/run/delete_window.js
diff --git a/tools/lint.js b/tools/lint.js
@@ -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,