Merge pull request #171 from kwonoj/fix-env

fix(createmoduleloader): apply overridden env

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="2.0.0-beta.4"></a>
+# [2.0.0-beta.4](https://github.com/kwonoj/hunspell-asm/compare/v2.0.0-beta.3...v2.0.0-beta.4) (2019-01-26)
+
+
+### Bug Fixes
+
+* **createmoduleloader:** apply overridden env ([22645b6](https://github.com/kwonoj/hunspell-asm/commit/22645b6))
+
+
+
 <a name="2.0.0-beta.3"></a>
 # [2.0.0-beta.3](https://github.com/kwonoj/hunspell-asm/compare/v2.0.0-beta.2...v2.0.0-beta.3) (2019-01-26)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hunspell-asm",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.4",
   "description": "WebAssembly based Javascript bindings for hunspell spellchecker",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -9,7 +9,7 @@
     "commitizen": {
       "path": "cz-conventional-changelog"
     },
-    "hunspell-version": "dab1b23-190125"
+    "hunspell-version": "19b43c8-190125"
   },
   "lint-staged": {
     "*.ts": [

spec/hunspell-asm/loadModule-spec.ts

@@ -1,4 +1,4 @@
-import { getModuleLoader as getModuleLoaderMock, isNode } from 'emscripten-wasm-loader';
+import { ENVIRONMENT, getModuleLoader as getModuleLoaderMock, isNode } from 'emscripten-wasm-loader';
 import { loadModule } from '../../src/loadModule';
 
 jest.mock('../../src/lib/hunspell.wasm', () => jest.fn(), { virtual: true });
@@ -77,7 +77,7 @@ describe('loadModule', () => {
     });
     await loadModule();
 
-    expect((getModuleLoaderMock as jest.Mock).mock.calls[0][2]).toBeUndefined();
+    expect((getModuleLoaderMock as jest.Mock).mock.calls[0][2]).toEqual({ ENVIRONMENT: ENVIRONMENT.NODE });
   });
 
   it('should override path for wasm binary on browser', async () => {

src/createModuleLoader.ts

@@ -23,14 +23,19 @@ const createModuleLoader = async (
   //tslint:disable-next-line:no-require-imports no-var-requires
   const lookupBinary = locateBinary || ((_filePath: string) => require('./lib/hunspell.wasm'));
 
+  //https://github.com/kwonoj/docker-hunspell-wasm/issues/63
+  //apply overridden environment values to custom patched hunspell preamble.
+  const baseModule = { ENVIRONMENT: env };
+
   //Build module object to construct wasm binary module via emscripten preamble.
   //This allows to override default wasm binary resolution in preamble.
   //By default, hunspell-asm overrides to direct require to binary on *browser* environment to allow bundler like webpack resolves it.
   //On node, it relies on default resolution logic.
   const overriddenModule =
-    isNode() && !locateBinary
-      ? undefined
+    env === ENVIRONMENT.NODE && !locateBinary
+      ? baseModule
       : {
+          ...baseModule,
           locateFile: (filePath: string) => (filePath.endsWith('.wasm') ? lookupBinary(filePath) : filePath)
         };