Skip to content

Fix wasm-pack builds #37851

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

Merged
zmb3 merged 2 commits into from
Feb 7, 2024
+19 −16
Merged

Fix wasm-pack builds #37851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b2565
Add wasm32-unknown-unknown target to docker images
zmb3 Feb 7, 2024
6d960ed
Update wasm-bindgen to 0.2.91
zmb3 Feb 7, 2024
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
20 changes: 10 additions & 10 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ ifeq ("$(with_rdpclient)", "yes")
.PHONY: rdpclient
rdpclient:
ifneq ("$(FIPS)","")
cargo build -p rdp-client --features=fips --release $(CARGO_TARGET)
cargo build -p rdp-client --features=fips --release --locked $(CARGO_TARGET)
else
cargo build -p rdp-client --release $(CARGO_TARGET)
cargo build -p rdp-client --release --locked $(CARGO_TARGET)
endif
else
.PHONY: rdpclient
Expand Down
1 change: 1 addition & 0 deletions build.assets/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ RUN curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --p
cargo --version && \
rustc --version && \
rustup component add rustfmt clippy && \
rustup target add wasm32-unknown-unknown && \
if [ "$BUILDARCH" = "amd64" ]; then rustup target add aarch64-unknown-linux-gnu; fi

ARG WASM_PACK_VERSION
Expand Down
3 changes: 2 additions & 1 deletion build.assets/Dockerfile-centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ USER ci
RUN curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION && \
rustup --version && \
cargo --version && \
rustc --version
rustc --version && \
rustup target add wasm32-unknown-unknown

# Install wasm-pack for targeting WebAssembly from Rust.
ARG WASM_PACK_VERSION
Expand Down
1 change: 1 addition & 0 deletions build.assets/Dockerfile-node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ RUN curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --p
cargo --version && \
rustc --version && \
rustup component add rustfmt clippy && \
rustup target add wasm32-unknown-unknown && \
if [ "$BUILDARCH" = "amd64" ]; then rustup target add aarch64-unknown-linux-gnu; fi

# Install wasm-pack for targeting WebAssembly from Rust.
Expand Down
4 changes: 2 additions & 2 deletions web/packages/teleport/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"scripts": {
"start": "yarn build-wasm && vite",
"build-wasm": "cargo install --locked wasm-bindgen-cli && wasm-pack build ./src/ironrdp --target web --mode no-install",
"build-wasm": "wasm-pack build ./src/ironrdp --target web",
"build": "yarn build-wasm && vite build",
"test": "npx jest",
"tdd": "jest . --watch"
Expand Down Expand Up @@ -35,4 +35,4 @@
"jest-websocket-mock": "^2.5.0",
"ts-loader": "^9.4.2"
}
}
}
2 changes: 1 addition & 1 deletion web/packages/teleport/src/ironrdp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ time = { version = "0.3", features = ["wasm-bindgen"] }
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", features = ["time"] }
tracing-web = "0.1.2"
wasm-bindgen = "0.2.84"
wasm-bindgen = "0.2.91"
web-sys = { version = "0.3.67", features = ["ImageData"] }