fix package install

microsoft · Dec 20, 2024 · e8247d5 · e8247d5
1 parent 75b0412
commit e8247d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/js/web/test/e2e/exports/main.js b/js/web/test/e2e/exports/main.js
@@ -13,14 +13,18 @@ const treeKill = require('tree-kill');
  *
  * @param {string[]} packagesToInstall
  */
-module.exports = async function main(PRESERVE) {
+module.exports = async function main(PRESERVE, PACKAGES_TO_INSTALL) {
   console.log('Running exports tests...');
 
   // testcases/nextjs-default
   {
     const wd = path.join(__dirname, 'testcases/nextjs-default');
     if (!PRESERVE) {
-      await runShellCmd('npm install ../../onnxruntime-common.tgz ../../onnxruntime-web.tgz', { wd });
+      if (PACKAGES_TO_INSTALL.length === 0) {
+        await runShellCmd('npm ci', { wd });
+      } else {
+        await runShellCmd(`npm install ${PACKAGES_TO_INSTALL.map((i) => `"${i}"`).join(' ')}`, { wd });
+      }
     }
 
     const launchBrowserAndRunTests = async (logPrefix, port = 3000) => {

diff --git a/js/web/test/e2e/run.js b/js/web/test/e2e/run.js
@@ -79,10 +79,8 @@ async function main() {
 
   // perform exports testing
   {
-    fs.copySync(PACKAGES_TO_INSTALL[0], path.join(TEST_E2E_RUN_FOLDER, 'exports', 'onnxruntime-common.tgz'));
-    fs.copySync(PACKAGES_TO_INSTALL[1], path.join(TEST_E2E_RUN_FOLDER, 'exports', 'onnxruntime-web.tgz'));
     const testExportsMain = require(path.join(TEST_E2E_RUN_FOLDER, './exports/main'));
-    await testExportsMain(PRESERVE);
+    await testExportsMain(PRESERVE, PACKAGES_TO_INSTALL);
   }
 
   // prepare .wasm files for path override testing