Skip to content

Commit

Permalink
Rename "Boa" to boa_engine, moved GC and profiler to their crates (#1844
Browse files Browse the repository at this point in the history
)

* Separated GC and Profiler

* Fixed prettierignore

* Removed re-exports, fixed benchmarks, added some caches

* Removed empty line

* Update boa_engine/Cargo.toml

Co-authored-by: raskad <32105367+raskad@users.noreply.github.com>

* Fixed the profiler

* Removed empty file

Co-authored-by: raskad <32105367+raskad@users.noreply.github.com>
  • Loading branch information
Razican and raskad authored Feb 21, 2022
1 parent 517c672 commit 4d2772d
Show file tree
Hide file tree
Showing 325 changed files with 1,468 additions and 1,530 deletions.
22 changes: 17 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,38 @@ updates:
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa/
directory: /boa_cli/
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa_cli/
directory: /boa_engine/
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa_wasm/
directory: /boa_gc/
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa_interner/
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa_profiler/
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa_tester/
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa_interner/
directory: /boa_unicode/
schedule:
interval: daily
- package-ecosystem: cargo
directory: /boa_wasm/
schedule:
interval: daily
- package-ecosystem: gitsubmodule
directory: /test262/
directory: /
schedule:
interval: weekly
5 changes: 4 additions & 1 deletion .github/workflows/bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ jobs:
- name: Cache cargo
uses: actions/cache@v2.1.7
with:
path: target
path: |
target
~/.cargo/git
~/.cargo/registry
key: ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.lock') }}
- uses: actions-rs/cargo@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
branchName: ${{ github.base_ref }}
cwd: ./boa
cwd: ./boa_engine
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
node_modules
target
boa_wasm/pkg
~/.cargo/git
~/.cargo/registry
key: ${{ runner.os }}-yarn-build-target-${{ hashFiles('**/yarn.lock') }}
- uses: Borales/actions-yarn@v2.3.0
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ jobs:
- name: Cache cargo
uses: actions/cache@v2.1.7
with:
path: target
path: |
target
~/.cargo/git
~/.cargo/registry
key: ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.lock') }}
- uses: actions-rs/cargo@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test262.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: actions/cache@v2.1.7
with:
path: |
./boa/target
target
~/.cargo/git
~/.cargo/registry
key: ${{ runner.os }}-cargo-test262-${{ hashFiles('**/Cargo.lock') }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/webassembly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ jobs:
path: |
node_modules
target
~/.cargo/git
~/.cargo/registry
boa_wasm/pkg
key: ${{ runner.os }}-yarn-build-target-${{ hashFiles('**/yarn.lock') }}
- uses: Borales/actions-yarn@v2.3.0
Expand Down
4 changes: 2 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
*.rs
target
node_modules
boa/benches/bench_scripts/mini_js.js
boa/benches/bench_scripts/clean_js.js
boa_engine/benches/bench_scripts/mini_js.js
boa_engine/benches/bench_scripts/clean_js.js
boa_wasm/pkg
dist
test262
Expand Down
87 changes: 53 additions & 34 deletions Cargo.lock

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

8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[workspace]
members = [
"boa",
"boa_cli",
"boa_wasm",
"boa_engine",
"boa_gc",
"boa_interner",
"boa_profiler",
"boa_tester",
"boa_unicode",
"boa_interner",
"boa_wasm",
]

# The release profile, used for `cargo build --release`.
Expand Down
10 changes: 0 additions & 10 deletions boa/src/gc.rs

This file was deleted.

26 changes: 22 additions & 4 deletions boa_cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,37 @@
[package]
name = "boa_cli"
version = "0.13.0"
edition = "2021"
rust-version = "1.58"
authors = ["boa-dev"]
description = "Boa is a Javascript lexer, parser and Just-in-Time compiler written in Rust. Currently, it has support for some of the language."
repository = "https://github.com/boa-dev/boa"
keywords = ["javascript", "compiler", "lexer", "parser", "js", "cli"]
categories = ["command-line-utilities"]
license = "Unlicense/MIT"
exclude = ["../.vscode/*", "../Dockerfile", "../Makefile", "../.editorConfig"]
edition = "2021"
rust-version = "1.58"
default-run = "boa"
exclude = [
"../.vscode/*",
"../.editorconfig",
"../test262/*",
"../node_modules/*",
"../target/*",
"../dist/*",
"../.github/*",
"../assets/*",
"../docs/*",
"../*.js",
"../test_ignore.txt",
"../yarn.lock",
"../package.json",
"../index.html",
"../tests/*",
"../.github/*",
]

[dependencies]
Boa = { path = "../boa", features = ["deser", "console"] }
boa_engine = { path = "../boa_engine", features = ["deser", "console"] }
boa_interner = { path = "../boa_interner" }
rustyline = "9.1.2"
rustyline-derive = "0.6.0"
structopt = "0.3.26"
Expand Down
5 changes: 3 additions & 2 deletions boa_cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@
rustdoc::missing_doc_code_examples
)]

use boa::{syntax::ast::node::StatementList, Context, Interner};
use boa_engine::{syntax::ast::node::StatementList, Context};
use boa_interner::Interner;
use colored::{Color, Colorize};
use rustyline::{config::Config, error::ReadlineError, EditMode, Editor};
use std::{fs::read, io, path::PathBuf};
Expand Down Expand Up @@ -146,7 +147,7 @@ fn parse_tokens<S>(src: S, interner: &mut Interner) -> Result<StatementList, Str
where
S: AsRef<[u8]>,
{
use boa::syntax::parser::Parser;
use boa_engine::syntax::parser::Parser;

let src_bytes = src.as_ref();
Parser::new(src_bytes, false)
Expand Down
Loading

0 comments on commit 4d2772d

Please sign in to comment.