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

8 files changed, 41 insertions, 42 deletions

diff --git a/ext/fetch/20_headers.js b/ext/fetch/20_headers.js
index 9790bb69f..b8fd8ab83 100644
--- a/ext/fetch/20_headers.js
+++ b/ext/fetch/20_headers.js
@@ -9,7 +9,7 @@
 /// <reference path="./lib.deno_fetch.d.ts" />
 /// <reference lib="esnext" />
 
-import * as webidl from "internal:ext/webidl/00_webidl.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
 import {
   byteLowerCase,
   collectHttpQuotedString,
@@ -18,7 +18,7 @@ import {
   HTTP_TAB_OR_SPACE_SUFFIX_RE,
   HTTP_TOKEN_CODE_POINT_RE,
   httpTrim,
-} from "internal:ext/web/00_infra.js";
+} from "internal:deno_web/00_infra.js";
 const primordials = globalThis.__bootstrap.primordials;
 const {
   ArrayIsArray,
diff --git a/ext/fetch/21_formdata.js b/ext/fetch/21_formdata.js
index 1639646e0..647c716b3 100644
--- a/ext/fetch/21_formdata.js
+++ b/ext/fetch/21_formdata.js
@@ -10,13 +10,13 @@
 /// <reference lib="esnext" />
 
 const core = globalThis.Deno.core;
-import * as webidl from "internal:ext/webidl/00_webidl.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
 import {
   Blob,
   BlobPrototype,
   File,
   FilePrototype,
-} from "internal:ext/web/09_file.js";
+} from "internal:deno_web/09_file.js";
 const primordials = globalThis.__bootstrap.primordials;
 const {
   ArrayPrototypePush,
diff --git a/ext/fetch/22_body.js b/ext/fetch/22_body.js
index 48819650a..9161a1216 100644
--- a/ext/fetch/22_body.js
+++ b/ext/fetch/22_body.js
@@ -12,19 +12,19 @@
 /// <reference lib="esnext" />
 
 const core = globalThis.Deno.core;
-import * as webidl from "internal:ext/webidl/00_webidl.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
 import {
   parseUrlEncoded,
   URLSearchParamsPrototype,
-} from "internal:ext/url/00_url.js";
+} from "internal:deno_url/00_url.js";
 import {
   formDataFromEntries,
   FormDataPrototype,
   formDataToBlob,
   parseFormData,
-} from "internal:ext/fetch/21_formdata.js";
-import * as mimesniff from "internal:ext/web/01_mimesniff.js";
-import { BlobPrototype } from "internal:ext/web/09_file.js";
+} from "internal:deno_fetch/21_formdata.js";
+import * as mimesniff from "internal:deno_web/01_mimesniff.js";
+import { BlobPrototype } from "internal:deno_web/09_file.js";
 import {
   createProxy,
   errorReadableStream,
@@ -34,7 +34,7 @@ import {
   readableStreamDisturb,
   ReadableStreamPrototype,
   readableStreamThrowIfErrored,
-} from "internal:ext/web/06_streams.js";
+} from "internal:deno_web/06_streams.js";
 const primordials = globalThis.__bootstrap.primordials;
 const {
   ArrayBufferPrototype,
diff --git a/ext/fetch/23_request.js b/ext/fetch/23_request.js
index 1e8d5c1ec..15e2efb19 100644
--- a/ext/fetch/23_request.js
+++ b/ext/fetch/23_request.js
@@ -9,30 +9,30 @@
 /// <reference path="./lib.deno_fetch.d.ts" />
 /// <reference lib="esnext" />
 
-import * as webidl from "internal:ext/webidl/00_webidl.js";
-import { createFilteredInspectProxy } from "internal:ext/console/02_console.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
+import { createFilteredInspectProxy } from "internal:deno_console/02_console.js";
 import {
   byteUpperCase,
   HTTP_TOKEN_CODE_POINT_RE,
-} from "internal:ext/web/00_infra.js";
-import { URL } from "internal:ext/url/00_url.js";
+} from "internal:deno_web/00_infra.js";
+import { URL } from "internal:deno_url/00_url.js";
 import {
   extractBody,
   InnerBody,
   mixinBody,
-} from "internal:ext/fetch/22_body.js";
-import { getLocationHref } from "internal:ext/web/12_location.js";
-import { extractMimeType } from "internal:ext/web/01_mimesniff.js";
-import { blobFromObjectUrl } from "internal:ext/web/09_file.js";
+} from "internal:deno_fetch/22_body.js";
+import { getLocationHref } from "internal:deno_web/12_location.js";
+import { extractMimeType } from "internal:deno_web/01_mimesniff.js";
+import { blobFromObjectUrl } from "internal:deno_web/09_file.js";
 import {
   fillHeaders,
   getDecodeSplitHeader,
   guardFromHeaders,
   headerListFromHeaders,
   headersFromHeaderList,
-} from "internal:ext/fetch/20_headers.js";
-import { HttpClientPrototype } from "internal:ext/fetch/22_http_client.js";
-import * as abortSignal from "internal:ext/web/03_abort_signal.js";
+} from "internal:deno_fetch/20_headers.js";
+import { HttpClientPrototype } from "internal:deno_fetch/22_http_client.js";
+import * as abortSignal from "internal:deno_web/03_abort_signal.js";
 const primordials = globalThis.__bootstrap.primordials;
 const {
   ArrayPrototypeMap,
diff --git a/ext/fetch/23_response.js b/ext/fetch/23_response.js
index 46912135a..4b579a306 100644
--- a/ext/fetch/23_response.js
+++ b/ext/fetch/23_response.js
@@ -11,25 +11,25 @@
 /// <reference lib="esnext" />
 
 const core = globalThis.Deno.core;
-import * as webidl from "internal:ext/webidl/00_webidl.js";
-import { createFilteredInspectProxy } from "internal:ext/console/02_console.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
+import { createFilteredInspectProxy } from "internal:deno_console/02_console.js";
 import {
   byteLowerCase,
   HTTP_TAB_OR_SPACE,
   regexMatcher,
   serializeJSValueToJSONString,
-} from "internal:ext/web/00_infra.js";
-import { extractBody, mixinBody } from "internal:ext/fetch/22_body.js";
-import { getLocationHref } from "internal:ext/web/12_location.js";
-import { extractMimeType } from "internal:ext/web/01_mimesniff.js";
-import { URL } from "internal:ext/url/00_url.js";
+} from "internal:deno_web/00_infra.js";
+import { extractBody, mixinBody } from "internal:deno_fetch/22_body.js";
+import { getLocationHref } from "internal:deno_web/12_location.js";
+import { extractMimeType } from "internal:deno_web/01_mimesniff.js";
+import { URL } from "internal:deno_url/00_url.js";
 import {
   fillHeaders,
   getDecodeSplitHeader,
   guardFromHeaders,
   headerListFromHeaders,
   headersFromHeaderList,
-} from "internal:ext/fetch/20_headers.js";
+} from "internal:deno_fetch/20_headers.js";
 const primordials = globalThis.__bootstrap.primordials;
 const {
   ArrayPrototypeMap,
diff --git a/ext/fetch/26_fetch.js b/ext/fetch/26_fetch.js
index 9c136f242..6de68e8d6 100644
--- a/ext/fetch/26_fetch.js
+++ b/ext/fetch/26_fetch.js
@@ -12,19 +12,19 @@
 
 const core = globalThis.Deno.core;
 const ops = core.ops;
-import * as webidl from "internal:ext/webidl/00_webidl.js";
-import { byteLowerCase } from "internal:ext/web/00_infra.js";
-import { BlobPrototype } from "internal:ext/web/09_file.js";
+import * as webidl from "internal:deno_webidl/00_webidl.js";
+import { byteLowerCase } from "internal:deno_web/00_infra.js";
+import { BlobPrototype } from "internal:deno_web/09_file.js";
 import {
   errorReadableStream,
   readableStreamForRid,
   ReadableStreamPrototype,
-} from "internal:ext/web/06_streams.js";
-import { extractBody, InnerBody } from "internal:ext/fetch/22_body.js";
+} from "internal:deno_web/06_streams.js";
+import { extractBody, InnerBody } from "internal:deno_fetch/22_body.js";
 import {
   processUrlList,
   toInnerRequest,
-} from "internal:ext/fetch/23_request.js";
+} from "internal:deno_fetch/23_request.js";
 import {
   abortedNetworkError,
   fromInnerResponse,
@@ -32,8 +32,8 @@ import {
   nullBodyStatus,
   redirectStatus,
   toInnerResponse,
-} from "internal:ext/fetch/23_response.js";
-import * as abortSignal from "internal:ext/web/03_abort_signal.js";
+} from "internal:deno_fetch/23_response.js";
+import * as abortSignal from "internal:deno_web/03_abort_signal.js";
 const primordials = globalThis.__bootstrap.primordials;
 const {
   ArrayPrototypePush,
diff --git a/ext/fetch/internal.d.ts b/ext/fetch/internal.d.ts
index 596e3ffcb..09a7681b0 100644
--- a/ext/fetch/internal.d.ts
+++ b/ext/fetch/internal.d.ts
@@ -9,7 +9,7 @@ declare var domIterable: {
   DomIterableMixin(base: any, dataSymbol: symbol): any;
 };
 
-declare module "internal:ext/fetch/20_headers.js" {
+declare module "internal:deno_fetch/20_headers.js" {
   class Headers {
   }
   type HeaderList = [string, string][];
@@ -33,7 +33,7 @@ declare module "internal:ext/fetch/20_headers.js" {
   ): "immutable" | "request" | "request-no-cors" | "response" | "none";
 }
 
-declare module "internal:ext/fetch/21_formdata.js" {
+declare module "internal:deno_fetch/21_formdata.js" {
   type FormData = typeof FormData;
   function formDataToBlob(
     formData: FormData,
@@ -45,7 +45,7 @@ declare module "internal:ext/fetch/21_formdata.js" {
   function formDataFromEntries(entries: FormDataEntry[]): FormData;
 }
 
-declare module "internal:ext/fetch/22_body.js" {
+declare module "internal:deno_fetch/22_body.js" {
   function mixinBody(
     prototype: any,
     bodySymbol: symbol,
@@ -66,7 +66,7 @@ declare module "internal:ext/fetch/22_body.js" {
   };
 }
 
-declare module "internal:ext/fetch/26_fetch.js" {
+declare module "internal:deno_fetch/26_fetch.js" {
   function toInnerRequest(request: Request): InnerRequest;
   function fromInnerRequest(
     inner: InnerRequest,
diff --git a/ext/fetch/lib.rs b/ext/fetch/lib.rs
index 93c624dd6..766dabb62 100644
--- a/ext/fetch/lib.rs
+++ b/ext/fetch/lib.rs
@@ -98,7 +98,6 @@ where
   Extension::builder(env!("CARGO_PKG_NAME"))
     .dependencies(vec!["deno_webidl", "deno_web", "deno_url", "deno_console"])
     .esm(include_js_files!(
-      prefix "internal:ext/fetch",
       "20_headers.js",
       "21_formdata.js",
       "22_body.js",