Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ See docs/process.md for more on how version tagging works.

3.1.68 (in development)
-----------------------
- Pthread-based programs no longer generates `.worker.js` file. This file was
made redundant back in 3.1.58 and now is completely removed. (#22598)
- The freetype port was updated from v2.6 to v2.13.3. (#22585)
- The number of arguments passed to Embind function calls is now only verified
with ASSERTIONS enabled. (#22591)
Expand Down
2 changes: 1 addition & 1 deletion test/test_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -3697,7 +3697,7 @@ def test_pthread_create(self, args):
if '-sSINGLE_FILE' in args:
self.assertEqual(len(files), 1, files)
else:
self.assertEqual(len(files), 4, files)
self.assertEqual(len(files), 3, files)

# Test that preallocating worker threads work.
def test_pthread_preallocates_workers(self):
Expand Down
16 changes: 0 additions & 16 deletions test/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,11 +439,6 @@ def test_export_es6(self, args, package_json):
Hello();
''')

if package_json:
# This makes node load all files in the directory as ES6 modules,
# including the worker.js file.
create_file('package.json', '{"type":"module"}')

self.assertContained('hello, world!', self.run_js('runner.mjs'))

def test_emcc_out_file(self):
Expand Down Expand Up @@ -14881,20 +14876,9 @@ def test_embind_no_duplicate_symbols(self):
create_file('b.cpp', '#include <emscripten/bind.h>')
self.run_process([EMXX, '-std=c++23', '-lembind', 'a.cpp', 'b.cpp'])

def test_legacy_pthread_worker_js(self):
self.do_runf('hello_world.c', emcc_args=['-pthread', '-sSTRICT'])
self.assertNotExists('hello_world.worker.js')
self.do_runf('hello_world.c', emcc_args=['-pthread'])
self.assertExists('hello_world.worker.js')
os.mkdir('out')
self.do_runf('hello_world.c', output_basename='out/foo', emcc_args=['-pthread'])
self.assertExists('out/foo.js')
self.assertExists('out/foo.worker.js')

def test_no_pthread(self):
self.do_runf('hello_world.c', emcc_args=['-pthread', '-no-pthread'])
self.assertExists('hello_world.js')
self.assertNotExists('hello_world.worker.js')
self.assertNotContained('Worker', read_file('hello_world.js'))

def test_sysroot_includes_first(self):
Expand Down
9 changes: 0 additions & 9 deletions tools/link.py
Original file line number Diff line number Diff line change
Expand Up @@ -2073,15 +2073,6 @@ def phase_final_emitting(options, state, target, wasm_target):
return

target_dir = os.path.dirname(os.path.abspath(target))
if settings.PTHREADS and not settings.STRICT and not settings.SINGLE_FILE:
worker_file = shared.replace_suffix(target, get_worker_js_suffix())
write_file(worker_file, '''\
// This file is no longer used by emscripten and has been created as a placeholder
// to allow build systems to transition away from depending on it.
//
// Future versions of emscripten will likely stop generating this file at all.
throw new Error('Dummy worker.js file should never be used');
''')

# Deploy the Wasm Worker bootstrap file as an output file (*.ww.js)
if settings.WASM_WORKERS == 1:
Expand Down
Loading