Skip to content

Commit 63d57ab

Browse files
authored
Update webpack et al (#115)
* Get working nix environment for this repo * Update webpack, typescript, etc All in service of being able to update micromatch. Confirmed the dev server tests still run, everything still compiles with these updates. * Update to fixed micromatch * Remove deprecated calls * Remove dead comment * Updates for webpack-dev-server test * One I can't catch locally * Remove unused lockfile
1 parent 4abba9a commit 63d57ab

File tree

14 files changed

+1481
-2640
lines changed

14 files changed

+1481
-2640
lines changed

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

.github/workflows/wasm-ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
node_version:
17-
- '14'
17+
- '18'
1818
steps:
1919
- uses: actions/checkout@v3
2020
- uses: actions-rs/toolchain@v1
@@ -26,6 +26,7 @@ jobs:
2626
- uses: IronCoreLabs/rust-install@v0.1.0
2727
with:
2828
crate: wasm-bindgen-cli
29+
version: 0.2.92 # needs to match Cargo.toml and flake.nix version
2930
accesskey: AKIAU2WBY6VDTC563V7G
3031
secretkey: ${{ secrets.TOOL_CACHE_SECRET_KEY }}
3132
os: ubuntu-20.04

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ npm-debug.log
66
yarn-error.log
77
target/*
88
pkg/*
9-
wasm-pack.log
9+
wasm-pack.log
10+
.direnv

Cargo.lock

Lines changed: 76 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ edition = "2018"
1111
crate-type = ["cdylib"]
1212

1313
[dependencies]
14+
gloo-utils = { version = "0.1", features = ["serde"] }
1415
ironcore-search-helpers = "0.1"
1516
js-sys = "0.3"
1617
rand = { version = "0.7", features = [ "wasm-bindgen" ] }
1718
rand_chacha = "0.2"
1819
recrypt = { version = "0.12", features = [ "wasm" ], default-features = false }
1920
serde = "1"
2021
serde_derive = "1"
21-
wasm-bindgen = { version = "0.2", features = [ "serde-serialize" ] }
22+
wasm-bindgen = { version = "=0.2.92" }
2223

2324
[profile.dev]
2425
opt-level = 2

flake.lock

Lines changed: 92 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)