Skip to content

Commit

Permalink
Merge cc84220 into 63f37a2
Browse files Browse the repository at this point in the history
  • Loading branch information
Razican authored May 19, 2020
2 parents 63f37a2 + cc84220 commit 838a8ea
Show file tree
Hide file tree
Showing 5 changed files with 1,278 additions and 388 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.

4 changes: 2 additions & 2 deletions boa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ edition = "2018"

[dependencies]
gc = { version = "0.3.4", features = ["derive"] }
serde_json = "1.0.52"
serde_json = "1.0.53"
rand = "0.7.3"
num-traits = "0.2.11"
regex = "1.3.7"
rustc-hash = "1.1.0"

# Optional Dependencies
serde = { version = "1.0.106", features = ["derive"], optional = true }
serde = { version = "1.0.110", features = ["derive"], optional = true }

[dev-dependencies]
criterion = "0.3.2"
Expand Down
2 changes: 1 addition & 1 deletion boa_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ edition = "2018"
[dependencies]
Boa = { path = "../boa", features = ["serde"] }
structopt = "0.3.14"
serde_json = "1.0.52"
serde_json = "1.0.53"

[target.x86_64-unknown-linux-gnu.dependencies]
jemallocator = "0.3.2"
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"serve": "webpack-dev-server"
},
"devDependencies": {
"@wasm-tool/wasm-pack-plugin": "1.1.0",
"bootstrap": "^4.3.1",
"@wasm-tool/wasm-pack-plugin": "^1.3.0",
"bootstrap": "^4.5.0",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.0.3",
"css-loader": "^3.2.0",
"file-loader": "^5.0.2",
"html-webpack-plugin": "^3.2.0",
"style-loader": "^1.0.0",
"copy-webpack-plugin": "^6.0.1",
"css-loader": "^3.5.3",
"file-loader": "^6.0.0",
"html-webpack-plugin": "^4.3.0",
"style-loader": "^1.2.1",
"text-encoding": "^0.7.0",
"webpack": "^4.40.2",
"webpack-cli": "^3.3.9",
"webpack-dev-server": "^3.8.1"
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.11.0"
},
"dependencies": {
"monaco-editor": "^0.20.0"
Expand Down
Loading

0 comments on commit 838a8ea

Please sign in to comment.