Making all modes of importing all work the same

Importing with ES5 or ES6, with default import or `* as`, now all do the
same thing. Thanks to @longnguyen2004 for pushing this in the right
direction.

Should fix #66.

Author: Yahweasel

Makefile

@@ -895,13 +895,16 @@ dist/libav-$(LIBAVJS_VERSION)-%.dbg.thr.mjs: build/ffmpeg-$(FFMPEG_VERSION)/buil
 	rmdir $(@).d
 
 
-build/libav-$(LIBAVJS_VERSION).js: libav.in.js post.in.js funcs.json tools/apply-funcs.js
+build/libav-$(LIBAVJS_VERSION).js: libav.in.js libav.types.in.d.ts post.in.js funcs.json tools/apply-funcs.js
 	mkdir -p build dist
 	./tools/apply-funcs.js $(LIBAVJS_VERSION)
 
-build/libav.types.d.ts build/libav-$(LIBAVJS_VERSION).mjs build/exports.json build/post.js: build/libav-$(LIBAVJS_VERSION).js
+build/libav.types.d.ts build/libav-$(LIBAVJS_VERSION).in.mjs build/exports.json build/post.js: build/libav-$(LIBAVJS_VERSION).js
 	touch $@
 
+build/libav-$(LIBAVJS_VERSION).mjs: build/libav-$(LIBAVJS_VERSION).in.mjs
+	./tools/mk-es6.js ../build/libav-$(LIBAVJS_VERSION).js $< > $@
+
 node_modules/.bin/terser:
 	npm install
 

Makefile.m4

@@ -155,13 +155,16 @@ buildrule(thr, [[[]]], thr, [[[$(ES6FLAGS) $(THRFLAGS) -sPTHREAD_POOL_SIZE=navig
 buildrule(thr, dbg., thr, [[[-gsource-map $(THRFLAGS) -sPTHREAD_POOL_SIZE=navigator.hardwareConcurrency]]], js)
 buildrule(thr, dbg., thr, [[[-gsource-map $(ES6FLAGS) $(THRFLAGS) -sPTHREAD_POOL_SIZE=navigator.hardwareConcurrency]]], mjs)
 
-build/libav-$(LIBAVJS_VERSION).js: libav.in.js post.in.js funcs.json tools/apply-funcs.js
+build/libav-$(LIBAVJS_VERSION).js: libav.in.js libav.types.in.d.ts post.in.js funcs.json tools/apply-funcs.js
 	mkdir -p build dist
 	./tools/apply-funcs.js $(LIBAVJS_VERSION)
 
-build/libav.types.d.ts build/libav-$(LIBAVJS_VERSION).mjs build/exports.json build/post.js: build/libav-$(LIBAVJS_VERSION).js
+build/libav.types.d.ts build/libav-$(LIBAVJS_VERSION).in.mjs build/exports.json build/post.js: build/libav-$(LIBAVJS_VERSION).js
 	touch $@
 
+build/libav-$(LIBAVJS_VERSION).mjs: build/libav-$(LIBAVJS_VERSION).in.mjs
+	./tools/mk-es6.js ../build/libav-$(LIBAVJS_VERSION).js $< > $@
+
 node_modules/.bin/terser:
 	npm install
 

libav.in.js

@@ -13,7 +13,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-@E6 let LibAV;
+@E6 const libav = {};
 
 (function() {
     function isWebAssemblySupported(module) {
@@ -38,13 +38,13 @@
         return false;
     }
 
-    var libav;
+@E5 var libav;
     var nodejs = (typeof process !== "undefined");
 
-    // Make sure LibAV is defined for later loading
-    if (typeof LibAV === "undefined")
-        LibAV = {};
-    libav = LibAV;
+@E5 // Make sure LibAV is defined for later loading
+@E5 if (typeof LibAV === "undefined")
+@E5     LibAV = {};
+@E5 libav = LibAV;
 
     if (!libav.base) {
 @E6     libav.base = import.meta.url;
@@ -577,10 +577,11 @@
         });
     }
 
-@E5 if (nodejs) {
-@E5     libav.default = libav;
+@E5 if (nodejs)
 @E5     module.exports = libav;
-@E5 }
 })();
 
-@E6 export default LibAV;
+@E6 export const {
+@E6 @EXPORTS
+@E6 } = libav;
+@E6 export default libav;