From 22426fee1ee37149175a564c6102a6a3ca99fb42 Mon Sep 17 00:00:00 2001 From: Yusuke Tanaka Date: Wed, 19 May 2021 00:24:01 +0900 Subject: chore: update deno_lint binary used in CI to v0.5.0 (#10652) --- extensions/fetch/21_formdata.js | 2 +- extensions/fetch/23_request.js | 6 +++--- extensions/fetch/23_response.js | 4 ++-- extensions/file/01_file.js | 1 + extensions/timers/01_timers.js | 1 - extensions/web/02_event.js | 2 +- extensions/web/08_text_encoding.js | 2 +- extensions/webidl/00_webidl.js | 1 - 8 files changed, 9 insertions(+), 10 deletions(-) (limited to 'extensions') diff --git a/extensions/fetch/21_formdata.js b/extensions/fetch/21_formdata.js index c50cf4cf7..379d5eca1 100644 --- a/extensions/fetch/21_formdata.js +++ b/extensions/fetch/21_formdata.js @@ -11,7 +11,7 @@ /// "use strict"; -((window) => { +((_window) => { const webidl = globalThis.__bootstrap.webidl; const { Blob, File, _byteSequence } = globalThis.__bootstrap.file; diff --git a/extensions/fetch/23_request.js b/extensions/fetch/23_request.js index 603a37a5f..480b83182 100644 --- a/extensions/fetch/23_request.js +++ b/extensions/fetch/23_request.js @@ -16,7 +16,7 @@ const { HTTP_TOKEN_CODE_POINT_RE, byteUpperCase } = window.__bootstrap.infra; const { URL } = window.__bootstrap.url; const { guardFromHeaders } = window.__bootstrap.headers; - const { InnerBody, mixinBody, extractBody } = window.__bootstrap.fetchBody; + const { mixinBody, extractBody } = window.__bootstrap.fetchBody; const { getLocationHref } = window.__bootstrap.location; const mimesniff = window.__bootstrap.mimesniff; const { @@ -38,7 +38,7 @@ * @property {() => string} url * @property {() => string} currentUrl * @property {[string, string][]} headerList - * @property {null | InnerBody} body + * @property {null | typeof __window.bootstrap.fetchBody.InnerBody} body * @property {"follow" | "error" | "manual"} redirectMode * @property {number} redirectCount * @property {string[]} urlList @@ -61,7 +61,7 @@ * @param {string} method * @param {string} url * @param {[string, string][]} headerList - * @param {InnerBody} body + * @param {typeof __window.bootstrap.fetchBody.InnerBody} body * @returns */ function newInnerRequest(method, url, headerList = [], body = null) { diff --git a/extensions/fetch/23_response.js b/extensions/fetch/23_response.js index 6bd7a6487..6d9874c6a 100644 --- a/extensions/fetch/23_response.js +++ b/extensions/fetch/23_response.js @@ -15,7 +15,7 @@ ((window) => { const webidl = window.__bootstrap.webidl; const { HTTP_TAB_OR_SPACE, regexMatcher } = window.__bootstrap.infra; - const { InnerBody, extractBody, mixinBody } = window.__bootstrap.fetchBody; + const { extractBody, mixinBody } = window.__bootstrap.fetchBody; const { getLocationHref } = window.__bootstrap.location; const mimesniff = window.__bootstrap.mimesniff; const { URL } = window.__bootstrap.url; @@ -47,7 +47,7 @@ * @property {number} status * @property {string} statusMessage * @property {[string, string][]} headerList - * @property {null | InnerBody} body + * @property {null | typeof __window.bootstrap.fetchBody.InnerBody} body * @property {string} [error] */ diff --git a/extensions/file/01_file.js b/extensions/file/01_file.js index 05c410572..cbbf98e7d 100644 --- a/extensions/file/01_file.js +++ b/extensions/file/01_file.js @@ -216,6 +216,7 @@ }); } + // deno-lint-ignore no-this-alias const O = this; /** @type {number} */ let relativeStart; diff --git a/extensions/timers/01_timers.js b/extensions/timers/01_timers.js index 756e38875..66faf85fd 100644 --- a/extensions/timers/01_timers.js +++ b/extensions/timers/01_timers.js @@ -344,7 +344,6 @@ opStartGlobalTimer(timeout); await opWaitGlobalTimer(); pendingEvents--; - // eslint-disable-next-line @typescript-eslint/no-use-before-define prepareReadyTimers(); } diff --git a/extensions/web/02_event.js b/extensions/web/02_event.js index 35112132e..b6b5609bc 100644 --- a/extensions/web/02_event.js +++ b/extensions/web/02_event.js @@ -706,7 +706,7 @@ for (let i = 0; i < handlers.length; i++) { const listener = handlers[i]; - let capture, once, passive, signal; + let capture, once, passive; if (typeof listener.options === "boolean") { capture = listener.options; once = false; diff --git a/extensions/web/08_text_encoding.js b/extensions/web/08_text_encoding.js index c293633c3..2804ff6a0 100644 --- a/extensions/web/08_text_encoding.js +++ b/extensions/web/08_text_encoding.js @@ -4474,7 +4474,7 @@ return ((validLen + placeHoldersLen) * 3) / 4 - placeHoldersLen; } - function _byteLength(b64, validLen, placeHoldersLen) { + function _byteLength(_b64, validLen, placeHoldersLen) { return ((validLen + placeHoldersLen) * 3) / 4 - placeHoldersLen; } diff --git a/extensions/webidl/00_webidl.js b/extensions/webidl/00_webidl.js index 6bf98be06..6fffa9319 100644 --- a/extensions/webidl/00_webidl.js +++ b/extensions/webidl/00_webidl.js @@ -385,7 +385,6 @@ function isArrayBufferDetached(V) { try { - // eslint-disable-next-line no-new new Uint8Array(V); return false; } catch { -- cgit v1.2.3 From a1125765ec8ef5d13ed49ad5cceadb0b41202be4 Mon Sep 17 00:00:00 2001 From: crowlKats <13135287+crowlKats@users.noreply.github.com> Date: Wed, 19 May 2021 14:28:50 +0200 Subject: fix(webstorage): use opstate for sqlite connection (#10692) Fixes #10691 --- extensions/webstorage/01_webstorage.js | 34 +++--- extensions/webstorage/Cargo.toml | 2 +- extensions/webstorage/lib.rs | 183 ++++++++++++--------------------- 3 files changed, 81 insertions(+), 138 deletions(-) (limited to 'extensions') diff --git a/extensions/webstorage/01_webstorage.js b/extensions/webstorage/01_webstorage.js index a11d44068..43a1dbbfb 100644 --- a/extensions/webstorage/01_webstorage.js +++ b/extensions/webstorage/01_webstorage.js @@ -1,11 +1,13 @@ +// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. + ((window) => { const core = window.Deno.core; const webidl = window.__bootstrap.webidl; - const _rid = Symbol("[[rid]]"); + const _persistent = Symbol("[[persistent]]"); class Storage { - [_rid]; + [_persistent]; constructor() { webidl.illegalConstructor(); @@ -13,7 +15,7 @@ get length() { webidl.assertBranded(this, Storage); - return core.opSync("op_webstorage_length", this[_rid]); + return core.opSync("op_webstorage_length", this[_persistent]); } key(index) { @@ -25,10 +27,7 @@ context: "Argument 1", }); - return core.opSync("op_webstorage_key", { - rid: this[_rid], - index, - }); + return core.opSync("op_webstorage_key", index, this[_persistent]); } setItem(key, value) { @@ -45,10 +44,9 @@ }); core.opSync("op_webstorage_set", { - rid: this[_rid], keyName: key, keyValue: value, - }); + }, this[_persistent]); } getItem(key) { @@ -60,10 +58,7 @@ context: "Argument 1", }); - return core.opSync("op_webstorage_get", { - rid: this[_rid], - keyName: key, - }); + return core.opSync("op_webstorage_get", key, this[_persistent]); } removeItem(key) { @@ -75,25 +70,20 @@ context: "Argument 1", }); - core.opSync("op_webstorage_remove", { - rid: this[_rid], - keyName: key, - }); + core.opSync("op_webstorage_remove", key, this[_persistent]); } clear() { webidl.assertBranded(this, Storage); - core.opSync("op_webstorage_clear", this[_rid]); + core.opSync("op_webstorage_clear", this[_persistent]); } } function createStorage(persistent) { if (persistent) window.location; - const rid = core.opSync("op_webstorage_open", persistent); - const storage = webidl.createBranded(Storage); - storage[_rid] = rid; + storage[_persistent] = persistent; const proxy = new Proxy(storage, { deleteProperty(target, key) { @@ -135,7 +125,7 @@ return (typeof target.getItem(p)) === "string"; }, ownKeys() { - return core.opSync("op_webstorage_iterate_keys", rid); + return core.opSync("op_webstorage_iterate_keys", persistent); }, getOwnPropertyDescriptor(target, key) { if (arguments.length === 1) { diff --git a/extensions/webstorage/Cargo.toml b/extensions/webstorage/Cargo.toml index ab0a6299e..506014b17 100644 --- a/extensions/webstorage/Cargo.toml +++ b/extensions/webstorage/Cargo.toml @@ -1,4 +1,4 @@ -# Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +# Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. [package] name = "deno_webstorage" diff --git a/extensions/webstorage/lib.rs b/extensions/webstorage/lib.rs index 90ae0598a..8b3e206fb 100644 --- a/extensions/webstorage/lib.rs +++ b/extensions/webstorage/lib.rs @@ -1,18 +1,14 @@ -// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license. +// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. -use deno_core::error::bad_resource_id; use deno_core::error::AnyError; use deno_core::include_js_files; use deno_core::op_sync; use deno_core::Extension; use deno_core::OpState; -use deno_core::Resource; -use deno_core::ZeroCopyBuf; use rusqlite::params; use rusqlite::Connection; use rusqlite::OptionalExtension; use serde::Deserialize; -use std::borrow::Cow; use std::fmt; use std::path::PathBuf; @@ -26,7 +22,6 @@ pub fn init(location_data_dir: Option) -> Extension { "01_webstorage.js", )) .ops(vec![ - ("op_webstorage_open", op_sync(op_webstorage_open)), ("op_webstorage_length", op_sync(op_webstorage_length)), ("op_webstorage_key", op_sync(op_webstorage_key)), ("op_webstorage_set", op_sync(op_webstorage_set)), @@ -51,82 +46,73 @@ pub fn get_declaration() -> PathBuf { PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("lib.deno_webstorage.d.ts") } -struct WebStorageConnectionResource(Connection); +struct LocalStorage(Connection); +struct SessionStorage(Connection); -impl Resource for WebStorageConnectionResource { - fn name(&self) -> Cow { - "webStorage".into() - } -} - -pub fn op_webstorage_open( +fn get_webstorage( state: &mut OpState, persistent: bool, - _zero_copy: Option, -) -> Result { - let connection = if persistent { - let path = state.try_borrow::().ok_or_else(|| { - DomExceptionNotSupportedError::new( - "LocalStorage is not supported in this context.", - ) - })?; - std::fs::create_dir_all(&path.0)?; - Connection::open(path.0.join("local_storage"))? +) -> Result<&Connection, AnyError> { + let conn = if persistent { + if state.try_borrow::().is_none() { + let path = state.try_borrow::().ok_or_else(|| { + DomExceptionNotSupportedError::new( + "LocalStorage is not supported in this context.", + ) + })?; + std::fs::create_dir_all(&path.0)?; + let conn = Connection::open(path.0.join("local_storage"))?; + conn.execute( + "CREATE TABLE IF NOT EXISTS data (key VARCHAR UNIQUE, value VARCHAR)", + params![], + )?; + + state.put(LocalStorage(conn)); + } + + &state.borrow::().0 } else { - Connection::open_in_memory()? - }; + if state.try_borrow::().is_none() { + let conn = Connection::open_in_memory()?; + conn.execute( + "CREATE TABLE data (key VARCHAR UNIQUE, value VARCHAR)", + params![], + )?; + + state.put(SessionStorage(conn)); + } - connection.execute( - "CREATE TABLE IF NOT EXISTS data (key VARCHAR UNIQUE, value VARCHAR)", - params![], - )?; + &state.borrow::().0 + }; - let rid = state - .resource_table - .add(WebStorageConnectionResource(connection)); - Ok(rid) + Ok(conn) } pub fn op_webstorage_length( state: &mut OpState, - rid: u32, - _zero_copy: Option, + persistent: bool, + _: (), ) -> Result { - let resource = state - .resource_table - .get::(rid) - .ok_or_else(bad_resource_id)?; + let conn = get_webstorage(state, persistent)?; - let mut stmt = resource.0.prepare("SELECT COUNT(*) FROM data")?; + let mut stmt = conn.prepare("SELECT COUNT(*) FROM data")?; let length: u32 = stmt.query_row(params![], |row| row.get(0))?; Ok(length) } -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct KeyArgs { - rid: u32, - index: u32, -} - pub fn op_webstorage_key( state: &mut OpState, - args: KeyArgs, - _zero_copy: Option, + index: u32, + persistent: bool, ) -> Result, AnyError> { - let resource = state - .resource_table - .get::(args.rid) - .ok_or_else(bad_resource_id)?; + let conn = get_webstorage(state, persistent)?; - let mut stmt = resource - .0 - .prepare("SELECT key FROM data LIMIT 1 OFFSET ?")?; + let mut stmt = conn.prepare("SELECT key FROM data LIMIT 1 OFFSET ?")?; let key: Option = stmt - .query_row(params![args.index], |row| row.get(0)) + .query_row(params![index], |row| row.get(0)) .optional()?; Ok(key) @@ -135,7 +121,6 @@ pub fn op_webstorage_key( #[derive(Deserialize)] #[serde(rename_all = "camelCase")] pub struct SetArgs { - rid: u32, key_name: String, key_value: String, } @@ -143,16 +128,12 @@ pub struct SetArgs { pub fn op_webstorage_set( state: &mut OpState, args: SetArgs, - _zero_copy: Option, + persistent: bool, ) -> Result<(), AnyError> { - let resource = state - .resource_table - .get::(args.rid) - .ok_or_else(bad_resource_id)?; - - let mut stmt = resource - .0 - .prepare("SELECT SUM(pgsize) FROM dbstat WHERE name = 'data'")?; + let conn = get_webstorage(state, persistent)?; + + let mut stmt = + conn.prepare("SELECT SUM(pgsize) FROM dbstat WHERE name = 'data'")?; let size: u32 = stmt.query_row(params![], |row| row.get(0))?; if size >= 5000000 { @@ -162,7 +143,7 @@ pub fn op_webstorage_set( ); } - resource.0.execute( + conn.execute( "INSERT OR REPLACE INTO data (key, value) VALUES (?, ?)", params![args.key_name, args.key_value], )?; @@ -170,68 +151,43 @@ pub fn op_webstorage_set( Ok(()) } -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct GetArgs { - rid: u32, - key_name: String, -} - pub fn op_webstorage_get( state: &mut OpState, - args: GetArgs, - _zero_copy: Option, + key_name: String, + persistent: bool, ) -> Result, AnyError> { - let resource = state - .resource_table - .get::(args.rid) - .ok_or_else(bad_resource_id)?; + let conn = get_webstorage(state, persistent)?; - let mut stmt = resource.0.prepare("SELECT value FROM data WHERE key = ?")?; + let mut stmt = conn.prepare("SELECT value FROM data WHERE key = ?")?; let val = stmt - .query_row(params![args.key_name], |row| row.get(0)) + .query_row(params![key_name], |row| row.get(0)) .optional()?; Ok(val) } -#[derive(Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct RemoveArgs { - rid: u32, - key_name: String, -} - pub fn op_webstorage_remove( state: &mut OpState, - args: RemoveArgs, - _zero_copy: Option, + key_name: String, + persistent: bool, ) -> Result<(), AnyError> { - let resource = state - .resource_table - .get::(args.rid) - .ok_or_else(bad_resource_id)?; + let conn = get_webstorage(state, persistent)?; - resource - .0 - .execute("DELETE FROM data WHERE key = ?", params![args.key_name])?; + conn.execute("DELETE FROM data WHERE key = ?", params![key_name])?; Ok(()) } pub fn op_webstorage_clear( state: &mut OpState, - rid: u32, - _zero_copy: Option, + persistent: bool, + _: (), ) -> Result<(), AnyError> { - let resource = state - .resource_table - .get::(rid) - .ok_or_else(bad_resource_id)?; + let conn = get_webstorage(state, persistent)?; - resource.0.execute("DROP TABLE data", params![])?; - resource.0.execute( + conn.execute("DROP TABLE data", params![])?; + conn.execute( "CREATE TABLE data (key VARCHAR UNIQUE, value VARCHAR)", params![], )?; @@ -241,15 +197,12 @@ pub fn op_webstorage_clear( pub fn op_webstorage_iterate_keys( state: &mut OpState, - rid: u32, - _zero_copy: Option, + persistent: bool, + _: (), ) -> Result, AnyError> { - let resource = state - .resource_table - .get::(rid) - .ok_or_else(bad_resource_id)?; + let conn = get_webstorage(state, persistent)?; - let mut stmt = resource.0.prepare("SELECT key FROM data")?; + let mut stmt = conn.prepare("SELECT key FROM data")?; let keys = stmt .query_map(params![], |row| row.get::<_, String>(0))? -- cgit v1.2.3 From 323fa5272db8f70e543507e7aaa24e2a19e090ac Mon Sep 17 00:00:00 2001 From: Yoshiya Hinosawa Date: Tue, 25 May 2021 22:35:17 +0900 Subject: fix(extension/file): update File constructor following the spec (#10760) --- extensions/file/01_file.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions') diff --git a/extensions/file/01_file.js b/extensions/file/01_file.js index cbbf98e7d..c34561b5e 100644 --- a/extensions/file/01_file.js +++ b/extensions/file/01_file.js @@ -371,7 +371,7 @@ super(fileBits, options); /** @type {string} */ - this[_Name] = fileName.replaceAll("/", ":"); + this[_Name] = fileName; if (options.lastModified === undefined) { /** @type {number} */ this[_LastModfied] = new Date().getTime(); -- cgit v1.2.3 From 379d40955a46e3f1e5113aee3b4781e66d02c8e0 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Wed, 26 May 2021 23:44:42 +0200 Subject: fix(fetch): make prototype properties writable (#10769) --- extensions/fetch/22_body.js | 19 +++++++++++++++++++ extensions/fetch/23_request.js | 22 ++++++++++++++++++++++ extensions/fetch/23_response.js | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) (limited to 'extensions') diff --git a/extensions/fetch/22_body.js b/extensions/fetch/22_body.js index 938e3023e..8c93e0fcf 100644 --- a/extensions/fetch/22_body.js +++ b/extensions/fetch/22_body.js @@ -147,6 +147,8 @@ return this[bodySymbol].stream; } }, + configurable: true, + enumerable: true, }, bodyUsed: { /** @@ -159,6 +161,8 @@ } return false; }, + configurable: true, + enumerable: true, }, arrayBuffer: { /** @returns {Promise} */ @@ -167,6 +171,9 @@ const body = await consumeBody(this); return packageData(body, "ArrayBuffer"); }, + writable: true, + configurable: true, + enumerable: true, }, blob: { /** @returns {Promise} */ @@ -175,6 +182,9 @@ const body = await consumeBody(this); return packageData(body, "Blob", this[mimeTypeSymbol]); }, + writable: true, + configurable: true, + enumerable: true, }, formData: { /** @returns {Promise} */ @@ -183,6 +193,9 @@ const body = await consumeBody(this); return packageData(body, "FormData", this[mimeTypeSymbol]); }, + writable: true, + configurable: true, + enumerable: true, }, json: { /** @returns {Promise} */ @@ -191,6 +204,9 @@ const body = await consumeBody(this); return packageData(body, "JSON"); }, + writable: true, + configurable: true, + enumerable: true, }, text: { /** @returns {Promise} */ @@ -199,6 +215,9 @@ const body = await consumeBody(this); return packageData(body, "text"); }, + writable: true, + configurable: true, + enumerable: true, }, }; return Object.defineProperties(prototype.prototype, mixin); diff --git a/extensions/fetch/23_request.js b/extensions/fetch/23_request.js index 480b83182..d8369b404 100644 --- a/extensions/fetch/23_request.js +++ b/extensions/fetch/23_request.js @@ -403,6 +403,28 @@ mixinBody(Request, _body, _mimeType); + Object.defineProperty(Request.prototype, "method", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Request.prototype, "url", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Request.prototype, "headers", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Request.prototype, "redirect", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Request.prototype, "clone", { + enumerable: true, + writable: true, + configurable: true, + }); + webidl.converters["Request"] = webidl.createInterfaceConverter( "Request", Request, diff --git a/extensions/fetch/23_response.js b/extensions/fetch/23_response.js index 6d9874c6a..7bbf3c66e 100644 --- a/extensions/fetch/23_response.js +++ b/extensions/fetch/23_response.js @@ -365,6 +365,40 @@ mixinBody(Response, _body, _mimeType); + Object.defineProperty(Response.prototype, "type", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Response.prototype, "url", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Response.prototype, "redirected", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Response.prototype, "status", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Response.prototype, "ok", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Response.prototype, "statusText", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Response.prototype, "headers", { + enumerable: true, + configurable: true, + }); + Object.defineProperty(Response.prototype, "clone", { + enumerable: true, + writable: true, + configurable: true, + }); + webidl.converters["Response"] = webidl.createInterfaceConverter( "Response", Response, -- cgit v1.2.3 From c00f9ad515561921894580d6d7132f65e70eae0a Mon Sep 17 00:00:00 2001 From: Yoshiya Hinosawa Date: Thu, 27 May 2021 19:25:30 +0900 Subject: fix(ext/fetch): fix error message of Request constructor (#10772) --- extensions/fetch/23_request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions') diff --git a/extensions/fetch/23_request.js b/extensions/fetch/23_request.js index d8369b404..de1bdd211 100644 --- a/extensions/fetch/23_request.js +++ b/extensions/fetch/23_request.js @@ -273,7 +273,7 @@ ((init.body !== undefined && init.body !== null) || inputBody !== null) ) { - throw new TypeError("HEAD and GET requests may not have a body."); + throw new TypeError("Request with GET/HEAD method cannot have body."); } // 34. -- cgit v1.2.3 From 283e7ca92bb009a950211ad0ab701288ff62c009 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Sat, 29 May 2021 00:19:26 +0200 Subject: chore: release web extension@0.38.0 (#10773) --- extensions/web/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions') diff --git a/extensions/web/Cargo.toml b/extensions/web/Cargo.toml index 2e2d96675..e8a6f480e 100644 --- a/extensions/web/Cargo.toml +++ b/extensions/web/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_web" -version = "0.37.0" +version = "0.38.0" edition = "2018" description = "Collection of Web APIs" authors = ["the Deno authors"] -- cgit v1.2.3 From 475bc35646bc25d796b2638768cd5a79e3a0033e Mon Sep 17 00:00:00 2001 From: Yusuke Tanaka Date: Sat, 29 May 2021 20:18:24 +0900 Subject: chore: upgrade Tokio to 1.6.1 (#10782) --- extensions/fetch/Cargo.toml | 2 +- extensions/timers/Cargo.toml | 2 +- extensions/webgpu/Cargo.toml | 2 +- extensions/websocket/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'extensions') diff --git a/extensions/fetch/Cargo.toml b/extensions/fetch/Cargo.toml index 83cd4ecdb..201417816 100644 --- a/extensions/fetch/Cargo.toml +++ b/extensions/fetch/Cargo.toml @@ -21,6 +21,6 @@ deno_file = { version = "0.6.0", path = "../file" } http = "0.2.4" reqwest = { version = "0.11.3", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] } serde = { version = "1.0.125", features = ["derive"] } -tokio = { version = "1.6.0", features = ["full"] } +tokio = { version = "1.6.1", features = ["full"] } tokio-stream = "0.1.5" tokio-util = "0.6.7" diff --git a/extensions/timers/Cargo.toml b/extensions/timers/Cargo.toml index d9bb23614..32cf02e86 100644 --- a/extensions/timers/Cargo.toml +++ b/extensions/timers/Cargo.toml @@ -15,4 +15,4 @@ path = "lib.rs" [dependencies] deno_core = { version = "0.88.0", path = "../../core" } -tokio = { version = "1.6.0", features = ["full"] } +tokio = { version = "1.6.1", features = ["full"] } diff --git a/extensions/webgpu/Cargo.toml b/extensions/webgpu/Cargo.toml index 5ada950b7..4a1c25db2 100644 --- a/extensions/webgpu/Cargo.toml +++ b/extensions/webgpu/Cargo.toml @@ -15,7 +15,7 @@ path = "lib.rs" [dependencies] deno_core = { version = "0.88.0", path = "../../core" } -tokio = { version = "1.6.0", features = ["full"] } +tokio = { version = "1.6.1", features = ["full"] } serde = { version = "1.0.125", features = ["derive"] } wgpu-core = { version = "0.8.1", features = ["trace"] } wgpu-types = "0.8.0" diff --git a/extensions/websocket/Cargo.toml b/extensions/websocket/Cargo.toml index a5a962e54..129aeb7ca 100644 --- a/extensions/websocket/Cargo.toml +++ b/extensions/websocket/Cargo.toml @@ -17,7 +17,7 @@ path = "lib.rs" deno_core = { version = "0.88.0", path = "../../core" } http = "0.2.3" serde = { version = "1.0.125", features = ["derive"] } -tokio = { version = "1.6.0", features = ["full"] } +tokio = { version = "1.6.1", features = ["full"] } tokio-rustls = "0.22.0" tokio-tungstenite = { version = "0.14.0", features = ["rustls-tls"] } webpki = "0.21.4" -- cgit v1.2.3 From 2c1f37b4a97922cfcec9393e2146c42d3d3b6e2e Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Mon, 31 May 2021 11:03:17 +0200 Subject: fix: remove unimplemented Request attributes (#10784) Not having them is better than throwing "unimplemented" errors on access. --- extensions/fetch/23_request.js | 111 ----------------------------------------- 1 file changed, 111 deletions(-) (limited to 'extensions') diff --git a/extensions/fetch/23_request.js b/extensions/fetch/23_request.js index de1bdd211..ac38ce552 100644 --- a/extensions/fetch/23_request.js +++ b/extensions/fetch/23_request.js @@ -316,66 +316,11 @@ return this[_headers]; } - get destination() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get referrer() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get referrerPolicy() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get mode() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get credentials() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get cache() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - get redirect() { webidl.assertBranded(this, Request); return this[_request].redirectMode; } - get integrity() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get keepalive() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get isReloadNavigation() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get isHistoryNavigation() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - - get signal() { - webidl.assertBranded(this, Request); - throw new TypeError("This property is not implemented."); - } - clone() { webidl.assertBranded(this, Request); if (this[_body] && this[_body].unusable()) { @@ -438,46 +383,6 @@ } return webidl.converters["USVString"](V, opts); }; - - webidl.converters["ReferrerPolicy"] = webidl.createEnumConverter( - "ReferrerPolicy", - [ - "", - "no-referrer", - "no-referrer-when-downgrade", - "same-origin", - "origin", - "strict-origin", - "origin-when-cross-origin", - "strict-origin-when-cross-origin", - "unsafe-url", - ], - ); - webidl.converters["RequestMode"] = webidl.createEnumConverter("RequestMode", [ - "navigate", - "same-origin", - "no-cors", - "cors", - ]); - webidl.converters["RequestCredentials"] = webidl.createEnumConverter( - "RequestCredentials", - [ - "omit", - "same-origin", - "include", - ], - ); - webidl.converters["RequestCache"] = webidl.createEnumConverter( - "RequestCache", - [ - "default", - "no-store", - "reload", - "no-cache", - "force-cache", - "only-if-cached", - ], - ); webidl.converters["RequestRedirect"] = webidl.createEnumConverter( "RequestRedirect", [ @@ -497,23 +402,7 @@ webidl.converters["BodyInit"], ), }, - { key: "referrer", converter: webidl.converters["USVString"] }, - { key: "referrerPolicy", converter: webidl.converters["ReferrerPolicy"] }, - { key: "mode", converter: webidl.converters["RequestMode"] }, - { - key: "credentials", - converter: webidl.converters["RequestCredentials"], - }, - { key: "cache", converter: webidl.converters["RequestCache"] }, { key: "redirect", converter: webidl.converters["RequestRedirect"] }, - { key: "integrity", converter: webidl.converters["DOMString"] }, - { key: "keepalive", converter: webidl.converters["boolean"] }, - { - key: "signal", - converter: webidl.createNullableConverter( - webidl.converters["AbortSignal"], - ), - }, { key: "client", converter: webidl.converters.any }, ], ); -- cgit v1.2.3 From 1567c1013cc8ff12cf039137792da66a1d0015b5 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 31 May 2021 17:39:24 +0000 Subject: v1.10.3 --- extensions/console/Cargo.toml | 4 ++-- extensions/crypto/Cargo.toml | 5 ++--- extensions/fetch/Cargo.toml | 6 +++--- extensions/file/Cargo.toml | 4 ++-- extensions/timers/Cargo.toml | 4 ++-- extensions/url/Cargo.toml | 4 ++-- extensions/web/Cargo.toml | 4 ++-- extensions/webgpu/Cargo.toml | 4 ++-- extensions/webidl/Cargo.toml | 4 ++-- extensions/websocket/Cargo.toml | 4 ++-- extensions/webstorage/Cargo.toml | 4 ++-- 11 files changed, 23 insertions(+), 24 deletions(-) (limited to 'extensions') diff --git a/extensions/console/Cargo.toml b/extensions/console/Cargo.toml index 189d56500..06db0a2d6 100644 --- a/extensions/console/Cargo.toml +++ b/extensions/console/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_console" -version = "0.7.0" +version = "0.7.1" edition = "2018" description = "Implementation of Console API for Deno" authors = ["the Deno authors"] @@ -14,4 +14,4 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } diff --git a/extensions/crypto/Cargo.toml b/extensions/crypto/Cargo.toml index 5295aa9f1..fa0a6634e 100644 --- a/extensions/crypto/Cargo.toml +++ b/extensions/crypto/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_crypto" -version = "0.21.0" +version = "0.21.1" edition = "2018" description = "Web Cryptography API implementation for Deno" authors = ["the Deno authors"] @@ -14,6 +14,5 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } rand = "0.8.3" - diff --git a/extensions/fetch/Cargo.toml b/extensions/fetch/Cargo.toml index 201417816..0ba969bc1 100644 --- a/extensions/fetch/Cargo.toml +++ b/extensions/fetch/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_fetch" -version = "0.29.0" +version = "0.29.1" edition = "2018" description = "Fetch API implementation for Deno" authors = ["the Deno authors"] @@ -16,8 +16,8 @@ path = "lib.rs" [dependencies] bytes = "1.0.1" data-url = "0.1.0" -deno_core = { version = "0.88.0", path = "../../core" } -deno_file = { version = "0.6.0", path = "../file" } +deno_core = { version = "0.88.1", path = "../../core" } +deno_file = { version = "0.6.1", path = "../file" } http = "0.2.4" reqwest = { version = "0.11.3", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] } serde = { version = "1.0.125", features = ["derive"] } diff --git a/extensions/file/Cargo.toml b/extensions/file/Cargo.toml index cab6f5666..f9f17e427 100644 --- a/extensions/file/Cargo.toml +++ b/extensions/file/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_file" -version = "0.6.0" +version = "0.6.1" edition = "2018" description = "File API implementation for Deno" authors = ["the Deno authors"] @@ -14,5 +14,5 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } uuid = { version = "0.8.2", features = ["v4"] } diff --git a/extensions/timers/Cargo.toml b/extensions/timers/Cargo.toml index 32cf02e86..afdbf2e4c 100644 --- a/extensions/timers/Cargo.toml +++ b/extensions/timers/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_timers" -version = "0.5.0" +version = "0.5.1" edition = "2018" description = "Timers API implementation for Deno" authors = ["the Deno authors"] @@ -14,5 +14,5 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } tokio = { version = "1.6.1", features = ["full"] } diff --git a/extensions/url/Cargo.toml b/extensions/url/Cargo.toml index 70a880e0d..57f82bba8 100644 --- a/extensions/url/Cargo.toml +++ b/extensions/url/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_url" -version = "0.7.0" +version = "0.7.1" edition = "2018" description = "URL API implementation for Deno" authors = ["the Deno authors"] @@ -14,7 +14,7 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } idna = "0.2.3" percent-encoding = "2.1.0" serde = { version = "1.0.125", features = ["derive"] } diff --git a/extensions/web/Cargo.toml b/extensions/web/Cargo.toml index e8a6f480e..1d0cd5411 100644 --- a/extensions/web/Cargo.toml +++ b/extensions/web/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_web" -version = "0.38.0" +version = "0.38.1" edition = "2018" description = "Collection of Web APIs" authors = ["the Deno authors"] @@ -14,7 +14,7 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } [dev-dependencies] futures = "0.3.15" diff --git a/extensions/webgpu/Cargo.toml b/extensions/webgpu/Cargo.toml index 4a1c25db2..a1609fea8 100644 --- a/extensions/webgpu/Cargo.toml +++ b/extensions/webgpu/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_webgpu" -version = "0.8.0" +version = "0.8.1" edition = "2018" description = "WebGPU implementation for Deno" authors = ["the Deno authors"] @@ -14,7 +14,7 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } tokio = { version = "1.6.1", features = ["full"] } serde = { version = "1.0.125", features = ["derive"] } wgpu-core = { version = "0.8.1", features = ["trace"] } diff --git a/extensions/webidl/Cargo.toml b/extensions/webidl/Cargo.toml index ad6b2d57b..f2842c5c2 100644 --- a/extensions/webidl/Cargo.toml +++ b/extensions/webidl/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_webidl" -version = "0.7.0" +version = "0.7.1" edition = "2018" description = "WebIDL implementation for Deno" authors = ["the Deno authors"] @@ -14,4 +14,4 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } diff --git a/extensions/websocket/Cargo.toml b/extensions/websocket/Cargo.toml index 129aeb7ca..7e2a82b99 100644 --- a/extensions/websocket/Cargo.toml +++ b/extensions/websocket/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_websocket" -version = "0.12.0" +version = "0.12.1" edition = "2018" description = "Implementation of WebSocket API for Deno" authors = ["the Deno authors"] @@ -14,7 +14,7 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } http = "0.2.3" serde = { version = "1.0.125", features = ["derive"] } tokio = { version = "1.6.1", features = ["full"] } diff --git a/extensions/webstorage/Cargo.toml b/extensions/webstorage/Cargo.toml index 506014b17..b72970bbd 100644 --- a/extensions/webstorage/Cargo.toml +++ b/extensions/webstorage/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "deno_webstorage" -version = "0.2.0" +version = "0.2.1" edition = "2018" description = "Implementation of WebStorage API for Deno" authors = ["the Deno authors"] @@ -14,6 +14,6 @@ repository = "https://github.com/denoland/deno" path = "lib.rs" [dependencies] -deno_core = { version = "0.88.0", path = "../../core" } +deno_core = { version = "0.88.1", path = "../../core" } rusqlite = { version = "0.25.3", features = ["unlock_notify", "bundled"] } serde = { version = "1.0.125", features = ["derive"] } -- cgit v1.2.3