Merge remote-tracking branch 'origin/master' into release

Author: actions-user

Diff for: .github/workflows/publish.yml

@@ -69,15 +69,15 @@ jobs:
         cd lib/loader
         npm publish --tag $CHANNEL --access public
         cd ../..
-    - name: Publish to gpr
-      env:
-        NPM_REGISTRY: "npm.pkg.github.com"
-        NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        npm config set "//${NPM_REGISTRY}/:_authToken=${NPM_AUTH_TOKEN}"
-        sed -i 's/"assemblyscript"/"@assemblyscript\/assemblyscript"/' package.json
-        sed -i 's/"assemblyscript"/"@assemblyscript\/assemblyscript"/' package-lock.json
-        npm publish --registry=https://${NPM_REGISTRY}
-        cd lib/loader
-        npm publish --registry=https://${NPM_REGISTRY}
-        cd ../..
+    # - name: Publish to gpr
+    #   env:
+    #     NPM_REGISTRY: "npm.pkg.github.com"
+    #     NPM_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #   run: |
+    #     npm config set "//${NPM_REGISTRY}/:_authToken=${NPM_AUTH_TOKEN}"
+    #     sed -i 's/"assemblyscript"/"@assemblyscript\/assemblyscript"/' package.json
+    #     sed -i 's/"assemblyscript"/"@assemblyscript\/assemblyscript"/' package-lock.json
+    #     npm publish --registry=https://${NPM_REGISTRY}
+    #     cd lib/loader
+    #     npm publish --registry=https://${NPM_REGISTRY}
+    #     cd ../..

Diff for: NOTICE

@@ -23,6 +23,7 @@ under the licensing terms detailed in LICENSE:
 * Surma <[email protected]>
 * Julien Letellier <[email protected]>
 * Guido Zuidhof <[email protected]>
+* ncave <[email protected]>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

Diff for: README.md

@@ -22,13 +22,13 @@
 <h2 align="center">Contributors</h2>
 
 <p align="center">
-  <a href="https://assemblyscript.org/#contributors"><img src="https://assemblyscript.org/contributors.svg" alt="Contributor logos" /></a>
+  <a href="https://assemblyscript.org/#contributors"><img src="https://assemblyscript.org/contributors.svg" alt="Contributor logos" width="720" /></a>
 </p>
 
 <h2 align="center">Thanks to our sponsors!</h2>
 
 <p align="justify">Most of the core team members and most contributors do this open source work in their free time. If you use AssemblyScript for a serious task or plan to do so, and you'd like us to invest more time on it, <a href="https://opencollective.com/assemblyscript/donate" target="_blank" rel="noopener">please donate</a> to our <a href="https://opencollective.com/assemblyscript" target="_blank" rel="noopener">OpenCollective</a>. By sponsoring this project, your logo will show up below. Thank you so much for your support!</p>
 
 <p align="center">
-  <a href="https://assemblyscript.org/#sponsors"><img src="https://assemblyscript.org/sponsors.svg" alt="Sponsor logos" /></a>
+  <a href="https://assemblyscript.org/#sponsors"><img src="https://assemblyscript.org/sponsors.svg" alt="Sponsor logos" width="720" /></a>
 </p>

Diff for: bin/asinit

@@ -316,7 +316,9 @@ function ensureIndexJs() {
     fs.writeFileSync(indexFile, [
       "const fs = require(\"fs\");",
       "const loader = require(\"@assemblyscript/loader\");",
-      "module.exports = loader.instantiateSync(fs.readFileSync(__dirname + \"/build/optimized.wasm\"), { /* imports */ })"
+      "const imports = { /* imports go here */ };",
+      "const wasmModule = loader.instantiateSync(fs.readFileSync(__dirname + \"/build/optimized.wasm\"), imports);",
+      "module.exports = wasmModule.exports;"
     ].join("\n") + "\n");
     console.log(colors.green("  Created: ") + indexFile);
   } else {

Diff for: lib/parse/src/index.ts

@@ -5,7 +5,10 @@ export { Type, SectionId, ExternalKind };
 var compiled: WebAssembly.Module | null = null;
 
 declare var WASM_DATA: string; // injected by webpack
-if (typeof WASM_DATA !== "string") WASM_DATA = require("fs").readFileSync(__dirname + "/../build/index.wasm", "base64");
+if (typeof WASM_DATA !== "string") {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  WASM_DATA = require("fs").readFileSync(__dirname + "/../build/index.wasm", "base64");
+}
 
 /** Options specified to the parser. The `onSection` callback determines the sections being evaluated in detail. */
 export interface ParseOptions {