Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: lockfiles #3231

Merged
merged 14 commits into from
Nov 3, 2019
Merged

feat: lockfiles #3231

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9453695
First pass at lockfile support
ry Oct 29, 2019
ecccf9f
add lock-check tests
ry Oct 29, 2019
0f3bf43
clippy
ry Oct 29, 2019
d83e2c1
cleanup
ry Oct 29, 2019
3e6a616
use http for lock_check tests
ry Oct 29, 2019
f2c3aa5
cleanup
ry Oct 29, 2019
e8745d1
use @hayd's suggestion for flags
ry Oct 29, 2019
72ac938
cleanup
ry Oct 29, 2019
e9194ba
docs
ry Oct 29, 2019
4c21065
fmt
ry Oct 29, 2019
d060d78
clippy
ry Oct 29, 2019
def8edc
cleanup
ry Oct 29, 2019
38e1158
dont write local file:https:// urls to lockfile
ry Oct 29, 2019
13e75de
Merge branch 'master' into lock_file
ry Nov 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cleanup
  • Loading branch information
@ry
ry committed Oct 29, 2019
commit 72ac9386032f40ff74979bcbfb81a356a6c5c003
8 changes: 0 additions & 8 deletions cli/lockfile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ pub struct Lockfile {
}

impl Lockfile {
pub fn from_flag(flag: &Option<String>) -> Option<Lockfile> {
if let Some(filename) = flag {
Some(Self::new(filename.to_string()))
} else {
None
}
}

pub fn new(filename: String) -> Lockfile {
Lockfile {
map: HashMap::new(),
Expand Down
6 changes: 5 additions & 1 deletion cli/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,11 @@ impl ThreadSafeState {
let modules = Arc::new(Mutex::new(deno::Modules::new()));

// Note: reads lazily from disk on first call to lockfile.check()
let lockfile = Lockfile::from_flag(&flags.lock).map(Mutex::new);
let lockfile = if let Some(filename) = &flags.lock {
Some(Mutex::new(Lockfile::new(filename.to_string())))
} else {
None
};

let state = State {
main_module,
Expand Down