rollup integration test working

Author: Birch-san

box2d-wasm/build_all.sh

@@ -30,29 +30,26 @@ set -x
 
 popd
 
-FLAVOUR_NAMES=(vanilla SIMD)
-FLAVOUR_DIRNAMES=(standard simd)
-SIMD_ENABLED=('' 1)
+FLAVOURS=(standard simd)
 
 for i in {0..1}
 do
-  FLAVOUR_NAME="${FLAVOUR_NAMES["$i"]}"
-  FLAVOUR_DIRNAME="${FLAVOUR_DIRNAMES["$i"]}"
+  FLAVOUR="${FLAVOURS["$i"]}"
 
   # use JUST_SIMD=1 to save time when prototyping
-  if [[ "$JUST_SIMD" = "1" && "$FLAVOUR_NAME" != "simd" ]]; then
-    >&2 echo -e "\nSkipping '$FLAVOUR_NAME' flavour build because JUST_SIMD is set."
+  if [[ "$JUST_SIMD" = "1" && "$FLAVOUR" != "simd" ]]; then
+    >&2 echo -e "\nSkipping '$FLAVOUR' flavour build because JUST_SIMD is set."
     continue
   fi
 
 
-  FLAVOUR_DIR="build/flavour/$FLAVOUR_DIRNAME"
-  >&2 echo -e "\nMaking '$FLAVOUR_NAME' flavour in ./$FLAVOUR_DIR directory"
+  FLAVOUR_DIR="build/flavour/$FLAVOUR"
+  >&2 echo -e "\nMaking '$FLAVOUR' flavour in ./$FLAVOUR_DIR directory"
   mkdir -p "$FLAVOUR_DIR"
   pushd "$FLAVOUR_DIR"
 
   set -x
-  SIMD_ENABLED="$SIMD_ENABLED" "$DIR/build_makefile.sh"
+  FLAVOUR="$FLAVOUR" "$DIR/build_makefile.sh"
   { set +x; } 2>&-
 
   >&2 echo -e '\nCompiling C++ to LLVM IR (creates ./build/bin/libbox2d.a archive)'
@@ -63,10 +60,10 @@ do
 
   # generate Box2D_*.{wasm,js} from glue code + libbox2d.a
   set -x
-  SIMD_ENABLED="$SIMD_ENABLED" "$DIR/build_wasm.sh"
+  FLAVOUR="$FLAVOUR" "$DIR/build_wasm.sh"
   { set +x; } 2>&-
 
-  >&2 echo -e "Completed '$FLAVOUR_NAME' flavour"
+  >&2 echo -e "Completed '$FLAVOUR' flavour"
 
   popd
 done    

box2d-wasm/build_makefile.sh

@@ -6,8 +6,23 @@ Red='\033[0;31m'
 Purple='\033[0;35m'
 NC='\033[0m' # No Color
 
-if ! [[ "$(dirname "$PWD")" -ef "$DIR/build/flavour" ]]; then
-  >&2 echo -e "${Red}This script is meant to be run from <repository_root>/box2d-wasm/build/flavour/\$FLAVOUR_DIRNAME${NC}"
+CMAKE_CXX_FLAGS=()
+case "$FLAVOUR" in
+  standard)
+    ;;
+  simd)
+    CMAKE_CXX_FLAGS=(${CMAKE_CXX_FLAGS[@]} -msimd128)
+    ;;
+  *)
+    >&2 echo -e "${Red}FLAVOUR not set.${NC}"
+    >&2 echo -e "Please set FLAVOUR to 'standard' or 'simd'. For example, with:"
+    >&2 echo -e "${Purple}export FLAVOUR='simd'${NC}"
+    exit 1
+    ;;
+esac
+
+if ! [[ "$PWD" -ef "$DIR/build/flavour/$FLAVOUR" ]]; then
+  >&2 echo -e "${Red}This script is meant to be run from <repository_root>/box2d-wasm/build/flavour/$FLAVOUR${NC}"
   exit 1
 fi
 
@@ -25,10 +40,5 @@ case "$TARGET_TYPE" in
 esac
 >&2 echo -e "TARGET_TYPE is $TARGET_TYPE"
 
-CMAKE_CXX_FLAGS=()
-if [[ "$SIMD_ENABLED" = "1" ]]; then
-  CMAKE_CXX_FLAGS=(${CMAKE_CXX_FLAGS[@]} -msimd128)
-fi
-
 set -x
 emcmake cmake -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS[@]}" "$DIR/../box2d" -DBOX2D_BUILD_UNIT_TESTS=OFF -DBOX2D_BUILD_DOCS=OFF -DBOX2D_BUILD_TESTBED=OFF

box2d-wasm/build_wasm.sh

@@ -8,8 +8,25 @@ Blue='\033[0;34m'
 Purple='\033[0;35m'
 NC='\033[0m' # No Color
 
-if ! [[ "$(dirname "$PWD")" -ef "$DIR/build/flavour" ]]; then
-  >&2 echo -e "${Red}This script is meant to be run from <repository_root>/box2d-wasm/build/flavour/\$FLAVOUR_DIRNAME${NC}"
+BASENAME=Box2D
+FLAVOUR_EMCC_OPTS=()
+case "$FLAVOUR" in
+  standard)
+    ;;
+  simd)
+    BASENAME="$BASENAME.simd"
+    FLAVOUR_EMCC_OPTS=(${FLAVOUR_EMCC_OPTS[@]} -msimd128)
+    ;;
+  *)
+    >&2 echo -e "${Red}FLAVOUR not set.${NC}"
+    >&2 echo -e "Please set FLAVOUR to 'standard' or 'simd'. For example, with:"
+    >&2 echo -e "${Purple}export FLAVOUR='simd'${NC}"
+    exit 1
+    ;;
+esac
+
+if ! [[ "$PWD" -ef "$DIR/build/flavour/$FLAVOUR" ]]; then
+  >&2 echo -e "${Red}This script is meant to be run from <repository_root>/box2d-wasm/build/flavour/$FLAVOUR${NC}"
   exit 1
 fi
 
@@ -24,10 +41,8 @@ EMCC_OPTS=(
   -s SUPPORT_LONGJMP=0
   -s EXPORTED_FUNCTIONS=_malloc,_free
   -s ALLOW_MEMORY_GROWTH=1
+  ${FLAVOUR_EMCC_OPTS[@]}
   )
-if [[ "$SIMD_ENABLED" = "1" ]]; then
-  EMCC_OPTS=(${EMCC_OPTS[@]} -msimd128)
-fi
 DEBUG_OPTS=(
   -g3
   -gsource-map
@@ -73,7 +88,6 @@ case "$TARGET_TYPE" in
 esac
 >&2 echo -e "TARGET_TYPE is $TARGET_TYPE"
 
-BASENAME='Box2D'
 BARE_WASM="$BASENAME.bare.wasm"
 
 >&2 echo -e "${Blue}Building bare WASM${NC}"

box2d-wasm/entry/es/entry.js

@@ -1,11 +1,12 @@
 import { simd } from 'wasm-feature-detect'
 
-export default (async () => {
+export default async (...args) => {
   const hasSIMD = await simd();
-  const module = await (
+  const Box2DModule = await (
     hasSIMD
       ? import('../../build/flavour/simd/es/Box2D.simd.js')
       : import('../../build/flavour/standard/es/Box2D.js')
   );
-  return module;
-})();
+  const { 'default': Box2DFactory } = Box2DModule;
+  return await Box2DFactory(...args);
+};

integration-test/public/index.html

@@ -10,7 +10,7 @@
 	<link rel='stylesheet' href='global.css'>
 	<link rel='stylesheet' href='build/bundle.css'>
 
-  <script defer src='build/bundle.js'></script>
+  <script defer src='build/main.js' type='module'></script>
 </head>
 
 <body>

integration-test/rollup.config.js

@@ -14,10 +14,11 @@ export default {
 	input: 'src/main.ts',
 	output: {
 		sourcemap: true,
-		format: 'iife',
+		format: 'esm',
 		name: 'app',
-		file: 'public/build/bundle.js'
+		dir: 'public/build'
 	},
+  // inlineDynamicImports: true,
 	plugins: [
 		svelte({
 			// enable run-time checks when not in production
@@ -48,7 +49,11 @@ export default {
 		// In dev mode, call `npm run start` once
 		// the bundle has been generated
 		!production && serve({
-      contentBase: ['public', 'node_modules/box2d-wasm/build/es'],
+      contentBase: [
+        'public',
+        'node_modules/box2d-wasm/build/flavour/standard/es',
+        'node_modules/box2d-wasm/build/flavour/simd/es'
+      ],
       port: 4000
     }),