diff --git a/Makefile b/Makefile index 1984a8356..29fd241a5 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,11 @@ build/pyodide.asm.js: \ let clearImmediate = globalThis.clearImmediate;\ let baseName, fpcGOT, dyncallGOT, fpVal, dcVal;\ ' build/pyodide.asm.js + # Remove last 6 lines of pyodide.asm.js, see issue #2282 + # Hopefully we will remove this after emscripten fixes it, upstream issue + # emscripten-core/emscripten#16518 + # Sed nonsense from https://stackoverflow.com/a/13383331 + sed -i -n -e :a -e '1,6!{P;N;D;};N;ba' build/pyodide.asm.js echo "globalThis._createPyodideModule = _createPyodideModule;" >> build/pyodide.asm.js date +"[%F %T] done building pyodide.asm.js." diff --git a/docs/project/changelog.md b/docs/project/changelog.md index 03b7400c8..1acb5b8a0 100644 --- a/docs/project/changelog.md +++ b/docs/project/changelog.md @@ -71,6 +71,9 @@ substitutions: alias for `any`. {pr}`2277` +- {{Fix}} Pyodide now loads correctly even if requirejs is included. + {pr}`2283` + _February 19, 2022_ ## Version 0.19.1