Merge branch 'master' into 0.6.0

# Conflicts: # benchmarks/compiled/app.bc # benchmarks/compiled/app.o # benchmarks/compiled/asmjs/app.asm.js # benchmarks/compiled/wasm/app.js # benchmarks/compiled/wasm/app.wasm # compiled/asm-dom.a # compiled/asm-dom.bc # compiled/asm-dom.o # compiled/asmjs/asm-dom.asm.js # compiled/wasm/asm-dom.js # compiled/wasm/asm-dom.wasm # dist/js/0.asm-dom.js # dist/js/0.asm-dom.js.gz # dist/js/1.asm-dom.js # dist/js/1.asm-dom.js.gz # dist/js/asm-dom.js # src/js/index.js # test/cpp/app.asm.js
mbasso · Apr 15, 2018 · 901e53f · 901e53f
2 parents 5adff36 + 58d43f5
commit 901e53f
Show file tree

Hide file tree

Showing 57 changed files with 635 additions and 701 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,6 +2,4 @@
 **/node_modules/**
 **/src/helpers/**
 **/compiled/**
-**/test/**/*.asm.js
-**/src/js/prefix.js
-**/src/js/postfix.js
+**/test/**/*.asm.js
diff --git a/benchmarks/.eslintignore b/benchmarks/.eslintignore
@@ -1,5 +1,3 @@
 **/dist/**
 **/node_modules/**
-**/compiled/**
-**/src/prefix.js
-**/src/postfix.js
+**/compiled/**
diff --git a/benchmarks/compiled/asmjs/app.asm.js b/benchmarks/compiled/asmjs/app.asm.js
diff --git a/benchmarks/compiled/wasm/app.js b/benchmarks/compiled/wasm/app.js
diff --git a/benchmarks/package.json b/benchmarks/package.json
@@ -6,8 +6,8 @@
     "clean": "rimraf lib dist es .nyc_output compiled",
     "compile": "npm run clean && mkdir -p compiled && npm run compile:cpp && npm run compile:asmjs && npm run compile:wasm",
     "compile:cpp": "emcc -O3 -Wall -Werror --bind ../src/cpp/asm-dom.cpp src/index.cpp -o compiled/app.bc && emcc -O3 -Wall -Werror --bind src/index.cpp -o compiled/app.o",
-    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --js-opts 1 --closure 1 --pre-js src/prefix.js --post-js src/postfix.js -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
-    "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --js-opts 1 --closure 1 --pre-js src/prefix.js --post-js src/postfix.js -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
+    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
+    "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --js-opts 1 --closure 1 -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
     "start": "npm run compile && webpack-dev-server --env.dev",
     "build": "npm run compile && npm run build:webpack",
     "build:webpack": "cross-env BABEL_ENV=commonjs webpack --env.prod src/index.js",

diff --git a/benchmarks/src/index.js b/benchmarks/src/index.js
@@ -21,9 +21,14 @@ const config = {};
 import('../compiled/wasm/app.wasm')
 .then((wasm) => {
   config.wasmBinary = new Uint8Array(wasm);
-  return import('../compiled/wasm/app.js');
+  return new Promise((resolve) => {
+    import('../compiled/wasm/app.js').then(factory => {
+      const asmDom = factory(config);
+      delete asmDom.then;
+      resolve(asmDom);
+    });
+  });
 })
-.then(Module => Module(config))
 .then((app) => {
   const asmdomCpp = app;
   window.asmdomCpp = asmdomCpp;

diff --git a/benchmarks/src/postfix.js b/benchmarks/src/postfix.js
diff --git a/benchmarks/src/prefix.js b/benchmarks/src/prefix.js
diff --git a/benchmarks/webpack.config.js b/benchmarks/webpack.config.js
@@ -37,7 +37,7 @@ module.exports = env => {
       loaders: [{
         test: /\.js$/,
         loaders: ['babel-loader'],
-        exclude: [/node_modules/, /compiled/, /\.asm\.js$/, /prefix\.js$/, /postfix\.js$/],
+        exclude: [/node_modules/, /compiled/, /\.asm\.js$/],
       },
       {
         test: /\.wasm$/,

diff --git a/compiled/asm-dom.a b/compiled/asm-dom.a
diff --git a/compiled/asm-dom.bc b/compiled/asm-dom.bc
diff --git a/compiled/asm-dom.o b/compiled/asm-dom.o
diff --git a/compiled/asmjs/asm-dom.asm.js b/compiled/asmjs/asm-dom.asm.js
diff --git a/compiled/wasm/asm-dom.js b/compiled/wasm/asm-dom.js
diff --git a/compiled/wasm/asm-dom.wasm b/compiled/wasm/asm-dom.wasm
diff --git a/dist/js/0.asm-dom.js b/dist/js/0.asm-dom.js
diff --git a/dist/js/0.asm-dom.js.br b/dist/js/0.asm-dom.js.br
diff --git a/dist/js/0.asm-dom.js.gz b/dist/js/0.asm-dom.js.gz
diff --git a/dist/js/1.asm-dom.js b/dist/js/1.asm-dom.js
diff --git a/dist/js/1.asm-dom.js.br b/dist/js/1.asm-dom.js.br
diff --git a/dist/js/1.asm-dom.js.gz b/dist/js/1.asm-dom.js.gz
diff --git a/dist/js/asm-dom.js b/dist/js/asm-dom.js
diff --git a/docs/cpp.md b/docs/cpp.md
@@ -171,11 +171,11 @@ and compile it using [emscripten (emcc cli)](http://kripken.github.io/emscripten
 
 After the compilation you can import your app:
 
-- if you are using webpack, you can see our [example]((https://github.com/mbasso/asm-dom/tree/master/examples/todomvc%20-%20cpp/src/index.js)). In order to import it as a module we have used 2 extra files with emcc `--pre-js` (`prefix.js`) and `--post-js` (`postfix.js`).
+- if you are using webpack, you can see our [example]((https://github.com/mbasso/asm-dom/tree/master/examples/todomvc%20-%20cpp/src/index.js)).
 
 - If you want to use wasm without webpack, you can see [this](https://gist.github.com/kripken/59c67556dc03bb6d57052fedef1e61ab) gist.
 
-If you are using [babel](https://babeljs.io/), please make sure to ignore the compiled files, the prefix and suffix:
+If you are using [babel](https://babeljs.io/), please make sure to ignore the compiled files:
 
 ```js
 {
@@ -184,9 +184,7 @@ If you are using [babel](https://babeljs.io/), please make sure to ignore the co
   exclude: [
     /node_modules/,
     /compiled/, // folder that contains the compiled code (wasm and asmjs)
-    /\.asm\.js$/, // ignore all .asm.js files
-    /prefix\.js$/, // ignore --pre-js
-    /postfix\.js$/ // ignore --post-js
+    /\.asm\.js$/ // ignore all .asm.js files
   ],
 }
 ```
@@ -277,7 +275,10 @@ VNode* vnode2 = h("div",
     Props {
       {"foo", emscripten::val(7)} // node.foo = 7
     },
-    Children {
+    Callbacks {
+      // function pointer
+      {"ondblclick", onDblClick},
+      // lambda
       {"onclick", [](emscripten::val e) -> bool {
         // do stuff...
         return true;

diff --git a/docs/h.md b/docs/h.md
@@ -53,7 +53,10 @@ VNode* vnode2 = h("div",
     Props {
       {"foo", emscripten::val(7)} // node.foo = 7
     },
-    Children {
+    Callbacks {
+      // function pointer
+      {"ondblclick", onDblClick},
+      // lambda
       {"onclick", [](emscripten::val e) -> bool {
         // do stuff...
         return true;

diff --git a/docs/installation.md b/docs/installation.md
@@ -63,11 +63,11 @@ and compile it using [emscripten (emcc cli)](http://kripken.github.io/emscripten
 
 After the compilation you can import your app:
 
-- if you are using webpack, you can see our [example]((https://github.com/mbasso/asm-dom/tree/master/examples/todomvc%20-%20cpp/src/index.js)). In order to import it as a module we have used 2 extra files with emcc `--pre-js` (`prefix.js`) and `--post-js` (`postfix.js`).
+- if you are using webpack, you can see our [example]((https://github.com/mbasso/asm-dom/tree/master/examples/todomvc%20-%20cpp/src/index.js)).
 
 - If you want to use wasm without webpack, you can see [this](https://gist.github.com/kripken/59c67556dc03bb6d57052fedef1e61ab) gist.
 
-If you are using [babel](https://babeljs.io/), please make sure to ignore the compiled files, the prefix and suffix:
+If you are using [babel](https://babeljs.io/), please make sure to ignore the compiled files:
 
 ```js
 {
@@ -76,9 +76,7 @@ If you are using [babel](https://babeljs.io/), please make sure to ignore the co
   exclude: [
     /node_modules/,
     /compiled/, // folder that contains the compiled code (wasm and asmjs)
-    /\.asm\.js$/, // ignore all .asm.js files
-    /prefix\.js$/, // ignore --pre-js
-    /postfix\.js$/ // ignore --post-js
+    /\.asm\.js$/ // ignore all .asm.js files
   ],
 }
 ```

diff --git a/examples/todomvc - cpp/.eslintignore b/examples/todomvc - cpp/.eslintignore
@@ -1,5 +1,3 @@
 **/dist/**
 **/node_modules/**
-**/compiled/**
-**/src/prefix.js
-**/src/postfix.js
+**/compiled/**
diff --git a/examples/todomvc - cpp/package.json b/examples/todomvc - cpp/package.json
@@ -6,8 +6,8 @@
     "clean": "rimraf lib dist es .nyc_output compiled",
     "compile": "npm run clean && mkdir -p compiled && npm run compile:cpp && npm run compile:asmjs && npm run compile:wasm",
     "compile:cpp": "emcc -O3 -Wall -Werror --bind ../../src/cpp/asm-dom.cpp src/index.cpp -o compiled/app.bc && emcc -O3 -Wall -Werror --bind src/index.cpp -o compiled/app.o",
-    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 --pre-js src/prefix.js --post-js src/postfix.js -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
-    "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 --pre-js src/prefix.js --post-js src/postfix.js -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
+    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
+    "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
     "start": "npm run compile && webpack-dev-server --env.dev",
     "build": "npm run compile && npm run build:webpack",
     "build:webpack": "cross-env BABEL_ENV=commonjs webpack --env.prod src/index.js",

diff --git a/examples/todomvc - cpp/src/index.js b/examples/todomvc - cpp/src/index.js
@@ -5,20 +5,18 @@ import '../../../src/cpp/';
 (() => {
   const config = {};
 
-  new Promise(
-    (resolve) => {
-      if ('WebAssembly' in window) {
-        import('../compiled/wasm/app.wasm')
-                .then((wasm) => {
-                  config.wasmBinary = new Uint8Array(wasm);
-                  return import('../compiled/wasm/app.js');
-                })
-                .then(resolve);
-      } else {
-        import('../compiled/asmjs/app.asm.js').then(resolve);
-      }
-    },
-  )
-    .then(Module => Module(config));
-})();
+  const instantiate = (Module) => {
+    Module(config);
+  };
 
+  if ('WebAssembly' in window) {
+    import('../compiled/wasm/app.wasm')
+            .then((wasm) => {
+              config.wasmBinary = new Uint8Array(wasm);
+              return import('../compiled/wasm/app.js');
+            })
+            .then(instantiate);
+  } else {
+    import('../compiled/asmjs/app.asm.js').then(instantiate);
+  }
+})();
diff --git a/examples/todomvc - cpp/src/postfix.js b/examples/todomvc - cpp/src/postfix.js
diff --git a/examples/todomvc - cpp/src/prefix.js b/examples/todomvc - cpp/src/prefix.js
diff --git a/examples/todomvc - cpp/webpack.config.js b/examples/todomvc - cpp/webpack.config.js
@@ -37,7 +37,7 @@ module.exports = env => {
       loaders: [{
         test: /\.js$/,
         loaders: ['babel-loader'],
-        exclude: [/node_modules/, /compiled/, /\.asm\.js$/, /prefix\.js$/, /postfix\.js$/],
+        exclude: [/node_modules/, /compiled/, /\.asm\.js$/],
       },
       {
         test: /\.wasm$/,

diff --git a/examples/todomvc - cpx/.eslintignore b/examples/todomvc - cpx/.eslintignore
@@ -1,5 +1,3 @@
 **/dist/**
 **/node_modules/**
-**/compiled/**
-**/src/prefix.js
-**/src/postfix.js
+**/compiled/**
diff --git a/examples/todomvc - cpx/package.json b/examples/todomvc - cpx/package.json
@@ -7,8 +7,8 @@
     "compile": "npm run clean && mkdir -p compiled && npm run compile:cpx && npm run compile:cpp && npm run compile:asmjs && npm run compile:wasm",
     "compile:cpx": "mkdir -p temp && gccx src",
     "compile:cpp": "emcc -O3 -Wall -Werror --bind ../../src/cpp/asm-dom.cpp temp/index.cpp -o compiled/app.bc && emcc -O3 -Wall -Werror --bind temp/index.cpp -o compiled/app.o",
-    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 --pre-js src/prefix.js --post-js src/postfix.js -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
-    "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 --pre-js src/prefix.js --post-js src/postfix.js -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
+    "compile:asmjs": "mkdir -p compiled/asmjs && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 compiled/app.bc -o compiled/asmjs/app.asm.js",
+    "compile:wasm": "mkdir -p compiled/wasm && emcc -O3 --bind --memory-init-file 0 --llvm-lto 3 --llvm-opts 3 --js-opts 1 --closure 1 -s MODULARIZE=1 -s ALLOW_MEMORY_GROWTH=1 -s \"EXPORTED_RUNTIME_METHODS=['UTF8ToString']\" -s AGGRESSIVE_VARIABLE_ELIMINATION=1 -s ABORTING_MALLOC=1 -s NO_EXIT_RUNTIME=1 -s NO_FILESYSTEM=1 -s DISABLE_EXCEPTION_CATCHING=2 -s BINARYEN=1 -s \"BINARYEN_TRAP_MODE='allow'\" compiled/app.bc -o compiled/wasm/app.js",
     "start": "npm run compile && webpack-dev-server --env.dev",
     "build": "npm run compile && npm run build:webpack",
     "build:webpack": "cross-env BABEL_ENV=commonjs webpack --env.prod src/index.js",

diff --git a/examples/todomvc - cpx/src/index.js b/examples/todomvc - cpx/src/index.js
@@ -5,20 +5,18 @@ import '../../../src/cpp/';
 (() => {
   const config = {};
 
-  new Promise(
-    (resolve) => {
-      if ('WebAssembly' in window) {
-        import('../compiled/wasm/app.wasm')
-                .then((wasm) => {
-                  config.wasmBinary = new Uint8Array(wasm);
-                  return import('../compiled/wasm/app.js');
-                })
-                .then(resolve);
-      } else {
-        import('../compiled/asmjs/app.asm.js').then(resolve);
-      }
-    },
-  )
-    .then(Module => Module(config));
-})();
+  const instantiate = (Module) => {
+    Module(config);
+  };
 
+  if ('WebAssembly' in window) {
+    import('../compiled/wasm/app.wasm')
+            .then((wasm) => {
+              config.wasmBinary = new Uint8Array(wasm);
+              return import('../compiled/wasm/app.js');
+            })
+            .then(instantiate);
+  } else {
+    import('../compiled/asmjs/app.asm.js').then(instantiate);
+  }
+})();
diff --git a/examples/todomvc - cpx/src/postfix.js b/examples/todomvc - cpx/src/postfix.js
diff --git a/examples/todomvc - cpx/src/prefix.js b/examples/todomvc - cpx/src/prefix.js
diff --git a/examples/todomvc - cpx/src/webpack.config.js b/examples/todomvc - cpx/src/webpack.config.js
@@ -37,7 +37,7 @@ module.exports = env => {
       loaders: [{
         test: /\.js$/,
         loaders: ['babel-loader'],
-        exclude: [/node_modules/, /compiled/, /\.asm\.js$/, /prefix\.js$/, /postfix\.js$/],
+        exclude: [/node_modules/, /compiled/, /\.asm\.js$/],
       },
       {
         test: /\.wasm$/,

diff --git a/examples/todomvc - cpx/webpack.config.js b/examples/todomvc - cpx/webpack.config.js
@@ -37,7 +37,7 @@ module.exports = env => {
       loaders: [{
         test: /\.js$/,
         loaders: ['babel-loader'],
-        exclude: [/node_modules/, /compiled/, /\.asm\.js$/, /prefix\.js$/, /postfix\.js$/],
+        exclude: [/node_modules/, /compiled/, /\.asm\.js$/],
       },
       {
         test: /\.wasm$/,

diff --git a/examples/todomvc - ssr/.eslintignore b/examples/todomvc - ssr/.eslintignore
@@ -1,5 +1,3 @@
 **/dist/**
 **/node_modules/**
-**/compiled/**
-**/src/prefix.js
-**/src/postfix.js
+**/compiled/**