diff --git a/Cargo.toml b/Cargo.toml index 8d0768697d..ce7bc47e67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,20 +8,20 @@ members = [ "runtime", "test_ffi", "test_util", - "extensions/broadcast_channel", - "extensions/console", - "extensions/crypto", - "extensions/fetch", - "extensions/ffi", - "extensions/http", - "extensions/net", - "extensions/timers", - "extensions/url", - "extensions/web", - "extensions/webgpu", - "extensions/webidl", - "extensions/websocket", - "extensions/webstorage", + "ext/broadcast_channel", + "ext/console", + "ext/crypto", + "ext/fetch", + "ext/ffi", + "ext/http", + "ext/net", + "ext/timers", + "ext/url", + "ext/web", + "ext/webgpu", + "ext/webidl", + "ext/websocket", + "ext/webstorage", ] exclude = ["test_util/std/hash/_wasm"] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index a7fe7faa49..dc30c71f33 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -20,21 +20,21 @@ harness = false path = "./bench/main.rs" [build-dependencies] -deno_broadcast_channel = { version = "0.8.0", path = "../extensions/broadcast_channel" } -deno_console = { version = "0.14.0", path = "../extensions/console" } +deno_broadcast_channel = { version = "0.8.0", path = "../ext/broadcast_channel" } +deno_console = { version = "0.14.0", path = "../ext/console" } deno_core = { version = "0.96.0", path = "../core" } -deno_crypto = { version = "0.28.0", path = "../extensions/crypto" } -deno_fetch = { version = "0.37.0", path = "../extensions/fetch" } -deno_ffi = { version = "0.1.0", path = "../extensions/ffi" } -deno_http = { version = "0.5.0", path = "../extensions/http" } -deno_net = { version = "0.5.0", path = "../extensions/net" } -deno_timers = { version = "0.12.0", path = "../extensions/timers" } -deno_url = { version = "0.14.0", path = "../extensions/url" } -deno_web = { version = "0.45.0", path = "../extensions/web" } -deno_webgpu = { version = "0.15.0", path = "../extensions/webgpu" } -deno_webidl = { version = "0.14.0", path = "../extensions/webidl" } -deno_websocket = { version = "0.19.0", path = "../extensions/websocket" } -deno_webstorage = { version = "0.9.0", path = "../extensions/webstorage" } +deno_crypto = { version = "0.28.0", path = "../ext/crypto" } +deno_fetch = { version = "0.37.0", path = "../ext/fetch" } +deno_ffi = { version = "0.1.0", path = "../ext/ffi" } +deno_http = { version = "0.5.0", path = "../ext/http" } +deno_net = { version = "0.5.0", path = "../ext/net" } +deno_timers = { version = "0.12.0", path = "../ext/timers" } +deno_url = { version = "0.14.0", path = "../ext/url" } +deno_web = { version = "0.45.0", path = "../ext/web" } +deno_webgpu = { version = "0.15.0", path = "../ext/webgpu" } +deno_webidl = { version = "0.14.0", path = "../ext/webidl" } +deno_websocket = { version = "0.19.0", path = "../ext/websocket" } +deno_webstorage = { version = "0.9.0", path = "../ext/webstorage" } regex = "1.4.3" serde = { version = "1.0.125", features = ["derive"] } @@ -47,7 +47,7 @@ deno_core = { version = "0.96.0", path = "../core" } deno_doc = "0.10.0" deno_lint = "0.12.0" deno_runtime = { version = "0.22.0", path = "../runtime" } -deno_tls = { version = "0.1.0", path = "../extensions/tls" } +deno_tls = { version = "0.1.0", path = "../ext/tls" } atty = "0.2.14" base64 = "0.13.0" diff --git a/cli/tests/error_009_extensions_error.js.out b/cli/tests/error_009_extensions_error.js.out index 96ffb28298..8510980f64 100644 --- a/cli/tests/error_009_extensions_error.js.out +++ b/cli/tests/error_009_extensions_error.js.out @@ -2,5 +2,5 @@ new Event(); ^ at [WILDCARD] - at new Event (deno:extensions/web/[WILDCARD]) + at new Event (deno:ext/web/[WILDCARD]) at [WILDCARD] diff --git a/extensions/broadcast_channel/01_broadcast_channel.js b/ext/broadcast_channel/01_broadcast_channel.js similarity index 100% rename from extensions/broadcast_channel/01_broadcast_channel.js rename to ext/broadcast_channel/01_broadcast_channel.js diff --git a/extensions/broadcast_channel/Cargo.toml b/ext/broadcast_channel/Cargo.toml similarity index 100% rename from extensions/broadcast_channel/Cargo.toml rename to ext/broadcast_channel/Cargo.toml diff --git a/extensions/broadcast_channel/README.md b/ext/broadcast_channel/README.md similarity index 100% rename from extensions/broadcast_channel/README.md rename to ext/broadcast_channel/README.md diff --git a/extensions/broadcast_channel/in_memory_broadcast_channel.rs b/ext/broadcast_channel/in_memory_broadcast_channel.rs similarity index 100% rename from extensions/broadcast_channel/in_memory_broadcast_channel.rs rename to ext/broadcast_channel/in_memory_broadcast_channel.rs diff --git a/extensions/broadcast_channel/lib.deno_broadcast_channel.d.ts b/ext/broadcast_channel/lib.deno_broadcast_channel.d.ts similarity index 100% rename from extensions/broadcast_channel/lib.deno_broadcast_channel.d.ts rename to ext/broadcast_channel/lib.deno_broadcast_channel.d.ts diff --git a/extensions/broadcast_channel/lib.rs b/ext/broadcast_channel/lib.rs similarity index 98% rename from extensions/broadcast_channel/lib.rs rename to ext/broadcast_channel/lib.rs index b2a79916cb..3f88db162d 100644 --- a/extensions/broadcast_channel/lib.rs +++ b/ext/broadcast_channel/lib.rs @@ -110,7 +110,7 @@ pub fn init( ) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/broadcast_channel", + prefix "deno:ext/broadcast_channel", "01_broadcast_channel.js", )) .ops(vec![ diff --git a/extensions/console/01_colors.js b/ext/console/01_colors.js similarity index 100% rename from extensions/console/01_colors.js rename to ext/console/01_colors.js diff --git a/extensions/console/02_console.js b/ext/console/02_console.js similarity index 100% rename from extensions/console/02_console.js rename to ext/console/02_console.js diff --git a/extensions/console/Cargo.toml b/ext/console/Cargo.toml similarity index 100% rename from extensions/console/Cargo.toml rename to ext/console/Cargo.toml diff --git a/extensions/console/README.md b/ext/console/README.md similarity index 100% rename from extensions/console/README.md rename to ext/console/README.md diff --git a/extensions/console/internal.d.ts b/ext/console/internal.d.ts similarity index 100% rename from extensions/console/internal.d.ts rename to ext/console/internal.d.ts diff --git a/extensions/console/lib.deno_console.d.ts b/ext/console/lib.deno_console.d.ts similarity index 100% rename from extensions/console/lib.deno_console.d.ts rename to ext/console/lib.deno_console.d.ts diff --git a/extensions/console/lib.rs b/ext/console/lib.rs similarity index 91% rename from extensions/console/lib.rs rename to ext/console/lib.rs index 27870fce69..40a428fa96 100644 --- a/extensions/console/lib.rs +++ b/ext/console/lib.rs @@ -7,7 +7,7 @@ use std::path::PathBuf; pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/console", + prefix "deno:ext/console", "01_colors.js", "02_console.js", )) diff --git a/extensions/crypto/00_crypto.js b/ext/crypto/00_crypto.js similarity index 100% rename from extensions/crypto/00_crypto.js rename to ext/crypto/00_crypto.js diff --git a/extensions/crypto/01_webidl.js b/ext/crypto/01_webidl.js similarity index 100% rename from extensions/crypto/01_webidl.js rename to ext/crypto/01_webidl.js diff --git a/extensions/crypto/Cargo.toml b/ext/crypto/Cargo.toml similarity index 100% rename from extensions/crypto/Cargo.toml rename to ext/crypto/Cargo.toml diff --git a/extensions/crypto/README.md b/ext/crypto/README.md similarity index 100% rename from extensions/crypto/README.md rename to ext/crypto/README.md diff --git a/extensions/crypto/key.rs b/ext/crypto/key.rs similarity index 100% rename from extensions/crypto/key.rs rename to ext/crypto/key.rs diff --git a/extensions/crypto/lib.deno_crypto.d.ts b/ext/crypto/lib.deno_crypto.d.ts similarity index 100% rename from extensions/crypto/lib.deno_crypto.d.ts rename to ext/crypto/lib.deno_crypto.d.ts diff --git a/extensions/crypto/lib.rs b/ext/crypto/lib.rs similarity index 99% rename from extensions/crypto/lib.rs rename to ext/crypto/lib.rs index 5989b121ac..e77b349876 100644 --- a/extensions/crypto/lib.rs +++ b/ext/crypto/lib.rs @@ -62,7 +62,7 @@ lazy_static! { pub fn init(maybe_seed: Option) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/crypto", + prefix "deno:ext/crypto", "00_crypto.js", "01_webidl.js", )) diff --git a/extensions/fetch/01_fetch_util.js b/ext/fetch/01_fetch_util.js similarity index 100% rename from extensions/fetch/01_fetch_util.js rename to ext/fetch/01_fetch_util.js diff --git a/extensions/fetch/20_headers.js b/ext/fetch/20_headers.js similarity index 100% rename from extensions/fetch/20_headers.js rename to ext/fetch/20_headers.js diff --git a/extensions/fetch/21_formdata.js b/ext/fetch/21_formdata.js similarity index 100% rename from extensions/fetch/21_formdata.js rename to ext/fetch/21_formdata.js diff --git a/extensions/fetch/22_body.js b/ext/fetch/22_body.js similarity index 100% rename from extensions/fetch/22_body.js rename to ext/fetch/22_body.js diff --git a/extensions/fetch/22_http_client.js b/ext/fetch/22_http_client.js similarity index 100% rename from extensions/fetch/22_http_client.js rename to ext/fetch/22_http_client.js diff --git a/extensions/fetch/23_request.js b/ext/fetch/23_request.js similarity index 100% rename from extensions/fetch/23_request.js rename to ext/fetch/23_request.js diff --git a/extensions/fetch/23_response.js b/ext/fetch/23_response.js similarity index 100% rename from extensions/fetch/23_response.js rename to ext/fetch/23_response.js diff --git a/extensions/fetch/26_fetch.js b/ext/fetch/26_fetch.js similarity index 100% rename from extensions/fetch/26_fetch.js rename to ext/fetch/26_fetch.js diff --git a/extensions/fetch/Cargo.toml b/ext/fetch/Cargo.toml similarity index 100% rename from extensions/fetch/Cargo.toml rename to ext/fetch/Cargo.toml diff --git a/extensions/fetch/README.md b/ext/fetch/README.md similarity index 100% rename from extensions/fetch/README.md rename to ext/fetch/README.md diff --git a/extensions/fetch/internal.d.ts b/ext/fetch/internal.d.ts similarity index 100% rename from extensions/fetch/internal.d.ts rename to ext/fetch/internal.d.ts diff --git a/extensions/fetch/lib.deno_fetch.d.ts b/ext/fetch/lib.deno_fetch.d.ts similarity index 100% rename from extensions/fetch/lib.deno_fetch.d.ts rename to ext/fetch/lib.deno_fetch.d.ts diff --git a/extensions/fetch/lib.rs b/ext/fetch/lib.rs similarity index 99% rename from extensions/fetch/lib.rs rename to ext/fetch/lib.rs index d9e016b0de..e89df470aa 100644 --- a/extensions/fetch/lib.rs +++ b/ext/fetch/lib.rs @@ -64,7 +64,7 @@ pub fn init( ) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/fetch", + prefix "deno:ext/fetch", "01_fetch_util.js", "20_headers.js", "21_formdata.js", diff --git a/extensions/ffi/00_ffi.js b/ext/ffi/00_ffi.js similarity index 100% rename from extensions/ffi/00_ffi.js rename to ext/ffi/00_ffi.js diff --git a/extensions/ffi/Cargo.toml b/ext/ffi/Cargo.toml similarity index 100% rename from extensions/ffi/Cargo.toml rename to ext/ffi/Cargo.toml diff --git a/extensions/ffi/README.md b/ext/ffi/README.md similarity index 100% rename from extensions/ffi/README.md rename to ext/ffi/README.md diff --git a/extensions/ffi/lib.rs b/ext/ffi/lib.rs similarity index 99% rename from extensions/ffi/lib.rs rename to ext/ffi/lib.rs index 125e6da994..2100a4d537 100644 --- a/extensions/ffi/lib.rs +++ b/ext/ffi/lib.rs @@ -100,7 +100,7 @@ impl DynamicLibraryResource { pub fn init(unstable: bool) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/ffi", + prefix "deno:ext/ffi", "00_ffi.js", )) .ops(vec![ diff --git a/extensions/http/01_http.js b/ext/http/01_http.js similarity index 100% rename from extensions/http/01_http.js rename to ext/http/01_http.js diff --git a/extensions/http/Cargo.toml b/ext/http/Cargo.toml similarity index 100% rename from extensions/http/Cargo.toml rename to ext/http/Cargo.toml diff --git a/extensions/http/README.md b/ext/http/README.md similarity index 100% rename from extensions/http/README.md rename to ext/http/README.md diff --git a/extensions/http/lib.deno_http.unstable.d.ts b/ext/http/lib.deno_http.unstable.d.ts similarity index 100% rename from extensions/http/lib.deno_http.unstable.d.ts rename to ext/http/lib.deno_http.unstable.d.ts diff --git a/extensions/http/lib.rs b/ext/http/lib.rs similarity index 99% rename from extensions/http/lib.rs rename to ext/http/lib.rs index a20e74c038..2c858143c6 100644 --- a/extensions/http/lib.rs +++ b/ext/http/lib.rs @@ -52,7 +52,7 @@ pub fn get_unstable_declaration() -> PathBuf { pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/http", + prefix "deno:ext/http", "01_http.js", )) .ops(vec![ diff --git a/extensions/net/01_net.js b/ext/net/01_net.js similarity index 100% rename from extensions/net/01_net.js rename to ext/net/01_net.js diff --git a/extensions/net/02_tls.js b/ext/net/02_tls.js similarity index 100% rename from extensions/net/02_tls.js rename to ext/net/02_tls.js diff --git a/extensions/net/04_net_unstable.js b/ext/net/04_net_unstable.js similarity index 100% rename from extensions/net/04_net_unstable.js rename to ext/net/04_net_unstable.js diff --git a/extensions/net/Cargo.toml b/ext/net/Cargo.toml similarity index 100% rename from extensions/net/Cargo.toml rename to ext/net/Cargo.toml diff --git a/extensions/net/README.md b/ext/net/README.md similarity index 100% rename from extensions/net/README.md rename to ext/net/README.md diff --git a/extensions/net/io.rs b/ext/net/io.rs similarity index 100% rename from extensions/net/io.rs rename to ext/net/io.rs diff --git a/extensions/net/lib.deno_net.d.ts b/ext/net/lib.deno_net.d.ts similarity index 100% rename from extensions/net/lib.deno_net.d.ts rename to ext/net/lib.deno_net.d.ts diff --git a/extensions/net/lib.deno_net.unstable.d.ts b/ext/net/lib.deno_net.unstable.d.ts similarity index 100% rename from extensions/net/lib.deno_net.unstable.d.ts rename to ext/net/lib.deno_net.unstable.d.ts diff --git a/extensions/net/lib.rs b/ext/net/lib.rs similarity index 99% rename from extensions/net/lib.rs rename to ext/net/lib.rs index fe10abf5fd..3764433e3b 100644 --- a/extensions/net/lib.rs +++ b/ext/net/lib.rs @@ -111,7 +111,7 @@ pub fn init( ops_to_register.extend(ops_tls::init::

()); Extension::builder() .js(include_js_files!( - prefix "deno:extensions/net", + prefix "deno:ext/net", "01_net.js", "02_tls.js", "04_net_unstable.js", diff --git a/extensions/net/ops.rs b/ext/net/ops.rs similarity index 100% rename from extensions/net/ops.rs rename to ext/net/ops.rs diff --git a/extensions/net/ops_tls.rs b/ext/net/ops_tls.rs similarity index 100% rename from extensions/net/ops_tls.rs rename to ext/net/ops_tls.rs diff --git a/extensions/net/ops_unix.rs b/ext/net/ops_unix.rs similarity index 100% rename from extensions/net/ops_unix.rs rename to ext/net/ops_unix.rs diff --git a/extensions/net/resolve_addr.rs b/ext/net/resolve_addr.rs similarity index 100% rename from extensions/net/resolve_addr.rs rename to ext/net/resolve_addr.rs diff --git a/extensions/timers/01_timers.js b/ext/timers/01_timers.js similarity index 100% rename from extensions/timers/01_timers.js rename to ext/timers/01_timers.js diff --git a/extensions/timers/02_performance.js b/ext/timers/02_performance.js similarity index 100% rename from extensions/timers/02_performance.js rename to ext/timers/02_performance.js diff --git a/extensions/timers/Cargo.toml b/ext/timers/Cargo.toml similarity index 100% rename from extensions/timers/Cargo.toml rename to ext/timers/Cargo.toml diff --git a/extensions/timers/README.md b/ext/timers/README.md similarity index 100% rename from extensions/timers/README.md rename to ext/timers/README.md diff --git a/extensions/timers/benches/timers_ops.rs b/ext/timers/benches/timers_ops.rs similarity index 100% rename from extensions/timers/benches/timers_ops.rs rename to ext/timers/benches/timers_ops.rs diff --git a/extensions/timers/lib.rs b/ext/timers/lib.rs similarity index 99% rename from extensions/timers/lib.rs rename to ext/timers/lib.rs index 5f65ae3eff..2b9948d1fd 100644 --- a/extensions/timers/lib.rs +++ b/ext/timers/lib.rs @@ -43,7 +43,7 @@ impl TimersPermission for NoTimersPermission { pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/timers", + prefix "deno:ext/timers", "01_timers.js", "02_performance.js", )) diff --git a/extensions/tls/Cargo.toml b/ext/tls/Cargo.toml similarity index 100% rename from extensions/tls/Cargo.toml rename to ext/tls/Cargo.toml diff --git a/extensions/tls/README.md b/ext/tls/README.md similarity index 100% rename from extensions/tls/README.md rename to ext/tls/README.md diff --git a/extensions/tls/lib.rs b/ext/tls/lib.rs similarity index 100% rename from extensions/tls/lib.rs rename to ext/tls/lib.rs diff --git a/extensions/url/00_url.js b/ext/url/00_url.js similarity index 100% rename from extensions/url/00_url.js rename to ext/url/00_url.js diff --git a/extensions/url/Cargo.toml b/ext/url/Cargo.toml similarity index 100% rename from extensions/url/Cargo.toml rename to ext/url/Cargo.toml diff --git a/extensions/url/README.md b/ext/url/README.md similarity index 100% rename from extensions/url/README.md rename to ext/url/README.md diff --git a/extensions/url/benches/url_ops.rs b/ext/url/benches/url_ops.rs similarity index 100% rename from extensions/url/benches/url_ops.rs rename to ext/url/benches/url_ops.rs diff --git a/extensions/url/internal.d.ts b/ext/url/internal.d.ts similarity index 100% rename from extensions/url/internal.d.ts rename to ext/url/internal.d.ts diff --git a/extensions/url/lib.deno_url.d.ts b/ext/url/lib.deno_url.d.ts similarity index 100% rename from extensions/url/lib.deno_url.d.ts rename to ext/url/lib.deno_url.d.ts diff --git a/extensions/url/lib.rs b/ext/url/lib.rs similarity index 99% rename from extensions/url/lib.rs rename to ext/url/lib.rs index ab2e496d13..8ccc59eb88 100644 --- a/extensions/url/lib.rs +++ b/ext/url/lib.rs @@ -19,7 +19,7 @@ use std::path::PathBuf; pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/url", + prefix "deno:ext/url", "00_url.js", )) .ops(vec![ diff --git a/extensions/web/00_infra.js b/ext/web/00_infra.js similarity index 100% rename from extensions/web/00_infra.js rename to ext/web/00_infra.js diff --git a/extensions/web/01_dom_exception.js b/ext/web/01_dom_exception.js similarity index 100% rename from extensions/web/01_dom_exception.js rename to ext/web/01_dom_exception.js diff --git a/extensions/web/01_mimesniff.js b/ext/web/01_mimesniff.js similarity index 100% rename from extensions/web/01_mimesniff.js rename to ext/web/01_mimesniff.js diff --git a/extensions/web/02_event.js b/ext/web/02_event.js similarity index 100% rename from extensions/web/02_event.js rename to ext/web/02_event.js diff --git a/extensions/web/02_structured_clone.js b/ext/web/02_structured_clone.js similarity index 100% rename from extensions/web/02_structured_clone.js rename to ext/web/02_structured_clone.js diff --git a/extensions/web/03_abort_signal.js b/ext/web/03_abort_signal.js similarity index 100% rename from extensions/web/03_abort_signal.js rename to ext/web/03_abort_signal.js diff --git a/extensions/web/04_global_interfaces.js b/ext/web/04_global_interfaces.js similarity index 100% rename from extensions/web/04_global_interfaces.js rename to ext/web/04_global_interfaces.js diff --git a/extensions/web/05_base64.js b/ext/web/05_base64.js similarity index 100% rename from extensions/web/05_base64.js rename to ext/web/05_base64.js diff --git a/extensions/web/06_streams.js b/ext/web/06_streams.js similarity index 100% rename from extensions/web/06_streams.js rename to ext/web/06_streams.js diff --git a/extensions/web/06_streams_types.d.ts b/ext/web/06_streams_types.d.ts similarity index 100% rename from extensions/web/06_streams_types.d.ts rename to ext/web/06_streams_types.d.ts diff --git a/extensions/web/08_text_encoding.js b/ext/web/08_text_encoding.js similarity index 100% rename from extensions/web/08_text_encoding.js rename to ext/web/08_text_encoding.js diff --git a/extensions/web/09_file.js b/ext/web/09_file.js similarity index 100% rename from extensions/web/09_file.js rename to ext/web/09_file.js diff --git a/extensions/web/10_filereader.js b/ext/web/10_filereader.js similarity index 100% rename from extensions/web/10_filereader.js rename to ext/web/10_filereader.js diff --git a/extensions/web/11_blob_url.js b/ext/web/11_blob_url.js similarity index 100% rename from extensions/web/11_blob_url.js rename to ext/web/11_blob_url.js diff --git a/extensions/web/12_location.js b/ext/web/12_location.js similarity index 100% rename from extensions/web/12_location.js rename to ext/web/12_location.js diff --git a/extensions/web/13_message_port.js b/ext/web/13_message_port.js similarity index 100% rename from extensions/web/13_message_port.js rename to ext/web/13_message_port.js diff --git a/extensions/web/Cargo.toml b/ext/web/Cargo.toml similarity index 100% rename from extensions/web/Cargo.toml rename to ext/web/Cargo.toml diff --git a/extensions/web/README.md b/ext/web/README.md similarity index 100% rename from extensions/web/README.md rename to ext/web/README.md diff --git a/extensions/web/blob.rs b/ext/web/blob.rs similarity index 100% rename from extensions/web/blob.rs rename to ext/web/blob.rs diff --git a/extensions/web/internal.d.ts b/ext/web/internal.d.ts similarity index 100% rename from extensions/web/internal.d.ts rename to ext/web/internal.d.ts diff --git a/extensions/web/lib.deno_web.d.ts b/ext/web/lib.deno_web.d.ts similarity index 100% rename from extensions/web/lib.deno_web.d.ts rename to ext/web/lib.deno_web.d.ts diff --git a/extensions/web/lib.rs b/ext/web/lib.rs similarity index 99% rename from extensions/web/lib.rs rename to ext/web/lib.rs index 634004ac9c..9ee1eac7b4 100644 --- a/extensions/web/lib.rs +++ b/ext/web/lib.rs @@ -50,7 +50,7 @@ pub use crate::message_port::MessagePort; pub fn init(blob_store: BlobStore, maybe_location: Option) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/web", + prefix "deno:ext/web", "00_infra.js", "01_dom_exception.js", "01_mimesniff.js", diff --git a/extensions/web/message_port.rs b/ext/web/message_port.rs similarity index 100% rename from extensions/web/message_port.rs rename to ext/web/message_port.rs diff --git a/extensions/webgpu/01_webgpu.js b/ext/webgpu/01_webgpu.js similarity index 100% rename from extensions/webgpu/01_webgpu.js rename to ext/webgpu/01_webgpu.js diff --git a/extensions/webgpu/02_idl_types.js b/ext/webgpu/02_idl_types.js similarity index 100% rename from extensions/webgpu/02_idl_types.js rename to ext/webgpu/02_idl_types.js diff --git a/extensions/webgpu/Cargo.toml b/ext/webgpu/Cargo.toml similarity index 100% rename from extensions/webgpu/Cargo.toml rename to ext/webgpu/Cargo.toml diff --git a/extensions/webgpu/README.md b/ext/webgpu/README.md similarity index 100% rename from extensions/webgpu/README.md rename to ext/webgpu/README.md diff --git a/extensions/webgpu/binding.rs b/ext/webgpu/binding.rs similarity index 100% rename from extensions/webgpu/binding.rs rename to ext/webgpu/binding.rs diff --git a/extensions/webgpu/buffer.rs b/ext/webgpu/buffer.rs similarity index 100% rename from extensions/webgpu/buffer.rs rename to ext/webgpu/buffer.rs diff --git a/extensions/webgpu/bundle.rs b/ext/webgpu/bundle.rs similarity index 100% rename from extensions/webgpu/bundle.rs rename to ext/webgpu/bundle.rs diff --git a/extensions/webgpu/command_encoder.rs b/ext/webgpu/command_encoder.rs similarity index 100% rename from extensions/webgpu/command_encoder.rs rename to ext/webgpu/command_encoder.rs diff --git a/extensions/webgpu/compute_pass.rs b/ext/webgpu/compute_pass.rs similarity index 100% rename from extensions/webgpu/compute_pass.rs rename to ext/webgpu/compute_pass.rs diff --git a/extensions/webgpu/error.rs b/ext/webgpu/error.rs similarity index 100% rename from extensions/webgpu/error.rs rename to ext/webgpu/error.rs diff --git a/extensions/webgpu/lib.deno_webgpu.d.ts b/ext/webgpu/lib.deno_webgpu.d.ts similarity index 100% rename from extensions/webgpu/lib.deno_webgpu.d.ts rename to ext/webgpu/lib.deno_webgpu.d.ts diff --git a/extensions/webgpu/lib.rs b/ext/webgpu/lib.rs similarity index 99% rename from extensions/webgpu/lib.rs rename to ext/webgpu/lib.rs index 56337d030e..9a39ea4a2e 100644 --- a/extensions/webgpu/lib.rs +++ b/ext/webgpu/lib.rs @@ -111,7 +111,7 @@ impl Resource for WebGpuQuerySet { pub fn init(unstable: bool) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/webgpu", + prefix "deno:ext/webgpu", "01_webgpu.js", "02_idl_types.js", )) diff --git a/extensions/webgpu/pipeline.rs b/ext/webgpu/pipeline.rs similarity index 100% rename from extensions/webgpu/pipeline.rs rename to ext/webgpu/pipeline.rs diff --git a/extensions/webgpu/queue.rs b/ext/webgpu/queue.rs similarity index 100% rename from extensions/webgpu/queue.rs rename to ext/webgpu/queue.rs diff --git a/extensions/webgpu/render_pass.rs b/ext/webgpu/render_pass.rs similarity index 100% rename from extensions/webgpu/render_pass.rs rename to ext/webgpu/render_pass.rs diff --git a/extensions/webgpu/sampler.rs b/ext/webgpu/sampler.rs similarity index 100% rename from extensions/webgpu/sampler.rs rename to ext/webgpu/sampler.rs diff --git a/extensions/webgpu/shader.rs b/ext/webgpu/shader.rs similarity index 100% rename from extensions/webgpu/shader.rs rename to ext/webgpu/shader.rs diff --git a/extensions/webgpu/texture.rs b/ext/webgpu/texture.rs similarity index 100% rename from extensions/webgpu/texture.rs rename to ext/webgpu/texture.rs diff --git a/extensions/webgpu/webgpu.idl b/ext/webgpu/webgpu.idl similarity index 100% rename from extensions/webgpu/webgpu.idl rename to ext/webgpu/webgpu.idl diff --git a/extensions/webidl/00_webidl.js b/ext/webidl/00_webidl.js similarity index 100% rename from extensions/webidl/00_webidl.js rename to ext/webidl/00_webidl.js diff --git a/extensions/webidl/Cargo.toml b/ext/webidl/Cargo.toml similarity index 100% rename from extensions/webidl/Cargo.toml rename to ext/webidl/Cargo.toml diff --git a/extensions/webidl/README.md b/ext/webidl/README.md similarity index 100% rename from extensions/webidl/README.md rename to ext/webidl/README.md diff --git a/extensions/webidl/internal.d.ts b/ext/webidl/internal.d.ts similarity index 100% rename from extensions/webidl/internal.d.ts rename to ext/webidl/internal.d.ts diff --git a/extensions/webidl/lib.rs b/ext/webidl/lib.rs similarity index 88% rename from extensions/webidl/lib.rs rename to ext/webidl/lib.rs index fa243c9f1e..6dda684421 100644 --- a/extensions/webidl/lib.rs +++ b/ext/webidl/lib.rs @@ -7,7 +7,7 @@ use deno_core::Extension; pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/webidl", + prefix "deno:ext/webidl", "00_webidl.js", )) .build() diff --git a/extensions/websocket/01_websocket.js b/ext/websocket/01_websocket.js similarity index 100% rename from extensions/websocket/01_websocket.js rename to ext/websocket/01_websocket.js diff --git a/extensions/websocket/02_websocketstream.js b/ext/websocket/02_websocketstream.js similarity index 100% rename from extensions/websocket/02_websocketstream.js rename to ext/websocket/02_websocketstream.js diff --git a/extensions/websocket/Cargo.toml b/ext/websocket/Cargo.toml similarity index 100% rename from extensions/websocket/Cargo.toml rename to ext/websocket/Cargo.toml diff --git a/extensions/websocket/README.md b/ext/websocket/README.md similarity index 100% rename from extensions/websocket/README.md rename to ext/websocket/README.md diff --git a/extensions/websocket/lib.deno_websocket.d.ts b/ext/websocket/lib.deno_websocket.d.ts similarity index 100% rename from extensions/websocket/lib.deno_websocket.d.ts rename to ext/websocket/lib.deno_websocket.d.ts diff --git a/extensions/websocket/lib.rs b/ext/websocket/lib.rs similarity index 99% rename from extensions/websocket/lib.rs rename to ext/websocket/lib.rs index 69c6154b88..40bcb7bc4f 100644 --- a/extensions/websocket/lib.rs +++ b/ext/websocket/lib.rs @@ -434,7 +434,7 @@ pub fn init( ) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/websocket", + prefix "deno:ext/websocket", "01_websocket.js", "02_websocketstream.js", )) diff --git a/extensions/webstorage/01_webstorage.js b/ext/webstorage/01_webstorage.js similarity index 100% rename from extensions/webstorage/01_webstorage.js rename to ext/webstorage/01_webstorage.js diff --git a/extensions/webstorage/Cargo.toml b/ext/webstorage/Cargo.toml similarity index 100% rename from extensions/webstorage/Cargo.toml rename to ext/webstorage/Cargo.toml diff --git a/extensions/webstorage/README.md b/ext/webstorage/README.md similarity index 100% rename from extensions/webstorage/README.md rename to ext/webstorage/README.md diff --git a/extensions/webstorage/lib.deno_webstorage.d.ts b/ext/webstorage/lib.deno_webstorage.d.ts similarity index 100% rename from extensions/webstorage/lib.deno_webstorage.d.ts rename to ext/webstorage/lib.deno_webstorage.d.ts diff --git a/extensions/webstorage/lib.rs b/ext/webstorage/lib.rs similarity index 99% rename from extensions/webstorage/lib.rs rename to ext/webstorage/lib.rs index 6bf7e68185..beac9c5bda 100644 --- a/extensions/webstorage/lib.rs +++ b/ext/webstorage/lib.rs @@ -20,7 +20,7 @@ const MAX_STORAGE_BYTES: u32 = 10 * 1024 * 1024; pub fn init(origin_storage_dir: Option) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:extensions/webstorage", + prefix "deno:ext/webstorage", "01_webstorage.js", )) .ops(vec![ diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index b0b6d8227e..4f1841fa20 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -18,44 +18,44 @@ name = "hello_runtime" path = "examples/hello_runtime.rs" [build-dependencies] -deno_broadcast_channel = { version = "0.8.0", path = "../extensions/broadcast_channel" } -deno_console = { version = "0.14.0", path = "../extensions/console" } +deno_broadcast_channel = { version = "0.8.0", path = "../ext/broadcast_channel" } +deno_console = { version = "0.14.0", path = "../ext/console" } deno_core = { version = "0.96.0", path = "../core" } -deno_crypto = { version = "0.28.0", path = "../extensions/crypto" } -deno_fetch = { version = "0.37.0", path = "../extensions/fetch" } -deno_ffi = { version = "0.1.0", path = "../extensions/ffi" } -deno_http = { version = "0.5.0", path = "../extensions/http" } -deno_net = { version = "0.5.0", path = "../extensions/net" } -deno_timers = { version = "0.12.0", path = "../extensions/timers" } -deno_tls = { version = "0.1.0", path = "../extensions/tls" } -deno_url = { version = "0.14.0", path = "../extensions/url" } -deno_web = { version = "0.45.0", path = "../extensions/web" } -deno_webgpu = { version = "0.15.0", path = "../extensions/webgpu" } -deno_webidl = { version = "0.14.0", path = "../extensions/webidl" } -deno_websocket = { version = "0.19.0", path = "../extensions/websocket" } -deno_webstorage = { version = "0.9.0", path = "../extensions/webstorage" } +deno_crypto = { version = "0.28.0", path = "../ext/crypto" } +deno_fetch = { version = "0.37.0", path = "../ext/fetch" } +deno_ffi = { version = "0.1.0", path = "../ext/ffi" } +deno_http = { version = "0.5.0", path = "../ext/http" } +deno_net = { version = "0.5.0", path = "../ext/net" } +deno_timers = { version = "0.12.0", path = "../ext/timers" } +deno_tls = { version = "0.1.0", path = "../ext/tls" } +deno_url = { version = "0.14.0", path = "../ext/url" } +deno_web = { version = "0.45.0", path = "../ext/web" } +deno_webgpu = { version = "0.15.0", path = "../ext/webgpu" } +deno_webidl = { version = "0.14.0", path = "../ext/webidl" } +deno_websocket = { version = "0.19.0", path = "../ext/websocket" } +deno_webstorage = { version = "0.9.0", path = "../ext/webstorage" } [target.'cfg(windows)'.build-dependencies] winres = "0.1.11" winapi = "0.3.9" [dependencies] -deno_broadcast_channel = { version = "0.8.0", path = "../extensions/broadcast_channel" } -deno_console = { version = "0.14.0", path = "../extensions/console" } +deno_broadcast_channel = { version = "0.8.0", path = "../ext/broadcast_channel" } +deno_console = { version = "0.14.0", path = "../ext/console" } deno_core = { version = "0.96.0", path = "../core" } -deno_crypto = { version = "0.28.0", path = "../extensions/crypto" } -deno_fetch = { version = "0.37.0", path = "../extensions/fetch" } -deno_ffi = { version = "0.1.0", path = "../extensions/ffi" } -deno_http = { version = "0.5.0", path = "../extensions/http" } -deno_net = { version = "0.5.0", path = "../extensions/net" } -deno_timers = { version = "0.12.0", path = "../extensions/timers" } -deno_tls = { version = "0.1.0", path = "../extensions/tls" } -deno_url = { version = "0.14.0", path = "../extensions/url" } -deno_web = { version = "0.45.0", path = "../extensions/web" } -deno_webgpu = { version = "0.15.0", path = "../extensions/webgpu" } -deno_webidl = { version = "0.14.0", path = "../extensions/webidl" } -deno_websocket = { version = "0.19.0", path = "../extensions/websocket" } -deno_webstorage = { version = "0.9.0", path = "../extensions/webstorage" } +deno_crypto = { version = "0.28.0", path = "../ext/crypto" } +deno_fetch = { version = "0.37.0", path = "../ext/fetch" } +deno_ffi = { version = "0.1.0", path = "../ext/ffi" } +deno_http = { version = "0.5.0", path = "../ext/http" } +deno_net = { version = "0.5.0", path = "../ext/net" } +deno_timers = { version = "0.12.0", path = "../ext/timers" } +deno_tls = { version = "0.1.0", path = "../ext/tls" } +deno_url = { version = "0.14.0", path = "../ext/url" } +deno_web = { version = "0.45.0", path = "../ext/web" } +deno_webgpu = { version = "0.15.0", path = "../ext/webgpu" } +deno_webidl = { version = "0.14.0", path = "../ext/webidl" } +deno_websocket = { version = "0.19.0", path = "../ext/websocket" } +deno_webstorage = { version = "0.9.0", path = "../ext/webstorage" } atty = "0.2.14" dlopen = "0.1.8" diff --git a/tools/cut_a_release.md b/tools/cut_a_release.md index 8c9160649b..54c453bfa2 100644 --- a/tools/cut_a_release.md +++ b/tools/cut_a_release.md @@ -16,7 +16,7 @@ cut.** ## Updating the main repo -1. Create a PR that bumps versions of all crates in `extensions` and `runtime` +1. Create a PR that bumps versions of all crates in `ext` and `runtime` directories. To determine if you should bump a crate a minor version instead of a patch @@ -45,7 +45,7 @@ between the crates, it must be done in specific order: - `deno_core` - all crates depend on `deno_core` so it must always be published first - `bench_util` -- crates in `extensions/` directory +- crates in `ext/` directory - `deno_net`, `deno_websocket` and `deno_fetch` depend on `deno_tls`, so the latter must be bumped and released first - `deno_fetch`, `deno_crypto`, `deno_timers` and `deno_webstorage` depend on @@ -56,7 +56,7 @@ between the crates, it must be done in specific order: released first - `deno_http` depends on `deno_websocket`, so the latter must be bumped and released first -- `runtime` - this crate depends on `deno_core` and all crates in `extensions/` +- `runtime` - this crate depends on `deno_core` and all crates in `ext/` directory If there are any problems when you publish, that require you to change the code,