Skip to content

Commit

Permalink
Merge remote-tracking branch 'source/master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
josh-hemphill committed Oct 18, 2020
2 parents d33da63 + c1c7601 commit 2502e59
Show file tree
Hide file tree
Showing 65 changed files with 2,291 additions and 281 deletions.
52 changes: 26 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ winapi = "0.3.9"

[dependencies]
deno_core = { path = "../core", version = "0.63.0" }
deno_doc = "0.1.11"
deno_lint = { version = "0.2.3", features = ["json"] }
deno_doc = "0.1.12"
deno_lint = "0.2.4"
deno_web = { path = "../op_crates/web", version = "0.15.0" }
deno_fetch = { path = "../op_crates/fetch", version = "0.7.0" }

Expand All @@ -43,7 +43,7 @@ clap = "2.33.3"
dissimilar = "1.0.2"
dlopen = "0.1.8"
encoding_rs = "0.8.24"
dprint-plugin-typescript = "0.32.4"
dprint-plugin-typescript = "0.32.5"
filetime = "0.2.12"
http = "0.2.1"
indexmap = "1.6.0"
Expand All @@ -61,8 +61,8 @@ rustyline-derive = "0.3.1"
serde = { version = "1.0.116", features = ["derive"] }
sys-info = "0.7.0"
sourcemap = "6.0.1"
swc_common = { version = "=0.10.3", features = ["sourcemap"] }
swc_ecmascript = { version = "=0.9.1", features = ["codegen", "dep_graph", "parser", "react", "transforms", "visit"] }
swc_common = { version = "=0.10.4", features = ["sourcemap"] }
swc_ecmascript = { version = "=0.10.1", features = ["codegen", "dep_graph", "parser", "react", "transforms", "visit"] }
tempfile = "3.1.0"
termcolor = "1.1.0"
tokio = { version = "0.2.22", features = ["full"] }
Expand Down
6 changes: 3 additions & 3 deletions cli/dts/lib.deno.ns.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ declare namespace Deno {
* Requires `allow-read` and `allow-write` permission. */
export function rename(oldpath: string, newpath: string): Promise<void>;

/** Synchronously reads and returns the entire contents of a file as utf8 encoded string
/** Synchronously reads and returns the entire contents of a file as utf8
* encoded string. Reading a directory returns an empty string.
*
* ```ts
Expand All @@ -1236,8 +1236,8 @@ declare namespace Deno {
* Requires `allow-read` permission. */
export function readTextFileSync(path: string | URL): string;

/** Asynchronously reads and returns the entire contents of a file as a utf8
* encoded string. Reading a directory returns an empty data array.
/** Asynchronously reads and returns the entire contents of a file as utf8
* encoded string. Reading a directory returns an empty string.
*
* ```ts
* const data = await Deno.readTextFile("hello.txt");
Expand Down
11 changes: 11 additions & 0 deletions cli/dts/lib.deno.unstable.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1312,6 +1312,17 @@ declare namespace Deno {
atime: number | Date,
mtime: number | Date,
): Promise<void>;

/** *UNSTABLE**: new API, yet to be vetted.
*
* SleepSync puts the main thread to sleep synchronously for a given amount of
* time in milliseconds.
*
* ```ts
* Deno.sleepSync(10);
* ```
*/
export function sleepSync(millis: number): Promise<void>;
}

declare function fetch(
Expand Down
3 changes: 0 additions & 3 deletions cli/file_fetcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ use std::sync::Arc;
use std::sync::Mutex;

/// Structure representing local or remote file.
///
/// In case of remote file `url` might be different than originally requested URL, if so
/// `redirect_source_url` will contain original URL and `url` will be equal to final location.
#[derive(Debug, Clone)]
pub struct SourceFile {
pub url: Url,
Expand Down

0 comments on commit 2502e59

Please sign in to comment.