From 41878b124a534058baa1605a8f765608e14d3e58 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:28:25 +0200 Subject: [PATCH 1/4] Move `wasm/lib` -> `crates/wasm` --- Cargo.toml | 1 - {wasm/lib => crates/wasm}/.cargo/config.toml | 0 {wasm/lib => crates/wasm}/Cargo.toml | 0 {wasm/lib => crates/wasm}/Lib/_microdistlib.py | 0 {wasm/lib => crates/wasm}/Lib/asyncweb.py | 0 {wasm/lib => crates/wasm}/Lib/browser.py | 0 {wasm/lib => crates/wasm}/Lib/whlimport.py | 0 {wasm/lib => crates/wasm}/README.md | 0 {wasm/lib => crates/wasm}/src/browser_module.rs | 0 {wasm/lib => crates/wasm}/src/convert.rs | 0 {wasm/lib => crates/wasm}/src/js_module.rs | 0 {wasm/lib => crates/wasm}/src/lib.rs | 0 {wasm/lib => crates/wasm}/src/vm_class.rs | 0 {wasm/lib => crates/wasm}/src/wasm_builtins.rs | 0 14 files changed, 1 deletion(-) rename {wasm/lib => crates/wasm}/.cargo/config.toml (100%) rename {wasm/lib => crates/wasm}/Cargo.toml (100%) rename {wasm/lib => crates/wasm}/Lib/_microdistlib.py (100%) rename {wasm/lib => crates/wasm}/Lib/asyncweb.py (100%) rename {wasm/lib => crates/wasm}/Lib/browser.py (100%) rename {wasm/lib => crates/wasm}/Lib/whlimport.py (100%) rename {wasm/lib => crates/wasm}/README.md (100%) rename {wasm/lib => crates/wasm}/src/browser_module.rs (100%) rename {wasm/lib => crates/wasm}/src/convert.rs (100%) rename {wasm/lib => crates/wasm}/src/js_module.rs (100%) rename {wasm/lib => crates/wasm}/src/lib.rs (100%) rename {wasm/lib => crates/wasm}/src/vm_class.rs (100%) rename {wasm/lib => crates/wasm}/src/wasm_builtins.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 0773e8a410..53d1eb6ea2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -124,7 +124,6 @@ template = "installer-config/installer.wxs" resolver = "2" members = [ ".", - "wasm/lib", "crates/*", ] diff --git a/wasm/lib/.cargo/config.toml b/crates/wasm/.cargo/config.toml similarity index 100% rename from wasm/lib/.cargo/config.toml rename to crates/wasm/.cargo/config.toml diff --git a/wasm/lib/Cargo.toml b/crates/wasm/Cargo.toml similarity index 100% rename from wasm/lib/Cargo.toml rename to crates/wasm/Cargo.toml diff --git a/wasm/lib/Lib/_microdistlib.py b/crates/wasm/Lib/_microdistlib.py similarity index 100% rename from wasm/lib/Lib/_microdistlib.py rename to crates/wasm/Lib/_microdistlib.py diff --git a/wasm/lib/Lib/asyncweb.py b/crates/wasm/Lib/asyncweb.py similarity index 100% rename from wasm/lib/Lib/asyncweb.py rename to crates/wasm/Lib/asyncweb.py diff --git a/wasm/lib/Lib/browser.py b/crates/wasm/Lib/browser.py similarity index 100% rename from wasm/lib/Lib/browser.py rename to crates/wasm/Lib/browser.py diff --git a/wasm/lib/Lib/whlimport.py b/crates/wasm/Lib/whlimport.py similarity index 100% rename from wasm/lib/Lib/whlimport.py rename to crates/wasm/Lib/whlimport.py diff --git a/wasm/lib/README.md b/crates/wasm/README.md similarity index 100% rename from wasm/lib/README.md rename to crates/wasm/README.md diff --git a/wasm/lib/src/browser_module.rs b/crates/wasm/src/browser_module.rs similarity index 100% rename from wasm/lib/src/browser_module.rs rename to crates/wasm/src/browser_module.rs diff --git a/wasm/lib/src/convert.rs b/crates/wasm/src/convert.rs similarity index 100% rename from wasm/lib/src/convert.rs rename to crates/wasm/src/convert.rs diff --git a/wasm/lib/src/js_module.rs b/crates/wasm/src/js_module.rs similarity index 100% rename from wasm/lib/src/js_module.rs rename to crates/wasm/src/js_module.rs diff --git a/wasm/lib/src/lib.rs b/crates/wasm/src/lib.rs similarity index 100% rename from wasm/lib/src/lib.rs rename to crates/wasm/src/lib.rs diff --git a/wasm/lib/src/vm_class.rs b/crates/wasm/src/vm_class.rs similarity index 100% rename from wasm/lib/src/vm_class.rs rename to crates/wasm/src/vm_class.rs diff --git a/wasm/lib/src/wasm_builtins.rs b/crates/wasm/src/wasm_builtins.rs similarity index 100% rename from wasm/lib/src/wasm_builtins.rs rename to crates/wasm/src/wasm_builtins.rs From 8cd32b2769c456a03eaae738feb5d3600d7e8ed1 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:30:31 +0200 Subject: [PATCH 2/4] change path in CI --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6963ee5f7c..fe45a1d71b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -316,7 +316,7 @@ jobs: with: components: clippy - name: run clippy on wasm - run: cargo clippy --manifest-path=wasm/lib/Cargo.toml -- -Dwarnings + run: cargo clippy --manifest-path=crates/wasm/Cargo.toml -- -Dwarnings - uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_VERSION }} From 5fb9514dbd1697d2d6a5c7c1ba86126377fea713 Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:37:53 +0200 Subject: [PATCH 3/4] Change crate dir in webpack --- wasm/demo/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wasm/demo/webpack.config.js b/wasm/demo/webpack.config.js index 75fb6786e6..8700319a5c 100644 --- a/wasm/demo/webpack.config.js +++ b/wasm/demo/webpack.config.js @@ -65,7 +65,7 @@ module.exports = (env = {}) => { if (!env.noWasmPack) { config.plugins.push( new WasmPackPlugin({ - crateDirectory: path.join(__dirname, '../lib'), + crateDirectory: path.join(__dirname, '../../crates/wasm'), }), ); } From 433e55baedb26dc01d72945336d42c0042f7b5da Mon Sep 17 00:00:00 2001 From: ShaharNaveh <50263213+ShaharNaveh@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:50:28 +0200 Subject: [PATCH 4/4] Fix more paths --- wasm/demo/webpack.config.js | 2 +- wasm/notebook/webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wasm/demo/webpack.config.js b/wasm/demo/webpack.config.js index 8700319a5c..6c798d2ca4 100644 --- a/wasm/demo/webpack.config.js +++ b/wasm/demo/webpack.config.js @@ -18,7 +18,7 @@ module.exports = (env = {}) => { alias: { rustpython: path.resolve( __dirname, - env.rustpythonPkg || '../lib/pkg', + env.rustpythonPkg || '../../crates/wasm/pkg', ), }, }, diff --git a/wasm/notebook/webpack.config.js b/wasm/notebook/webpack.config.js index ca19f3384a..a3e3f8ef71 100644 --- a/wasm/notebook/webpack.config.js +++ b/wasm/notebook/webpack.config.js @@ -18,7 +18,7 @@ module.exports = (env = {}) => { alias: { rustpython: path.resolve( __dirname, - env.rustpythonPkg || '../lib/pkg', + env.rustpythonPkg || '../../crates/wasm/pkg', ), }, },