refactor: remove prefix from include_js_files & use extension name (#17683)

6 files changed, 10 insertions, 15 deletions

diff --git a/ext/webgpu/src/01_webgpu.js b/ext/webgpu/src/01_webgpu.js
index 58b713099..10243db2f 100644
--- a/ext/webgpu/src/01_webgpu.js
+++ b/ext/webgpu/src/01_webgpu.js
@@ -9,9 +9,9 @@
 const core = globalThis.Deno.core;
 const ops = core.ops;
 const primordials = globalThis.__bootstrap.primordials;
-import * as webidl from "internal:ext/webidl/00_webidl.js";
-import { EventTarget } from "internal:ext/web/02_event.js";
-import DOMException from "internal:ext/web/01_dom_exception.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
+import { EventTarget } from "internal:deno_web/02_event.js";
+import DOMException from "internal:deno_web/01_dom_exception.js";
 const {
   ArrayBuffer,
   ArrayBufferIsView,
diff --git a/ext/webgpu/src/02_idl_types.js b/ext/webgpu/src/02_idl_types.js
index daafdfa4b..e3ae7fb03 100644
--- a/ext/webgpu/src/02_idl_types.js
+++ b/ext/webgpu/src/02_idl_types.js
@@ -3,7 +3,7 @@
 // @ts-check
 /// <reference path="../web/internal.d.ts" />
 
-import * as webidl from "internal:ext/webidl/00_webidl.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
 import {
   GPU,
   GPUAdapter,
@@ -35,7 +35,7 @@ import {
   GPUTextureUsage,
   GPUTextureView,
   GPUValidationError,
-} from "internal:ext/webgpu/01_webgpu.js";
+} from "internal:deno_webgpu/01_webgpu.js";
 const primordials = globalThis.__bootstrap.primordials;
 const { SymbolIterator, TypeError } = primordials;
 
diff --git a/ext/webgpu/src/03_surface.js b/ext/webgpu/src/03_surface.js
index b46db047c..12b919a27 100644
--- a/ext/webgpu/src/03_surface.js
+++ b/ext/webgpu/src/03_surface.js
@@ -8,14 +8,14 @@
 
 const core = globalThis.Deno.core;
 const ops = core.ops;
-import * as webidl from "internal:ext/webidl/00_webidl.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
 const primordials = globalThis.__bootstrap.primordials;
 const { Symbol } = primordials;
 import {
   _device,
   assertDevice,
   createGPUTexture,
-} from "internal:ext/webgpu/01_webgpu.js";
+} from "internal:deno_webgpu/01_webgpu.js";
 
 const _surfaceRid = Symbol("[[surfaceRid]]");
 const _configuration = Symbol("[[configuration]]");
diff --git a/ext/webgpu/src/04_surface_idl_types.js b/ext/webgpu/src/04_surface_idl_types.js
index f9665afa6..cd6dabffc 100644
--- a/ext/webgpu/src/04_surface_idl_types.js
+++ b/ext/webgpu/src/04_surface_idl_types.js
@@ -6,8 +6,8 @@
 /// <reference path="../web/lib.deno_web.d.ts" />
 /// <reference path="./lib.deno_webgpu.d.ts" />
 
-import * as webidl from "internal:ext/webidl/00_webidl.js";
-import { GPUTextureUsage } from "internal:ext/webgpu/01_webgpu.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
+import { GPUTextureUsage } from "internal:deno_webgpu/01_webgpu.js";
 
 // ENUM: GPUCanvasAlphaMode
 webidl.converters["GPUCanvasAlphaMode"] = webidl.createEnumConverter(
diff --git a/ext/webgpu/src/lib.rs b/ext/webgpu/src/lib.rs
index 83326b71a..68069c133 100644
--- a/ext/webgpu/src/lib.rs
+++ b/ext/webgpu/src/lib.rs
@@ -119,11 +119,7 @@ impl Resource for WebGpuQuerySet {
 pub fn init(unstable: bool) -> Extension {
   Extension::builder(env!("CARGO_PKG_NAME"))
     .dependencies(vec!["deno_webidl", "deno_web"])
-    .esm(include_js_files!(
-      prefix "internal:ext/webgpu",
-      "01_webgpu.js",
-      "02_idl_types.js",
-    ))
+    .esm(include_js_files!("01_webgpu.js", "02_idl_types.js",))
     .ops(declare_webgpu_ops())
     .state(move |state| {
       // TODO: check & possibly streamline this
diff --git a/ext/webgpu/src/surface.rs b/ext/webgpu/src/surface.rs
index 84d17b38d..8304427b9 100644
--- a/ext/webgpu/src/surface.rs
+++ b/ext/webgpu/src/surface.rs
@@ -16,7 +16,6 @@ pub fn init_surface(unstable: bool) -> Extension {
   Extension::builder("deno_webgpu_surface")
     .dependencies(vec!["deno_webidl", "deno_web", "deno_webgpu"])
     .esm(include_js_files!(
-      prefix "internal:ext/webgpu",
       "03_surface.js",
       "04_surface_idl_types.js",
     ))