diff --git a/Cargo.toml b/Cargo.toml index b5ffb58f5e..47e278f824 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,14 +8,14 @@ members = [ "serde_v8", "test_plugin", "test_util", - "op_crates/crypto", - "op_crates/fetch", - "op_crates/timers", - "op_crates/url", - "op_crates/web", - "op_crates/webgpu", - "op_crates/webidl", - "op_crates/websocket", + "extensions/crypto", + "extensions/fetch", + "extensions/timers", + "extensions/url", + "extensions/web", + "extensions/webgpu", + "extensions/webidl", + "extensions/websocket", ] exclude = [ "std/hash/_wasm" diff --git a/cli/dts/lib.deno.window.d.ts b/cli/dts/lib.deno.window.d.ts index 3eebab6775..b7eca1e24e 100644 --- a/cli/dts/lib.deno.window.d.ts +++ b/cli/dts/lib.deno.window.d.ts @@ -62,7 +62,7 @@ declare function confirm(message?: string): boolean; */ declare function prompt(message?: string, defaultValue?: string): string | null; -// TODO(nayeemrmn): Move this to `op_crates/web` where its implementation is. +// TODO(nayeemrmn): Move this to `extensions/web` where its implementation is. // The types there must first be split into window, worker and global types. /** The location (URL) of the object it is linked to. Changes done on it are * reflected on the object it relates to. Accessible via @@ -130,6 +130,6 @@ declare class Location { replace(url: string): void; } -// TODO(nayeemrmn): Move this to `op_crates/web` where its implementation is. +// TODO(nayeemrmn): Move this to `extensions/web` where its implementation is. // The types there must first be split into window, worker and global types. declare var location: Location; diff --git a/cli/dts/lib.deno.worker.d.ts b/cli/dts/lib.deno.worker.d.ts index 653a8931be..1d1b08a5fc 100644 --- a/cli/dts/lib.deno.worker.d.ts +++ b/cli/dts/lib.deno.worker.d.ts @@ -71,7 +71,7 @@ declare var close: () => void; declare var name: string; declare var postMessage: (message: any) => void; -// TODO(nayeemrmn): Move this to `op_crates/web` where its implementation is. +// TODO(nayeemrmn): Move this to `extensions/web` where its implementation is. // The types there must first be split into window, worker and global types. /** The absolute location of the script executed by the Worker. Such an object * is initialized for each worker and is available via the @@ -90,6 +90,6 @@ declare class WorkerLocation { readonly search: string; } -// TODO(nayeemrmn): Move this to `op_crates/web` where its implementation is. +// TODO(nayeemrmn): Move this to `extensions/web` where its implementation is. // The types there must first be split into window, worker and global types. declare var location: WorkerLocation; diff --git a/cli/tests/error_009_op_crates_error.js b/cli/tests/error_009_extensions_error.js similarity index 100% rename from cli/tests/error_009_op_crates_error.js rename to cli/tests/error_009_extensions_error.js diff --git a/cli/tests/error_009_op_crates_error.js.out b/cli/tests/error_009_extensions_error.js.out similarity index 75% rename from cli/tests/error_009_op_crates_error.js.out rename to cli/tests/error_009_extensions_error.js.out index 229a0ff1f1..96ffb28298 100644 --- a/cli/tests/error_009_op_crates_error.js.out +++ b/cli/tests/error_009_extensions_error.js.out @@ -2,5 +2,5 @@ new Event(); ^ at [WILDCARD] - at new Event (deno:op_crates/web/[WILDCARD]) + at new Event (deno:extensions/web/[WILDCARD]) at [WILDCARD] diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs index 9c56396b4c..0b7b85ac81 100644 --- a/cli/tests/integration_tests.rs +++ b/cli/tests/integration_tests.rs @@ -3109,9 +3109,9 @@ console.log("finish"); output: "error_008_checkjs.js.out", }); - itest!(error_009_op_crates_error { - args: "run error_009_op_crates_error.js", - output: "error_009_op_crates_error.js.out", + itest!(error_009_extensions_error { + args: "run error_009_extensions_error.js", + output: "error_009_extensions_error.js.out", exit_code: 1, }); diff --git a/cli/tests/unit/metrics_test.ts b/cli/tests/unit/metrics_test.ts index 25c63dbc16..a1936cb1da 100644 --- a/cli/tests/unit/metrics_test.ts +++ b/cli/tests/unit/metrics_test.ts @@ -70,7 +70,7 @@ unitTest( }, ); -// Test that ops from op_crates have metrics (via OpMiddleware) +// Test that ops from extensions have metrics (via OpMiddleware) unitTest(function metricsForOpCrates(): void { const _ = new URL("https://deno.land"); diff --git a/core/extensions.rs b/core/extensions.rs index 134aab5d41..9ad2b36974 100644 --- a/core/extensions.rs +++ b/core/extensions.rs @@ -110,7 +110,7 @@ impl ExtensionBuilder { /// Example: /// ```ignore /// include_js_files!( -/// prefix "deno:op_crates/hello", +/// prefix "deno:extensions/hello", /// "01_hello.js", /// "02_goodbye.js", /// ) diff --git a/op_crates/console/01_colors.js b/extensions/console/01_colors.js similarity index 100% rename from op_crates/console/01_colors.js rename to extensions/console/01_colors.js diff --git a/op_crates/console/02_console.js b/extensions/console/02_console.js similarity index 99% rename from op_crates/console/02_console.js rename to extensions/console/02_console.js index 2c0dcf4348..d0392cefec 100644 --- a/op_crates/console/02_console.js +++ b/extensions/console/02_console.js @@ -905,8 +905,8 @@ if (customInspect in value && typeof value[customInspect] === "function") { return String(value[customInspect]()); } - // This non-unique symbol is used to support op_crates, ie. - // in op_crates/web we don't want to depend on unique "Deno.customInspect" + // This non-unique symbol is used to support extensions, ie. + // in extensions/web we don't want to depend on unique "Deno.customInspect" // symbol defined in the public API. Internal only, shouldn't be used // by users. const nonUniqueCustomInspect = Symbol.for("Deno.customInspect"); @@ -915,7 +915,7 @@ typeof value[nonUniqueCustomInspect] === "function" ) { // TODO(nayeemrmn): `inspect` is passed as an argument because custom - // inspect implementations in `op_crates` need it, but may not have access + // inspect implementations in `extensions` need it, but may not have access // to the `Deno` namespace in web workers. Remove when the `Deno` // namespace is always enabled. return String(value[nonUniqueCustomInspect](inspect)); diff --git a/op_crates/console/Cargo.toml b/extensions/console/Cargo.toml similarity index 100% rename from op_crates/console/Cargo.toml rename to extensions/console/Cargo.toml diff --git a/op_crates/console/README.md b/extensions/console/README.md similarity index 100% rename from op_crates/console/README.md rename to extensions/console/README.md diff --git a/op_crates/console/lib.deno_console.d.ts b/extensions/console/lib.deno_console.d.ts similarity index 100% rename from op_crates/console/lib.deno_console.d.ts rename to extensions/console/lib.deno_console.d.ts diff --git a/op_crates/console/lib.rs b/extensions/console/lib.rs similarity index 91% rename from op_crates/console/lib.rs rename to extensions/console/lib.rs index 4f64bb108a..27870fce69 100644 --- a/op_crates/console/lib.rs +++ b/extensions/console/lib.rs @@ -7,7 +7,7 @@ use std::path::PathBuf; pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/console", + prefix "deno:extensions/console", "01_colors.js", "02_console.js", )) diff --git a/op_crates/crypto/01_crypto.js b/extensions/crypto/01_crypto.js similarity index 100% rename from op_crates/crypto/01_crypto.js rename to extensions/crypto/01_crypto.js diff --git a/op_crates/crypto/Cargo.toml b/extensions/crypto/Cargo.toml similarity index 100% rename from op_crates/crypto/Cargo.toml rename to extensions/crypto/Cargo.toml diff --git a/op_crates/crypto/README.md b/extensions/crypto/README.md similarity index 100% rename from op_crates/crypto/README.md rename to extensions/crypto/README.md diff --git a/op_crates/crypto/lib.deno_crypto.d.ts b/extensions/crypto/lib.deno_crypto.d.ts similarity index 100% rename from op_crates/crypto/lib.deno_crypto.d.ts rename to extensions/crypto/lib.deno_crypto.d.ts diff --git a/op_crates/crypto/lib.rs b/extensions/crypto/lib.rs similarity index 97% rename from op_crates/crypto/lib.rs rename to extensions/crypto/lib.rs index 5432205483..45473f4d5f 100644 --- a/op_crates/crypto/lib.rs +++ b/extensions/crypto/lib.rs @@ -18,7 +18,7 @@ pub use rand; // Re-export rand pub fn init(maybe_seed: Option) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/crypto", + prefix "deno:extensions/crypto", "01_crypto.js", )) .ops(vec![( diff --git a/op_crates/fetch/01_fetch_util.js b/extensions/fetch/01_fetch_util.js similarity index 100% rename from op_crates/fetch/01_fetch_util.js rename to extensions/fetch/01_fetch_util.js diff --git a/op_crates/fetch/11_streams.js b/extensions/fetch/11_streams.js similarity index 100% rename from op_crates/fetch/11_streams.js rename to extensions/fetch/11_streams.js diff --git a/op_crates/fetch/11_streams_types.d.ts b/extensions/fetch/11_streams_types.d.ts similarity index 100% rename from op_crates/fetch/11_streams_types.d.ts rename to extensions/fetch/11_streams_types.d.ts diff --git a/op_crates/fetch/20_headers.js b/extensions/fetch/20_headers.js similarity index 100% rename from op_crates/fetch/20_headers.js rename to extensions/fetch/20_headers.js diff --git a/op_crates/fetch/21_formdata.js b/extensions/fetch/21_formdata.js similarity index 100% rename from op_crates/fetch/21_formdata.js rename to extensions/fetch/21_formdata.js diff --git a/op_crates/fetch/22_body.js b/extensions/fetch/22_body.js similarity index 100% rename from op_crates/fetch/22_body.js rename to extensions/fetch/22_body.js diff --git a/op_crates/fetch/22_http_client.js b/extensions/fetch/22_http_client.js similarity index 100% rename from op_crates/fetch/22_http_client.js rename to extensions/fetch/22_http_client.js diff --git a/op_crates/fetch/23_request.js b/extensions/fetch/23_request.js similarity index 100% rename from op_crates/fetch/23_request.js rename to extensions/fetch/23_request.js diff --git a/op_crates/fetch/23_response.js b/extensions/fetch/23_response.js similarity index 100% rename from op_crates/fetch/23_response.js rename to extensions/fetch/23_response.js diff --git a/op_crates/fetch/26_fetch.js b/extensions/fetch/26_fetch.js similarity index 100% rename from op_crates/fetch/26_fetch.js rename to extensions/fetch/26_fetch.js diff --git a/op_crates/fetch/Cargo.toml b/extensions/fetch/Cargo.toml similarity index 100% rename from op_crates/fetch/Cargo.toml rename to extensions/fetch/Cargo.toml diff --git a/op_crates/fetch/README.md b/extensions/fetch/README.md similarity index 100% rename from op_crates/fetch/README.md rename to extensions/fetch/README.md diff --git a/op_crates/fetch/internal.d.ts b/extensions/fetch/internal.d.ts similarity index 100% rename from op_crates/fetch/internal.d.ts rename to extensions/fetch/internal.d.ts diff --git a/op_crates/fetch/lib.deno_fetch.d.ts b/extensions/fetch/lib.deno_fetch.d.ts similarity index 100% rename from op_crates/fetch/lib.deno_fetch.d.ts rename to extensions/fetch/lib.deno_fetch.d.ts diff --git a/op_crates/fetch/lib.rs b/extensions/fetch/lib.rs similarity index 99% rename from op_crates/fetch/lib.rs rename to extensions/fetch/lib.rs index 861fc6e54d..36a5b5afdf 100644 --- a/op_crates/fetch/lib.rs +++ b/extensions/fetch/lib.rs @@ -58,7 +58,7 @@ pub fn init( ) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/fetch", + prefix "deno:extensions/fetch", "01_fetch_util.js", "11_streams.js", "20_headers.js", diff --git a/op_crates/file/01_file.js b/extensions/file/01_file.js similarity index 100% rename from op_crates/file/01_file.js rename to extensions/file/01_file.js diff --git a/op_crates/file/02_filereader.js b/extensions/file/02_filereader.js similarity index 100% rename from op_crates/file/02_filereader.js rename to extensions/file/02_filereader.js diff --git a/op_crates/file/03_blob_url.js b/extensions/file/03_blob_url.js similarity index 100% rename from op_crates/file/03_blob_url.js rename to extensions/file/03_blob_url.js diff --git a/op_crates/file/Cargo.toml b/extensions/file/Cargo.toml similarity index 100% rename from op_crates/file/Cargo.toml rename to extensions/file/Cargo.toml diff --git a/op_crates/file/README.md b/extensions/file/README.md similarity index 100% rename from op_crates/file/README.md rename to extensions/file/README.md diff --git a/op_crates/file/internal.d.ts b/extensions/file/internal.d.ts similarity index 100% rename from op_crates/file/internal.d.ts rename to extensions/file/internal.d.ts diff --git a/op_crates/file/lib.deno_file.d.ts b/extensions/file/lib.deno_file.d.ts similarity index 100% rename from op_crates/file/lib.deno_file.d.ts rename to extensions/file/lib.deno_file.d.ts diff --git a/op_crates/file/lib.rs b/extensions/file/lib.rs similarity index 98% rename from op_crates/file/lib.rs rename to extensions/file/lib.rs index ccde34adae..78e3db8147 100644 --- a/op_crates/file/lib.rs +++ b/extensions/file/lib.rs @@ -90,7 +90,7 @@ pub fn init( ) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/file", + prefix "deno:extensions/file", "01_file.js", "02_filereader.js", "03_blob_url.js", diff --git a/op_crates/timers/01_timers.js b/extensions/timers/01_timers.js similarity index 99% rename from op_crates/timers/01_timers.js rename to extensions/timers/01_timers.js index d6d6436fee..756e388751 100644 --- a/op_crates/timers/01_timers.js +++ b/extensions/timers/01_timers.js @@ -4,7 +4,7 @@ ((window) => { const core = window.Deno.core; - // Shamelessly cribbed from op_crates/fetch/11_streams.js + // Shamelessly cribbed from extensions/fetch/11_streams.js class AssertionError extends Error { constructor(msg) { super(msg); diff --git a/op_crates/timers/Cargo.toml b/extensions/timers/Cargo.toml similarity index 100% rename from op_crates/timers/Cargo.toml rename to extensions/timers/Cargo.toml diff --git a/op_crates/timers/README.md b/extensions/timers/README.md similarity index 100% rename from op_crates/timers/README.md rename to extensions/timers/README.md diff --git a/op_crates/timers/lib.rs b/extensions/timers/lib.rs similarity index 99% rename from op_crates/timers/lib.rs rename to extensions/timers/lib.rs index 62f5953fa2..5a9b28bb6f 100644 --- a/op_crates/timers/lib.rs +++ b/extensions/timers/lib.rs @@ -44,7 +44,7 @@ impl TimersPermission for NoTimersPermission { pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/timers", + prefix "deno:extensions/timers", "01_timers.js", )) .ops(vec![ diff --git a/op_crates/url/00_url.js b/extensions/url/00_url.js similarity index 100% rename from op_crates/url/00_url.js rename to extensions/url/00_url.js diff --git a/op_crates/url/Cargo.toml b/extensions/url/Cargo.toml similarity index 100% rename from op_crates/url/Cargo.toml rename to extensions/url/Cargo.toml diff --git a/op_crates/url/README.md b/extensions/url/README.md similarity index 100% rename from op_crates/url/README.md rename to extensions/url/README.md diff --git a/op_crates/url/benches/url_ops.rs b/extensions/url/benches/url_ops.rs similarity index 100% rename from op_crates/url/benches/url_ops.rs rename to extensions/url/benches/url_ops.rs diff --git a/op_crates/url/internal.d.ts b/extensions/url/internal.d.ts similarity index 100% rename from op_crates/url/internal.d.ts rename to extensions/url/internal.d.ts diff --git a/op_crates/url/lib.deno_url.d.ts b/extensions/url/lib.deno_url.d.ts similarity index 100% rename from op_crates/url/lib.deno_url.d.ts rename to extensions/url/lib.deno_url.d.ts diff --git a/op_crates/url/lib.rs b/extensions/url/lib.rs similarity index 99% rename from op_crates/url/lib.rs rename to extensions/url/lib.rs index 1d7a9b08be..a4a42cd0cc 100644 --- a/op_crates/url/lib.rs +++ b/extensions/url/lib.rs @@ -19,7 +19,7 @@ use std::path::PathBuf; pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/url", + prefix "deno:extensions/url", "00_url.js", )) .ops(vec![ diff --git a/op_crates/web/00_infra.js b/extensions/web/00_infra.js similarity index 100% rename from op_crates/web/00_infra.js rename to extensions/web/00_infra.js diff --git a/op_crates/web/01_dom_exception.js b/extensions/web/01_dom_exception.js similarity index 100% rename from op_crates/web/01_dom_exception.js rename to extensions/web/01_dom_exception.js diff --git a/op_crates/web/01_mimesniff.js b/extensions/web/01_mimesniff.js similarity index 100% rename from op_crates/web/01_mimesniff.js rename to extensions/web/01_mimesniff.js diff --git a/op_crates/web/02_event.js b/extensions/web/02_event.js similarity index 100% rename from op_crates/web/02_event.js rename to extensions/web/02_event.js diff --git a/op_crates/web/03_abort_signal.js b/extensions/web/03_abort_signal.js similarity index 100% rename from op_crates/web/03_abort_signal.js rename to extensions/web/03_abort_signal.js diff --git a/op_crates/web/04_global_interfaces.js b/extensions/web/04_global_interfaces.js similarity index 100% rename from op_crates/web/04_global_interfaces.js rename to extensions/web/04_global_interfaces.js diff --git a/op_crates/web/08_text_encoding.js b/extensions/web/08_text_encoding.js similarity index 100% rename from op_crates/web/08_text_encoding.js rename to extensions/web/08_text_encoding.js diff --git a/op_crates/web/12_location.js b/extensions/web/12_location.js similarity index 100% rename from op_crates/web/12_location.js rename to extensions/web/12_location.js diff --git a/op_crates/web/Cargo.toml b/extensions/web/Cargo.toml similarity index 100% rename from op_crates/web/Cargo.toml rename to extensions/web/Cargo.toml diff --git a/op_crates/web/README.md b/extensions/web/README.md similarity index 100% rename from op_crates/web/README.md rename to extensions/web/README.md diff --git a/op_crates/web/internal.d.ts b/extensions/web/internal.d.ts similarity index 100% rename from op_crates/web/internal.d.ts rename to extensions/web/internal.d.ts diff --git a/op_crates/web/lib.deno_web.d.ts b/extensions/web/lib.deno_web.d.ts similarity index 100% rename from op_crates/web/lib.deno_web.d.ts rename to extensions/web/lib.deno_web.d.ts diff --git a/op_crates/web/lib.rs b/extensions/web/lib.rs similarity index 94% rename from op_crates/web/lib.rs rename to extensions/web/lib.rs index a2612743e7..0d2dbbd789 100644 --- a/op_crates/web/lib.rs +++ b/extensions/web/lib.rs @@ -8,7 +8,7 @@ use std::path::PathBuf; pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/web", + prefix "deno:extensions/web", "00_infra.js", "01_dom_exception.js", "01_mimesniff.js", diff --git a/op_crates/webgpu/01_webgpu.js b/extensions/webgpu/01_webgpu.js similarity index 100% rename from op_crates/webgpu/01_webgpu.js rename to extensions/webgpu/01_webgpu.js diff --git a/op_crates/webgpu/02_idl_types.js b/extensions/webgpu/02_idl_types.js similarity index 100% rename from op_crates/webgpu/02_idl_types.js rename to extensions/webgpu/02_idl_types.js diff --git a/op_crates/webgpu/Cargo.toml b/extensions/webgpu/Cargo.toml similarity index 100% rename from op_crates/webgpu/Cargo.toml rename to extensions/webgpu/Cargo.toml diff --git a/op_crates/webgpu/README.md b/extensions/webgpu/README.md similarity index 100% rename from op_crates/webgpu/README.md rename to extensions/webgpu/README.md diff --git a/op_crates/webgpu/binding.rs b/extensions/webgpu/binding.rs similarity index 100% rename from op_crates/webgpu/binding.rs rename to extensions/webgpu/binding.rs diff --git a/op_crates/webgpu/buffer.rs b/extensions/webgpu/buffer.rs similarity index 100% rename from op_crates/webgpu/buffer.rs rename to extensions/webgpu/buffer.rs diff --git a/op_crates/webgpu/bundle.rs b/extensions/webgpu/bundle.rs similarity index 100% rename from op_crates/webgpu/bundle.rs rename to extensions/webgpu/bundle.rs diff --git a/op_crates/webgpu/command_encoder.rs b/extensions/webgpu/command_encoder.rs similarity index 100% rename from op_crates/webgpu/command_encoder.rs rename to extensions/webgpu/command_encoder.rs diff --git a/op_crates/webgpu/compute_pass.rs b/extensions/webgpu/compute_pass.rs similarity index 100% rename from op_crates/webgpu/compute_pass.rs rename to extensions/webgpu/compute_pass.rs diff --git a/op_crates/webgpu/error.rs b/extensions/webgpu/error.rs similarity index 100% rename from op_crates/webgpu/error.rs rename to extensions/webgpu/error.rs diff --git a/op_crates/webgpu/lib.deno_webgpu.d.ts b/extensions/webgpu/lib.deno_webgpu.d.ts similarity index 100% rename from op_crates/webgpu/lib.deno_webgpu.d.ts rename to extensions/webgpu/lib.deno_webgpu.d.ts diff --git a/op_crates/webgpu/lib.rs b/extensions/webgpu/lib.rs similarity index 99% rename from op_crates/webgpu/lib.rs rename to extensions/webgpu/lib.rs index b5b2905b2f..906c4876e2 100644 --- a/op_crates/webgpu/lib.rs +++ b/extensions/webgpu/lib.rs @@ -97,7 +97,7 @@ impl Resource for WebGpuQuerySet { pub fn init(unstable: bool) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/webgpu", + prefix "deno:extensions/webgpu", "01_webgpu.js", "02_idl_types.js", )) diff --git a/op_crates/webgpu/pipeline.rs b/extensions/webgpu/pipeline.rs similarity index 100% rename from op_crates/webgpu/pipeline.rs rename to extensions/webgpu/pipeline.rs diff --git a/op_crates/webgpu/queue.rs b/extensions/webgpu/queue.rs similarity index 100% rename from op_crates/webgpu/queue.rs rename to extensions/webgpu/queue.rs diff --git a/op_crates/webgpu/render_pass.rs b/extensions/webgpu/render_pass.rs similarity index 100% rename from op_crates/webgpu/render_pass.rs rename to extensions/webgpu/render_pass.rs diff --git a/op_crates/webgpu/sampler.rs b/extensions/webgpu/sampler.rs similarity index 100% rename from op_crates/webgpu/sampler.rs rename to extensions/webgpu/sampler.rs diff --git a/op_crates/webgpu/shader.rs b/extensions/webgpu/shader.rs similarity index 100% rename from op_crates/webgpu/shader.rs rename to extensions/webgpu/shader.rs diff --git a/op_crates/webgpu/texture.rs b/extensions/webgpu/texture.rs similarity index 100% rename from op_crates/webgpu/texture.rs rename to extensions/webgpu/texture.rs diff --git a/op_crates/webgpu/webgpu.idl b/extensions/webgpu/webgpu.idl similarity index 100% rename from op_crates/webgpu/webgpu.idl rename to extensions/webgpu/webgpu.idl diff --git a/op_crates/webidl/00_webidl.js b/extensions/webidl/00_webidl.js similarity index 100% rename from op_crates/webidl/00_webidl.js rename to extensions/webidl/00_webidl.js diff --git a/op_crates/webidl/Cargo.toml b/extensions/webidl/Cargo.toml similarity index 100% rename from op_crates/webidl/Cargo.toml rename to extensions/webidl/Cargo.toml diff --git a/op_crates/webidl/README.md b/extensions/webidl/README.md similarity index 100% rename from op_crates/webidl/README.md rename to extensions/webidl/README.md diff --git a/op_crates/webidl/internal.d.ts b/extensions/webidl/internal.d.ts similarity index 100% rename from op_crates/webidl/internal.d.ts rename to extensions/webidl/internal.d.ts diff --git a/op_crates/webidl/lib.rs b/extensions/webidl/lib.rs similarity index 88% rename from op_crates/webidl/lib.rs rename to extensions/webidl/lib.rs index c73c60bab1..fa243c9f1e 100644 --- a/op_crates/webidl/lib.rs +++ b/extensions/webidl/lib.rs @@ -7,7 +7,7 @@ use deno_core::Extension; pub fn init() -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/webidl", + prefix "deno:extensions/webidl", "00_webidl.js", )) .build() diff --git a/op_crates/websocket/01_websocket.js b/extensions/websocket/01_websocket.js similarity index 100% rename from op_crates/websocket/01_websocket.js rename to extensions/websocket/01_websocket.js diff --git a/op_crates/websocket/Cargo.toml b/extensions/websocket/Cargo.toml similarity index 100% rename from op_crates/websocket/Cargo.toml rename to extensions/websocket/Cargo.toml diff --git a/op_crates/websocket/README.md b/extensions/websocket/README.md similarity index 100% rename from op_crates/websocket/README.md rename to extensions/websocket/README.md diff --git a/op_crates/websocket/lib.deno_websocket.d.ts b/extensions/websocket/lib.deno_websocket.d.ts similarity index 100% rename from op_crates/websocket/lib.deno_websocket.d.ts rename to extensions/websocket/lib.deno_websocket.d.ts diff --git a/op_crates/websocket/lib.rs b/extensions/websocket/lib.rs similarity index 99% rename from op_crates/websocket/lib.rs rename to extensions/websocket/lib.rs index acf823775d..8dfa26c478 100644 --- a/op_crates/websocket/lib.rs +++ b/extensions/websocket/lib.rs @@ -339,7 +339,7 @@ pub fn init( ) -> Extension { Extension::builder() .js(include_js_files!( - prefix "deno:op_crates/websocket", + prefix "deno:extensions/websocket", "01_websocket.js", )) .ops(vec![ diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index 21294219b7..8acd61f7e3 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -18,34 +18,34 @@ name = "hello_runtime" path = "examples/hello_runtime.rs" [build-dependencies] -deno_console = { path = "../op_crates/console", version = "0.5.0" } +deno_console = { path = "../extensions/console", version = "0.5.0" } deno_core = { path = "../core", version = "0.86.0" } -deno_crypto = { path = "../op_crates/crypto", version = "0.19.0" } -deno_fetch = { path = "../op_crates/fetch", version = "0.27.0" } -deno_file = { path = "../op_crates/file", version = "0.4.0" } -deno_timers = { path = "../op_crates/timers", version = "0.3.0" } -deno_url = { path = "../op_crates/url", version = "0.5.0" } -deno_web = { path = "../op_crates/web", version = "0.35.0" } -deno_webgpu = { path = "../op_crates/webgpu", version = "0.6.0" } -deno_webidl = { path = "../op_crates/webidl", version = "0.5.0" } -deno_websocket = { path = "../op_crates/websocket", version = "0.10.0" } +deno_crypto = { path = "../extensions/crypto", version = "0.19.0" } +deno_fetch = { path = "../extensions/fetch", version = "0.27.0" } +deno_file = { path = "../extensions/file", version = "0.4.0" } +deno_timers = { path = "../extensions/timers", version = "0.3.0" } +deno_url = { path = "../extensions/url", version = "0.5.0" } +deno_web = { path = "../extensions/web", version = "0.35.0" } +deno_webgpu = { path = "../extensions/webgpu", version = "0.6.0" } +deno_webidl = { path = "../extensions/webidl", version = "0.5.0" } +deno_websocket = { path = "../extensions/websocket", version = "0.10.0" } [target.'cfg(windows)'.build-dependencies] winres = "0.1.11" winapi = "0.3.9" [dependencies] -deno_console = { path = "../op_crates/console", version = "0.5.0" } +deno_console = { path = "../extensions/console", version = "0.5.0" } deno_core = { path = "../core", version = "0.86.0" } -deno_crypto = { path = "../op_crates/crypto", version = "0.19.0" } -deno_fetch = { path = "../op_crates/fetch", version = "0.27.0" } -deno_file = { path = "../op_crates/file", version = "0.4.0" } -deno_timers = { path = "../op_crates/timers", version = "0.3.0" } -deno_url = { path = "../op_crates/url", version = "0.5.0" } -deno_web = { path = "../op_crates/web", version = "0.35.0" } -deno_webgpu = { path = "../op_crates/webgpu", version = "0.6.0" } -deno_webidl = { path = "../op_crates/webidl", version = "0.5.0" } -deno_websocket = { path = "../op_crates/websocket", version = "0.10.0" } +deno_crypto = { path = "../extensions/crypto", version = "0.19.0" } +deno_fetch = { path = "../extensions/fetch", version = "0.27.0" } +deno_file = { path = "../extensions/file", version = "0.4.0" } +deno_timers = { path = "../extensions/timers", version = "0.3.0" } +deno_url = { path = "../extensions/url", version = "0.5.0" } +deno_web = { path = "../extensions/web", version = "0.35.0" } +deno_webgpu = { path = "../extensions/webgpu", version = "0.6.0" } +deno_webidl = { path = "../extensions/webidl", version = "0.5.0" } +deno_websocket = { path = "../extensions/websocket", version = "0.10.0" } atty = "0.2.14" bytes = "1" diff --git a/tools/cut_a_release.md b/tools/cut_a_release.md index 365ed24020..ec5853819c 100644 --- a/tools/cut_a_release.md +++ b/tools/cut_a_release.md @@ -4,7 +4,7 @@ release from) should be frozen and no commits should land until the release is cut.** -1. Create a PR that bumps versions of all crates in `op_crates` and `runtime` +1. Create a PR that bumps versions of all crates in `extensions` and `runtime` directories. To determine if you should bump a crate a minor version instead of a patch @@ -32,9 +32,9 @@ 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 -- crates in `op_crates/` directory - there is no specific order required for +- crates in `extensions/` directory - there is no specific order required for those -- `runtime` - this crate depends on `deno_core` and all crates in `op_crates/` +- `runtime` - this crate depends on `deno_core` and all crates in `extensions/` directory If there are any problems when you publish, that require you to change the code,