[test] Update rollup and webpack tests to reflect lack of wasm bundling. NFC (emscripten-core#23931)

sbc100 · web-flow · commit 8d20b32a3aff · 2025-03-19T17:24:46.000-07:00
diff --git a/test/rollup/index.html b/test/rollup/index.html
@@ -1,6 +1,6 @@
 <html>
   <body>
     <hr><div id='output'></div><hr>
-    <script type="module" src="./bundle.mjs"></script>
+    <script type="module" src="./dist/bundle.mjs"></script>
   </body>
 </html>
diff --git a/test/rollup/rollup.config.mjs b/test/rollup/rollup.config.mjs
@@ -1,7 +1,7 @@
 export default {
   input: 'index.mjs',
   output: {
-    file: 'bundle.mjs',
+    file: 'dist/bundle.mjs',
     format: 'es'
   }
 };
diff --git a/test/rollup_node/rollup.config.mjs b/test/rollup_node/rollup.config.mjs
@@ -1,7 +1,7 @@
 export default {
   input: 'index.mjs',
   output: {
-    file: 'bundle.mjs',
+    file: 'dist/bundle.mjs',
     format: 'es'
   }
 };
diff --git a/test/test_browser.py b/test/test_browser.py
@@ -5593,21 +5593,26 @@ def test_webpack(self, es6):
       outfile = 'src/hello.js'
     self.compile_btest('hello_world.c', ['-sEXIT_RUNTIME', '-sMODULARIZE', '-sENVIRONMENT=web,worker', '-o', outfile])
     self.run_process(shared.get_npm_cmd('webpack') + ['--mode=development', '--no-devtool'])
+    # Webpack doesn't bundle the wasm file by default so we need to copy it
+    # TODO(sbc): Look into plugins that do bundling.
     shutil.copy('src/hello.wasm', 'dist/')
     self.run_browser('dist/index.html', '/report_result?exit:0')
 
   @also_with_threads
   def test_vite(self):
     copytree(test_file('vite'), '.')
-    self.compile_btest('hello_world.c', ['-sEXPORT_ES6', '-sEXIT_RUNTIME', '-sMODULARIZE', '-sENVIRONMENT=web,worker', '-o', 'hello.mjs'])
+    self.compile_btest('hello_world.c', ['-sEXIT_RUNTIME', '-sENVIRONMENT=web,worker', '-o', 'hello.mjs'])
     self.run_process(shared.get_npm_cmd('vite') + ['build'])
     self.run_browser('dist/index.html', '/report_result?exit:0')
 
   @also_with_threads
   def test_rollup(self):
     copytree(test_file('rollup'), '.')
-    self.compile_btest('hello_world.c', ['-sEXPORT_ES6', '-sEXIT_RUNTIME', '-sMODULARIZE', '-o', 'hello.mjs'])
+    self.compile_btest('hello_world.c', ['-sEXIT_RUNTIME', '-o', 'hello.mjs'])
     self.run_process(shared.get_npm_cmd('rollup') + ['--config'])
+    # Rollup doesn't bundle the wasm file by default so we need to copy it
+    # TODO(sbc): Look into plugins that do bundling.
+    shutil.copy('hello.wasm', 'dist/')
     self.run_browser('index.html', '/report_result?exit:0')
 
 
diff --git a/test/test_other.py b/test/test_other.py
@@ -15861,7 +15861,10 @@ def test_rollup(self):
     copytree(test_file('rollup_node'), '.')
     self.run_process([EMCC, test_file('hello_world.c'), '-sEXPORT_ES6', '-sEXIT_RUNTIME', '-sENVIRONMENT=node', '-sMODULARIZE', '-o', 'hello.mjs'])
     self.run_process(shared.get_npm_cmd('rollup') + ['--config'])
-    self.assertContained('hello, world!', self.run_js('bundle.mjs'))
+    # Rollup doesn't bundle the wasm file by default so we need to copy it
+    # TODO(sbc): Look into plugins that do bundling.
+    shutil.copy('hello.wasm', 'dist/')
+    self.assertContained('hello, world!', self.run_js('dist/bundle.mjs'))
 
   def test_rlimit(self):
     self.do_other_test('test_rlimit.c', emcc_args=['-O1'])

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`export default {`
`2`	`2`	`input: 'index.mjs',`
`3`	`3`	`output: {`
`4`		`- file: 'bundle.mjs',`
	`4`	`+ file: 'dist/bundle.mjs',`
`5`	`5`	`format: 'es'`
`6`	`6`	`}`
`7`	`7`	`};`