Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 4 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,17 @@ jobs:
os: windows-latest
rust: stable
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: nanasess/setup-chromedriver@master
- if: matrix.os == 'macos-latest'
run: brew install --cask firefox
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.rust }}
targets: wasm32-unknown-unknown
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
- name: Cache dependencies
uses: actions/cache@v3
env:
cache-name: cache-dependencies
uses: actions/cache@v4
with:
path: |
~/.cargo/.crates.toml
Expand All @@ -45,13 +43,7 @@ jobs:
~/.cargo/registry/index
~/.cargo/registry/cache
target
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Cargo.lock') }}
# Pre-install wasm-bindgen-cli on macOS to avoid race condition
- name: Pre-install wasm-bindgen-cli (macOS)
if: matrix.os == 'macos-latest'
run: |
mkdir -p target/test_cache/.wasm-bindgen-cargo-install-0.2.100
cargo install wasm-bindgen-cli --version 0.2.100 --root target/test_cache/.wasm-bindgen-cargo-install-0.2.100 --force
key: ${{ runner.os }}-build-${{ hashFiles('Cargo.lock') }}
- name: Run Tests
run: cargo test --all --locked
env:
Expand Down
16 changes: 3 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div align="center">

<h1>📦✨ wasm-pack</h1>
<h1>📦✨ wasm-pack</h1>

<p>
<strong>Your favorite Rust → Wasm workflow tool!</strong>
Expand All @@ -12,14 +12,13 @@
</p>

<h3>
<a href="https://rustwasm.github.io/docs/wasm-pack/">Docs</a>
<a href="https://drager.github.io/wasm-pack/book">Docs</a>
<span> | </span>
<a href="https://github.com/drager/wasm-pack/blob/master/CONTRIBUTING.md">Contributing</a>
<span> | </span>
<a href="https://discordapp.com/channels/442252698964721669/443151097398296587">Chat</a>
</h3>

<sub>Built with 🦀🕸 by <a href="https://rustwasm.github.io/">The Rust and WebAssembly Working Group</a></sub>

</div>

Expand All @@ -31,14 +30,8 @@ browser or with Node.js. `wasm-pack` helps you build rust-generated
WebAssembly packages that you could publish to the npm registry, or otherwise use
alongside any javascript packages in workflows that you already use, such as [webpack].

[bundler-support]: https://github.com/rustwasm/team/blob/master/goals/bundler-integration.md#details
[webpack]: https://webpack.js.org/

This project is a part of the [rust-wasm] group. You can find more info by
visiting that repo!

[rust-wasm]: https://github.com/rustwasm/team

![demo](demo.gif)

## 🔮 Prerequisites
Expand Down Expand Up @@ -83,10 +76,7 @@ check out our [contribution policy].

## 🤹‍♀️ Governance

This project is part of the [rustwasm Working Group].

This project was started by [ashleygwilliams] and is maintained by [drager] and the Rust Wasm Working Group Core Team.
This project was started by [ashleygwilliams] and is maintained by [drager].

[ashleygwilliams]: https://github.com/ashleygwilliams
[drager]: https://github.com/drager
[rustwasm working group]: https://github.com/rustwasm/team
2 changes: 1 addition & 1 deletion docs/_theme/header.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<p>
This is the <strong>unpublished</strong> documentation of
<code>wasm-pack</code>, the published documentation is available
<a href="https://rustwasm.github.io/docs/wasm-pack/">
<a href="https://drager.github.io/wasm-pack/">
on the main Rust and WebAssembly documentation site
</a>. Features documented here may not be available in released versions of
<code>wasm-pack</code>.
Expand Down
1 change: 0 additions & 1 deletion docs/book.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[book]
authors = ["Ashley Williams"]
multilingual = false
src = "src"
title = "Hello wasm-pack!"
10 changes: 5 additions & 5 deletions docs/src/commands/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ wasm-pack build --target nodejs
| `no-modules` | [Native in browser][deploy-web] | Same as `web`, except the JS is included on a page and modifies global state, and doesn't support as many `wasm-bindgen` features as `web` |
| `deno` | [Deno][deploy-deno] | Outputs JS that can be natively imported as an ES module in deno. |

[deploy]: https://rustwasm.github.io/docs/wasm-bindgen/reference/deployment.html
[bundlers]: https://rustwasm.github.io/docs/wasm-bindgen/reference/deployment.html#bundlers
[deploy-nodejs]: https://rustwasm.github.io/docs/wasm-bindgen/reference/deployment.html#nodejs
[deploy-web]: https://rustwasm.github.io/docs/wasm-bindgen/reference/deployment.html#without-a-bundler
[deploy-deno]: https://rustwasm.github.io/docs/wasm-bindgen/reference/deployment.html#deno
[deploy]: https://wasm-bindgen.github.io/wasm-bindgen/reference/deployment.html
[bundlers]: https://wasm-bindgen.github.io/wasm-bindgen/reference/deployment.html#bundlers
[deploy-nodejs]: https://wasm-bindgen.github.io/wasm-bindgen/reference/deployment.html#nodejs
[deploy-web]: https://wasm-bindgen.github.io/wasm-bindgen/reference/deployment.html#without-a-bundler
[deploy-deno]: https://wasm-bindgen.github.io/wasm-bindgen/reference/deployment.html#deno

## Scope

Expand Down
2 changes: 1 addition & 1 deletion docs/src/commands/new.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ It takes 3 parameters, name, template, and mode:
wasm-pack new <name> --template <template> --mode <normal|noinstall|force>
```

The default template is [`rustwasm/wasm-pack-template`](https://github.com/drager/wasm-pack-template).
The default template is [`drager/wasm-pack-template`](https://github.com/drager/wasm-pack-template).

## Name

Expand Down
2 changes: 1 addition & 1 deletion docs/src/commands/test.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# wasm-pack test

The `wasm-pack test` command wraps the [wasm-bindgen-test-runner](https://rustwasm.github.io/wasm-bindgen/wasm-bindgen-test/index.html)
The `wasm-pack test` command wraps the [wasm-bindgen-test-runner](https://wasm-bindgen.github.io/wasm-bindgen/wasm-bindgen-test)
CLI allowing you to run wasm tests in different browsers without needing to install the different
webdrivers yourself.

Expand Down
2 changes: 1 addition & 1 deletion docs/src/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ You'll also want to check out the contributing [guidelines].

## 🏃‍♀️ Up and Running

1. fork and clone the `rustwasm/wasm-pack` repository
1. fork and clone the `drager/wasm-pack` repository
2. install [node/npm]
3. `cd wasm-pack`
4. `cargo run`. To test command line arguments you can run `cargo run -- <args>`.
Expand Down
5 changes: 0 additions & 5 deletions docs/src/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ browser or with Node.js. `wasm-pack` helps you build rust-generated
WebAssembly packages that you could publish to the npm registry, or otherwise use
alongside any javascript packages in workflows that you already use, such as [webpack].

[bundler-support]: https://github.com/rustwasm/team/blob/master/goals/bundler-integration.md#details
[webpack]: https://webpack.js.org/

This project is a part of the [rust-wasm] group. You can find more info by
visiting that repo!

[rust-wasm]: https://github.com/rustwasm/team

![demo](https://github.com/drager/wasm-pack/raw/master/demo.gif)
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ The last argument will be your project name. After you run the command, you will
directory with a new project, ready to go. We'll talk about what's been included in this
template further in this guide.

[rustwasm webpack-template]: https://github.com/rustwasm/rust-webpack-template
[rustwasm webpack-template]: https://github.com/drager/rust-webpack-template
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ Be sure to have read and followed the [Prerequisites](../../prerequisites/index.
[Rust]: https://www.rust-lang.org
[Node.js]: https://nodejs.org
[npm]: https://npmjs.com
[`rust-webpack-template`]: https://github.com/rustwasm/rust-webpack-template
[`rust-webpack-template`]: https://github.com/drager/rust-webpack-template
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ that will run your WebAssembly code in the browser.

To generate a new Rust Webpack project, we've used the [`rust-webpack`] npm template.

[`rust-webpack`]: https://github.com/rustwasm/rust-webpack-template
[`rust-webpack`]: https://github.com/drager/rust-webpack-template

```
npm init rust-webpack your-package-name
Expand Down
2 changes: 1 addition & 1 deletion src/install/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ pub fn prebuilt_url_for(tool: &Tool, version: &str, arch: &Arch, os: &Os) -> Res
match tool {
Tool::WasmBindgen => {
Ok(format!(
"https://github.com/rustwasm/wasm-bindgen/releases/download/{0}/wasm-bindgen-{0}-{1}.tar.gz",
"https://github.com/wasm-bindgen/wasm-bindgen/releases/download/{0}/wasm-bindgen-{0}-{1}.tar.gz",
version,
target
))
Expand Down
2 changes: 1 addition & 1 deletion tests/all/download.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn can_download_prebuilt_wasm_bindgen() {
let dir = tempfile::TempDir::new().unwrap();
let cache = binary_install::Cache::at(dir.path());
if let install::Status::Found(dl) =
install::download_prebuilt(&Tool::WasmBindgen, &cache, "0.2.95", true).unwrap()
install::download_prebuilt(&Tool::WasmBindgen, &cache, "0.2.100", true).unwrap()
{
assert!(dl.binary("wasm-bindgen").unwrap().is_file());
assert!(dl.binary("wasm-bindgen-test-runner").unwrap().is_file())
Expand Down
2 changes: 1 addition & 1 deletion tests/all/readme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ fn it_ignores_a_disabled_readme() {
# bindgen downloaded is what we expect, and if `=` is
# removed then it will download whatever the newest version
# of wasm-bindgen is which may not be what's listed here.
wasm-bindgen = "=0.2.95"
wasm-bindgen = "=0.2.100"

[dev-dependencies]
wasm-bindgen-test = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion tests/all/utils/fixture.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ impl Fixture {

static INSTALL_WASM_BINDGEN: Once = Once::new();
let cache = self.cache();
let version = "0.2.95";
let version = "0.2.100";

let download = || {
if let Ok(download) =
Expand Down
Loading