Switching Vireo to Wasm from asm.js

.appveyor.yml

@@ -17,9 +17,9 @@ install:
   - pip install tox
   - ps: Start-Process npm "run httpbin" -PassThru
   - git clone https://github.com/juj/emsdk.git
-  - cd emsdk && git checkout 2da530aa5e6d6bcaf994ed1b2613a98872a428c8 && cd ..
-  - ps: emsdk\emsdk install sdk-1.37.36-64bit
-  - ps: emsdk\emsdk activate sdk-1.37.36-64bit
+  - cd emsdk && git checkout 0d8576c0e8f5ee09a36120b9d44184b5da2f2e7a && cd ..
+  - ps: emsdk\emsdk install sdk-1.38.12-64bit
+  - ps: emsdk\emsdk activate sdk-1.38.12-64bit
 platform:
   - Win32
 configuration:
@@ -32,15 +32,14 @@ before_build:
 build:
   project: Vireo_VS/VireoCommandLine.sln
 after_build:
-  - cmd /c make-it\appveyor-support\setup-env-and-make-vjs.bat
+  - make vjs
   - ps: $env:package_version = (Get-Content -Raw -Path package.json | ConvertFrom-Json).version
   - ps: nuget pack VireoSDK.nuspec -properties version="$env:package_version"
 test_script:
   - make testjs
   - make testnative
   - make testhttpbin
-  - npm run test -- --browsers FirefoxHeadless
-  - npm run test -- --browsers IE --skip-tags FailsIE
+  - npm run test-min -- --browsers FirefoxHeadless
 
 # Using the same naming convention as rust https://forge.rust-lang.org/platform-support.html
 after_test:

.eslintrc.js

@@ -7,6 +7,9 @@ module.exports = {
         'jasmine': true,
         'es6': true
     },
+    'parserOptions': {
+        'ecmaVersion': 2017
+    },
     'rules': {
         'no-console': 'off',
 

.npmignore

@@ -5,9 +5,13 @@
 # npm will force include README*, LICENSE*, and package.json files
 # so do not visit subdirectories using **/* patterns or extra files will be included
 # can test output by running npm pack
-!/dist/asmjs-unknown-emscripten/release/*.*
-!/dist/asmjs-unknown-emscripten/debug/*.*
-!/dist/asmjs-unknown-emscripten/profile/*.*
-!/source/core/vireo.loader.js
-!/source/core/module_*.js
-!/source/io/module_*.js
+!/dist/wasm32-unknown-emscripten/release/*.*
+!/dist/wasm32-unknown-emscripten/debug/*.*
+!/dist/wasm32-unknown-emscripten/profile/*.*
+
+!/source/core/*.js
+/source/core/library_*.js
+/source/core/vireo.wrapper.js
+
+!/source/io/*.js
+/source/io/library_*.js

.travis.yml

@@ -34,9 +34,9 @@ install:
 - (cd emsdk-tools && ar xv libstdc++6_5.1.0-0ubuntu11~10.04.2_amd64.deb)
 - tar -xzf emsdk-tools/data.tar.gz -C emsdk-tools
 - git clone https://github.com/juj/emsdk.git
-- (cd emsdk && git checkout 2da530aa5e6d6bcaf994ed1b2613a98872a428c8)
-- emsdk/emsdk install sdk-1.37.36-64bit > emsdk-tools/emsdk_install_log.txt
-- emsdk/emsdk activate sdk-1.37.36-64bit
+- (cd emsdk && git checkout 0d8576c0e8f5ee09a36120b9d44184b5da2f2e7a)
+- emsdk/emsdk install sdk-1.38.12-64bit > emsdk-tools/emsdk_install_log.txt
+- emsdk/emsdk activate sdk-1.38.12-64bit
 - cat ~/.emscripten
 - (source make-it/travis-support/setup-env.sh && emcc -v)
 before_script:
@@ -49,12 +49,14 @@ before_script:
 - (source make-it/travis-support/setup-env.sh && make vjs)
 - (source make-it/travis-support/setup-env.sh && make vjs BUILD=debug)
 - (source make-it/travis-support/setup-env.sh && make vjs BUILD=profile)
+- (source make-it/travis-support/setup-env.sh && make vjs BUILD=release TARGET=asmjs-unknown-emscripten)
 - tar -tf $(npm pack)
 script:
 - make testjs
 - make testnative
 - make testhttpbin
-- npm run test
+- npm run test-min
+- npm run test-asmjs
 after_failure:
 - cat emsdk-tools/emsdk_install_log.txt
 before_deploy:

README.md

@@ -71,8 +71,8 @@ The emsdk toolchain is used to cross-compile Vireo to Vireo.js to run in Node.js
 4. From either the extracted folder or the cloned emsdk repository run the following commands:
 
    ```console
-   emsdk install sdk-1.37.36-64bit
-   emsdk activate sdk-1.37.36-64bit
+   emsdk install sdk-1.38.12-64bit
+   emsdk activate sdk-1.38.12-64bit
    emcc -v # should say emcc version 1.37.36
    ```
 
@@ -108,7 +108,7 @@ To create a profile build of vireo.js:
 make js BUILD=profile
 ```
 
-Notice that vireo.js is created in the `dist` folder based on the `BUILD` type. For example, a default vireo.js build equivalent to `BUILD=release` will be located at: `dist/asmjs-unknown-emscripten/release/vireo.js`
+Notice that vireo.js is created in the `dist` folder based on the `BUILD` type. For example, a default vireo.js build equivalent to `BUILD=release` will be located at: `dist/wasm32-unknown-emscripten/release/vireo.js`
 
 ## Vireo Windows Native target
 

karma.asmjs.conf.js

@@ -0,0 +1,21 @@
+// Karma configuration
+
+(function () {
+    'use strict';
+
+    module.exports = function (config) {
+        var getSharedConfig = require('./karma.shared.js');
+        var sharedConfig = getSharedConfig(config);
+
+        sharedConfig.files = [
+            ...sharedConfig.filesPolyfills,
+            ...sharedConfig.filesInfrastructure,
+            'dist/asmjs-unknown-emscripten/release/vireo.min.js',
+            ...sharedConfig.filesSource,
+            ...sharedConfig.filesFixtures,
+            ...sharedConfig.filesSpecs
+        ];
+
+        config.set(sharedConfig);
+    };
+}());

karma.conf.js

@@ -4,29 +4,21 @@
     'use strict';
 
     module.exports = function (config) {
-        var sharedConfig = require('./karma.shared.js');
+        var getSharedConfig = require('./karma.shared.js');
+        var sharedConfig = getSharedConfig(config);
 
-        sharedConfig.files = sharedConfig.files.concat([
-            // test assets
-            'test-it/karma/utilities/ExtendJasmineTimeout.js',
-
-            // test specs
-            'test-it/karma/helloworld/*.Test.js',
-            'test-it/karma/publicapi/*.Test.js',
-            'test-it/karma/vtrsuite/*.Test.js',
-            'test-it/karma/http/*.Test.js',
-            'test-it/karma/javascriptinvoke/*.Test.js',
-            'test-it/karma/propertynode/*.Test.js',
-            'test-it/karma/events/*.Test.js',
-            'test-it/karma/static/*.Test.js'
-        ]);
-
-        // level of logging
-        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-        sharedConfig.logLevel = config.LOG_INFO;
-
-        // Timeout for jasmine set to 50000 in ExtendJasmineTimeout.js so warn if test time getting close
-        sharedConfig.reportSlowerThan = 40000;
+        sharedConfig.files = [
+            ...sharedConfig.filesPolyfills,
+            ...sharedConfig.filesInfrastructure,
+            'dist/wasm32-unknown-emscripten/release/vireo.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/release/vireo.core.wasm',
+                included: false
+            },
+            ...sharedConfig.filesSource,
+            ...sharedConfig.filesFixtures,
+            ...sharedConfig.filesSpecs
+        ];
 
         config.set(sharedConfig);
     };

karma.coverage.conf.js

@@ -1,37 +1,35 @@
 // Karma configuration
+
 (function () {
     'use strict';
 
     module.exports = function (config) {
-        var sharedConfig = require('./karma.shared.js');
-
-        sharedConfig.files = sharedConfig.files.concat([
-            // test assets
-            'test-it/karma/utilities/ExtendJasmineTimeout.js',
-
-            // test specs
-            'test-it/karma/helloworld/*.Test.js',
-            'test-it/karma/publicapi/*.Test.js',
-            'test-it/karma/vtrsuite/*.Test.js',
-            'test-it/karma/http/*.Test.js',
-            'test-it/karma/javascriptinvoke/*.Test.js'
-        ]);
-
-        // level of logging
-        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-        sharedConfig.logLevel = config.LOG_INFO;
+        var getSharedConfig = require('./karma.shared.js');
+        var sharedConfig = getSharedConfig(config);
+
+        sharedConfig.files = [
+            ...sharedConfig.filesPolyfills,
+            ...sharedConfig.filesInfrastructure,
+            'dist/wasm32-unknown-emscripten/release/vireo.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/release/vireo.core.wasm',
+                included: false
+            },
+            ...sharedConfig.filesSource,
+            ...sharedConfig.filesFixtures,
+            ...sharedConfig.filesSpecs
+        ];
 
         sharedConfig.browsers = [
-            'Firefox'
+            'FirefoxHeadless'
         ];
 
         sharedConfig.reporters = [
             'dots',
             'coverage'
         ];
 
-        sharedConfig.preprocessors['source/core/*.js'] = ['coverage'];
-        sharedConfig.preprocessors['source/io/*.js'] = ['coverage'];
+        sharedConfig.preprocessors['dist/wasm32-unknown-emscripten/release/vireo.js'] = ['coverage'];
 
         sharedConfig.coverageReporter = {
             dir: 'coverage',

karma.debug.conf.js

@@ -0,0 +1,25 @@
+// Karma configuration
+
+(function () {
+    'use strict';
+
+    module.exports = function (config) {
+        var getSharedConfig = require('./karma.shared.js');
+        var sharedConfig = getSharedConfig(config);
+
+        sharedConfig.files = [
+            ...sharedConfig.filesPolyfills,
+            ...sharedConfig.filesInfrastructure,
+            'dist/wasm32-unknown-emscripten/debug/vireo.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/debug/vireo.core.wasm',
+                included: false
+            },
+            ...sharedConfig.filesSource,
+            ...sharedConfig.filesFixtures,
+            ...sharedConfig.filesSpecs
+        ];
+
+        config.set(sharedConfig);
+    };
+}());

karma.min.conf.js

@@ -0,0 +1,25 @@
+// Karma configuration
+
+(function () {
+    'use strict';
+
+    module.exports = function (config) {
+        var getSharedConfig = require('./karma.shared.js');
+        var sharedConfig = getSharedConfig(config);
+
+        sharedConfig.files = [
+            ...sharedConfig.filesPolyfills,
+            ...sharedConfig.filesInfrastructure,
+            'dist/wasm32-unknown-emscripten/release/vireo.min.js',
+            {
+                pattern: 'dist/wasm32-unknown-emscripten/release/vireo.core.wasm',
+                included: false
+            },
+            ...sharedConfig.filesSource,
+            ...sharedConfig.filesFixtures,
+            ...sharedConfig.filesSpecs
+        ];
+
+        config.set(sharedConfig);
+    };
+}());