Skip to content

Commit c39a5ea

Browse files
authored
refactor: merge deno_url into deno_web (#31182)
This commit deprecated `deno_url` crate and merges it into `deno_web`. This will allow us to limit number of crates we need to publish and (maybe) improve compile and link times. The actual `ext/url` directory will be removed in a follow up PR, once a new version is published and points to `deno_web` crate.
1 parent f0cd15a commit c39a5ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+287
-375
lines changed

Cargo.lock

Lines changed: 2 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ deno_process = { version = "0.36.0", path = "./ext/process" }
109109
deno_signals = { version = "0.12.0", path = "./ext/signals" }
110110
deno_telemetry = { version = "0.43.0", path = "./ext/telemetry" }
111111
deno_tls = { version = "0.208.0", path = "./ext/tls" }
112-
deno_url = { version = "0.221.0", path = "./ext/url" }
113112
deno_web = { version = "0.252.0", path = "./ext/web" }
114113
deno_webgpu = { version = "0.188.0", path = "./ext/webgpu" }
115114
deno_webidl = { version = "0.221.0", path = "./ext/webidl" }
@@ -465,8 +464,6 @@ opt-level = 3
465464
opt-level = 3
466465
[profile.release.package.deno_tls]
467466
opt-level = 3
468-
[profile.release.package.deno_url]
469-
opt-level = 3
470467
[profile.release.package.deno_web]
471468
opt-level = 3
472469
[profile.release.package.deno_process]

ext/cache/01_cache.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
toInnerRequest,
2626
} from "ext:deno_fetch/23_request.js";
2727
import { toInnerResponse } from "ext:deno_fetch/23_response.js";
28-
import { URLPrototype } from "ext:deno_url/00_url.js";
28+
import { URLPrototype } from "ext:deno_web/00_url.js";
2929
import { getHeader } from "ext:deno_fetch/20_headers.js";
3030
import {
3131
getReadableStreamResourceBacking,

ext/cache/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub enum CacheError {
9898
pub struct CreateCache(pub Arc<dyn Fn() -> Result<CacheImpl, CacheError>>);
9999

100100
deno_core::extension!(deno_cache,
101-
deps = [ deno_webidl, deno_web, deno_url, deno_fetch ],
101+
deps = [ deno_webidl, deno_web, deno_fetch ],
102102
ops = [
103103
op_cache_storage_open,
104104
op_cache_storage_has,

ext/fetch/22_body.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import * as webidl from "ext:deno_webidl/00_webidl.js";
4141
import {
4242
parseUrlEncoded,
4343
URLSearchParamsPrototype,
44-
} from "ext:deno_url/00_url.js";
44+
} from "ext:deno_web/00_url.js";
4545
import {
4646
formDataFromEntries,
4747
FormDataPrototype,

ext/fetch/23_request.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const {
2727
import * as webidl from "ext:deno_webidl/00_webidl.js";
2828
import { createFilteredInspectProxy } from "ext:deno_console/01_console.js";
2929
import { HTTP_TOKEN_CODE_POINT_RE } from "ext:deno_web/00_infra.js";
30-
import { URL } from "ext:deno_url/00_url.js";
30+
import { URL } from "ext:deno_web/00_url.js";
3131
import { extractBody, mixinBody } from "ext:deno_fetch/22_body.js";
3232
import { getLocationHref } from "ext:deno_web/12_location.js";
3333
import { extractMimeType } from "ext:deno_web/01_mimesniff.js";

ext/fetch/23_response.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
import { extractBody, mixinBody } from "ext:deno_fetch/22_body.js";
2323
import { getLocationHref } from "ext:deno_web/12_location.js";
2424
import { extractMimeType } from "ext:deno_web/01_mimesniff.js";
25-
import { URL } from "ext:deno_url/00_url.js";
25+
import { URL } from "ext:deno_web/00_url.js";
2626
import {
2727
fillHeaders,
2828
getDecodeSplitHeader,

ext/fetch/27_eventsource.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const {
2222

2323
import * as webidl from "ext:deno_webidl/00_webidl.js";
2424
import { createFilteredInspectProxy } from "ext:deno_console/01_console.js";
25-
import { URL } from "ext:deno_url/00_url.js";
25+
import { URL } from "ext:deno_web/00_url.js";
2626
import { DOMException } from "ext:deno_web/01_dom_exception.js";
2727
import {
2828
defineEventHandler,

ext/fetch/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ Where:
6969

7070
- **deno_webidl**: Provided by the `deno_webidl` crate
7171
- **deno_web**: Provided by the `deno_web` crate
72-
- **deno_url**: Provided by the `deno_url` crate
7372
- **deno_console**: Provided by the `deno_console` crate
7473

7574
## Provided ops

ext/fetch/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl Default for Options {
145145
}
146146

147147
deno_core::extension!(deno_fetch,
148-
deps = [ deno_webidl, deno_web, deno_url, deno_console ],
148+
deps = [ deno_webidl, deno_web, deno_console ],
149149
parameters = [FP: FetchPermissions],
150150
ops = [
151151
op_fetch<FP>,

0 commit comments

Comments
 (0)