Fix esm

qiuxiang · Jul 12, 2022 · e40d808 · e40d808
1 parent a05fb2e
commit e40d808
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,15 +31,11 @@ set(source_files
   ${PROJECT_SOURCE_DIR}/src/tempo.cc
   ${PROJECT_SOURCE_DIR}/src/pitch.cc)
 
-add_definitions(-DHAVE_CONFIG_H)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
-  -s MODULARIZE=1 \
-  -s EXPORT_ES6=1 \
-  -s SINGLE_FILE=1 \
-  -s EXPORT_NAME=aubio \
-  -Oz --closure 1 --bind")
-
 include_directories(src)
 include_directories(aubio/src)
+add_definitions(-DHAVE_CONFIG_H)
 
-add_executable(aubio ${source_files})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -sMODULARIZE=1 -sEXPORT_NAME=aubio -Oz --bind")
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/build)
+add_subdirectory(cmake/aubio)
+add_subdirectory(cmake/aubio.esm)
diff --git a/cmake/aubio.esm/CMakeLists.txt b/cmake/aubio.esm/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -sEXPORT_ES6=1")
+add_executable(aubio.esm ${source_files})
diff --git a/cmake/aubio/CMakeLists.txt b/cmake/aubio/CMakeLists.txt
@@ -0,0 +1 @@
+add_executable(aubio ${source_files})
diff --git a/examples/pitch.html b/examples/pitch.html
@@ -39,8 +39,8 @@
       crossorigin="anonymous"
       controls
     ></audio>
-    <script src="../build/aubio.js"></script>
-    <script>
+    <script type="module">
+      import aubio from "../build/aubio.esm.js";
       let audioSource, audioContext, scriptProcessor;
       let count = 0;
       const audio = document.querySelector("audio");

diff --git a/package.json b/package.json
@@ -5,7 +5,10 @@
   "types": "index.d.ts",
   "files": [
     "index.d.ts",
-    "build/aubio.js"
+    "build/aubio.js",
+    "build/aubio.wasm",
+    "build/aubio.esm.js",
+    "build/aubio.esm.wasm"
   ],
   "scripts": {
     "build": "export EM_NODE_JS=node && emcmake cmake -Bbuild -H. && make -Cbuild -j",

diff --git a/spec/aubio.spec.mjs b/spec/aubio.spec.mjs
@@ -24,7 +24,7 @@ it("pitch detection", async () => {
 it("tempo detection", async () => {
   const { Tempo } = await aubio();
   const [sampleRate, data] = await getAudioData(
-    "https://file-examples-com.github.io/uploads/2017/11/file_example_WAV_1MG.wav"
+    "https://file-examples.com/storage/fe64bbb60e62cc956a036bf/2017/11/file_example_WAV_1MG.wav"
   );
   const bufferSize = 1024;
   const tempo = new Tempo(bufferSize, bufferSize / 8, sampleRate);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -sEXPORT_ES6=1")
		add_executable(aubio.esm ${source_files})