Skip to content

Commit 50650b9

Browse files
committed
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.
1 parent 53c5d45 commit 50650b9

File tree

8 files changed

+1310
-2617
lines changed

8 files changed

+1310
-2617
lines changed

.github/workflows/wasm-ci.yaml

Lines changed: 1 addition & 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

.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: 45 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rand_chacha = "0.2"
1818
recrypt = { version = "0.12", features = [ "wasm" ], default-features = false }
1919
serde = "1"
2020
serde_derive = "1"
21-
wasm-bindgen = { version = "0.2", features = [ "serde-serialize" ] }
21+
wasm-bindgen = { version = "=0.2.92", features = [ "serde-serialize" ] }
2222

2323
[profile.dev]
2424
opt-level = 2

lib/tests/Api256Shim.test.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,8 @@ import("../Api256Shim").then((Recrypt) => {
381381
api.decrypt(lvl0EncryptedValue, decryptKeys.privateKey);
382382
} catch (e) {
383383
expect(e).to.be.a("Error");
384-
expect(e.message).to.be.string;
385-
expect(e.message).not.to.have.lengthOf(0);
384+
expect((e as any).message).to.be.string;
385+
expect((e as any).message).not.to.have.lengthOf(0);
386386
done();
387387
}
388388
});
@@ -553,7 +553,6 @@ import("../Api256Shim").then((Recrypt) => {
553553
);
554554
});
555555
});
556-
557556
});
558557
mocha.checkLeaks();
559558
mocha.run();

package.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"name": "@ironcorelabs/recrypt-wasm-binding",
3-
"types": "recrypt-wasm-binding.d.ts",
4-
"version": "0.6.54-pre",
5-
"scripts": {
6-
"test": "node tests/testRunner",
7-
"testInBrowser": "WEBPACK_MODE=test webpack-dev-server --config webpack.config.js",
8-
"cargoBuild": "cargo build --release --target wasm32-unknown-unknown --target-dir ./target",
9-
"generateBindgenShim": "wasm-bindgen target/wasm32-unknown-unknown/release/recrypt_wasm_binding.wasm --browser --out-dir target --remove-name-section",
10-
"compile": "yarn run cargoBuild && yarn run generateBindgenShim",
11-
"benchmark": "WEBPACK_MODE=benchmark webpack-dev-server --config webpack.config.js --compress",
12-
"pack": "wasm-pack build --scope ironcorelabs --no-typescript"
13-
},
14-
"devDependencies": {
15-
"@types/source-map": "0.5.2",
16-
"html-webpack-plugin": "^4.5.2",
17-
"html-webpack-tags-plugin": "^2.0.17",
18-
"puppeteer": "^5.2.1",
19-
"shelljs": "^0.8.5",
20-
"text-encoding": "^0.7.0",
21-
"ts-loader": "^8.0.1",
22-
"typescript": "^3.9.7",
23-
"webpack": "^4.46.0",
24-
"webpack-cli": "^3.3.12",
25-
"webpack-dev-server": "^3.11.0"
26-
},
27-
"prettier": {
28-
"printWidth": 160,
29-
"tabWidth": 4,
30-
"trailingComma": "es5",
31-
"bracketSpacing": false,
32-
"jsxBracketSameLine": true,
33-
"arrowParens": "always"
34-
}
2+
"name": "@ironcorelabs/recrypt-wasm-binding",
3+
"types": "recrypt-wasm-binding.d.ts",
4+
"version": "0.6.54-pre",
5+
"scripts": {
6+
"test": "node tests/testRunner",
7+
"testInBrowser": "WEBPACK_MODE=test webpack serve --config webpack.config.js",
8+
"cargoBuild": "cargo build --release --target wasm32-unknown-unknown --target-dir ./target",
9+
"generateBindgenShim": "wasm-bindgen target/wasm32-unknown-unknown/release/recrypt_wasm_binding.wasm --browser --out-dir target --remove-name-section",
10+
"compile": "yarn run cargoBuild && yarn run generateBindgenShim",
11+
"benchmark": "WEBPACK_MODE=benchmark webpack serve --config webpack.config.js --compress",
12+
"pack": "wasm-pack build --scope ironcorelabs --no-typescript"
13+
},
14+
"devDependencies": {
15+
"@types/source-map": "0.5.2",
16+
"html-webpack-plugin": "^4.5.2",
17+
"html-webpack-tags-plugin": "^2.0.17",
18+
"puppeteer": "^5.2.1",
19+
"shelljs": "^0.8.5",
20+
"text-encoding": "^0.7.0",
21+
"ts-loader": "^9.5.1",
22+
"typescript": "^5.5.4",
23+
"webpack": "^5.94.0",
24+
"webpack-cli": "^5.1.4",
25+
"webpack-dev-server": "^5.0.4"
26+
},
27+
"prettier": {
28+
"printWidth": 160,
29+
"tabWidth": 4,
30+
"trailingComma": "es5",
31+
"bracketSpacing": false,
32+
"jsxBracketSameLine": true,
33+
"arrowParens": "always"
34+
}
3535
}

webpack.config.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ if (process.env.WEBPACK_MODE === "test") {
2222

2323
module.exports = {
2424
devServer: {
25-
overlay: true,
25+
client: {
26+
overlay: true,
27+
},
2628
},
2729
entry,
2830
output: {
@@ -41,6 +43,9 @@ module.exports = {
4143
},
4244
],
4345
},
46+
experiments: {
47+
syncWebAssembly: true,
48+
},
4449
plugins: [
4550
new HtmlWebpackPlugin(),
4651
new HtmlWebpackTagsPlugin({

0 commit comments

Comments
 (0)