Skip to content

[js/web] use the recommended workaround for Vite #23531

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
fs-eire merged 2 commits into from
Jan 30, 2025
Merged

[js/web] use the recommended workaround for Vite #23531

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
80f096d
[js/web] use the recommended workaround for Vite
fs-eire Jan 29, 2025
41a4961
Revert "[js/web] allow import .mjs/.wasm file (#23487)"
fs-eire Jan 29, 2025
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
6 changes: 0 additions & 6 deletions js/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,16 @@
"require": "./dist/ort.min.js",
"types": "./types.d.ts"
},
"./.mjs": "./dist/ort-wasm-simd-threaded.jsep.mjs",
"./.wasm": "./dist/ort-wasm-simd-threaded.jsep.wasm",
"./all": {
"import": "./dist/ort.all.bundle.min.mjs",
"require": "./dist/ort.all.min.js",
"types": "./types.d.ts"
},
"./all/.mjs": "./dist/ort-wasm-simd-threaded.jsep.mjs",
"./all/.wasm": "./dist/ort-wasm-simd-threaded.jsep.wasm",
"./wasm": {
"import": "./dist/ort.wasm.bundle.min.mjs",
"require": "./dist/ort.wasm.min.js",
"types": "./types.d.ts"
},
"./wasm/.mjs": "./dist/ort-wasm-simd-threaded.mjs",
"./wasm/.wasm": "./dist/ort-wasm-simd-threaded.wasm",
"./webgl": {
"import": "./dist/ort.webgl.min.mjs",
"require": "./dist/ort.webgl.min.js",
Expand Down
9 changes: 0 additions & 9 deletions js/web/test/e2e/exports/testcases/vite-default/src/components/onnx-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import * as ort from 'onnxruntime-web';

// The following line uses Vite's "Explicit URL Imports" feature to load the wasm file as an asset.
//
// see https://vite.dev/guide/assets.html#explicit-url-imports
//
import wasmFileUrl from 'onnxruntime-web/.wasm?url';

// wasmFileUrl is the URL of the wasm file. Vite will make sure it's available in both development and production.
ort.env.wasm.wasmPaths = { wasm: wasmFileUrl };

// Model data for "test_abs/model.onnx"
const testModelData =
'CAcSDGJhY2tlbmQtdGVzdDpJCgsKAXgSAXkiA0FicxIIdGVzdF9hYnNaFwoBeBISChAIARIMCgIIAwoCCAQKAggFYhcKAXkSEgoQCAESDAoCCAMKAggECgIIBUIECgAQDQ==';
Expand Down
6 changes: 6 additions & 0 deletions js/web/test/e2e/exports/testcases/vite-default/vite.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@ import vue from '@vitejs/plugin-vue';

// https://vite.dev/config/
export default defineConfig({
// This is a known issue when using WebAssembly with Vite 5.x
// Need to specify `optimizeDeps.exclude` to NPM packages that uses WebAssembly
// See: https://github.com/vitejs/vite/issues/8427
optimizeDeps: {
exclude: ['onnxruntime-web'],
},
plugins: [vue()],
});
Loading