fix global runtime namespace

toyobayashi · Feb 9, 2022 · fb1fc7e · fb1fc7e
1 parent a9442cc
commit fb1fc7e
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.10.1",
+  "version": "0.10.2",
   "scripts": {
     "fetch": "node ./script/install",
     "build": "cd ./packages/runtime&&npm run build&&cd ../emnapi&&npm run build",

diff --git a/packages/emnapi/README.md b/packages/emnapi/README.md
@@ -261,7 +261,7 @@ Most APIs are implemented in JavaScript and they are depend on runtime code ship
     <script src="node_modules/@tybys/emnapi-runtime/dist/emnapi.min.js"></script>
     <script>
       var Module = { /* ... */ };
-      Module.emnapiRuntime = emnapi;
+      Module.emnapiRuntime = window.__emnapi_runtime__;
     </script>
     <script src="your-wasm-glue.js"></script>
     ```

diff --git a/packages/emnapi/README_CN.md b/packages/emnapi/README_CN.md
@@ -257,7 +257,7 @@ cmake --build build
     <script src="node_modules/@tybys/emnapi-runtime/dist/emnapi.min.js"></script>
     <script>
       var Module = { /* ... */ };
-      Module.emnapiRuntime = emnapi;
+      Module.emnapiRuntime = window.__emnapi_runtime__;
     </script>
     <script src="your-wasm-glue.js"></script>
     ```

diff --git a/packages/emnapi/package.json b/packages/emnapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tybys/emnapi",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "devDependencies": {},

diff --git a/packages/emnapi/script/build.js b/packages/emnapi/script/build.js
@@ -52,7 +52,7 @@ async function build () {
             }
     
             return g;
-          })().emnapi;
+          })().__emnapi_runtime__;
         }
         if (!emnapi) {
           var err = new Error('Emnapi runtime is not detected. Check if the runtime code is imported or consider using builtin runtime js library.');

diff --git a/packages/runtime/README.md b/packages/runtime/README.md
@@ -0,0 +1 @@
+See [/~https://github.com/toyobayashi/emnapi](/~https://github.com/toyobayashi/emnapi)
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tybys/emnapi-runtime",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "emnapi runtime",
   "main": "index.js",
   "module": "./lib/index.js",

diff --git a/packages/runtime/script/build.js b/packages/runtime/script/build.js
@@ -25,7 +25,7 @@ function build () {
 
   const runtimeDts = extractorConfig.publicTrimmedFilePath
 
-  fs.appendFileSync(runtimeDts, '\nexport as namespace emnapi;\n', 'utf8')
+  fs.appendFileSync(runtimeDts, '\nexport as namespace __emnapi_runtime__;\n', 'utf8')
 
   /**
    * @param {boolean=} minify
@@ -68,7 +68,7 @@ function build () {
       output: {
         file: path.join(path.dirname(runtimeOut), 'emnapi.js'),
         format: 'umd',
-        name: 'emnapi',
+        name: '__emnapi_runtime__',
         exports: 'named'
       }
     },
@@ -77,7 +77,7 @@ function build () {
       output: {
         file: path.join(path.dirname(runtimeOut), 'emnapi.min.js'),
         format: 'umd',
-        name: 'emnapi',
+        name: '__emnapi_runtime__',
         exports: 'named'
       }
     }

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tybys/emnapi-test",
   "private": true,
-  "version": "0.10.1",
+  "version": "0.0.0",
   "description": "emnapi test",
   "main": "index.js",
   "devDependencies": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		See [/~https://github.com/toyobayashi/emnapi](/~https://github.com/toyobayashi/emnapi)