Fix imports, tweaks

Author: germania

index.js

@@ -16,7 +16,7 @@ module.exports = function(source) {
 
   const opts = loaderUtils.getOptions(this)
 
-  const rustTarget = (opts || {}).rustTarget || `wasm32-unknown-emscripten`;
+  const rustTarget = (opts || {}).rustTarget || `wasm32-unknown-unknown`;
 
   const builtin = /unknown-unknown/.test(rustTarget);
 
@@ -40,9 +40,11 @@ module.exports = function(source) {
     release ? 'release' : 'debug'
   )
 
-  const outFile = path.join(outDir, `${packageName}.js`)
-  const subcmd = `cargo ${builtin ? 'web' : ''} build`;
+  const outFile = path.join(outDir, `${packageName}.js`);
+
+  const subcmd = `cargo ${builtin ? 'web ' : ''}build`;
   const cmd = `${subcmd} --target=${rustTarget}${release ? ' --release' : ''} --verbose`
+
   const self = this
   child_process.exec(cmd, { cwd: this.context }, function(
     error,
@@ -52,22 +54,25 @@ module.exports = function(source) {
     if (error) {
       return callback(error, null)
     }
-
     // Get the contents of the javascript 'glue' code generated by Emscripten
     const out = fs.readFileSync(outFile, 'utf8')
 
-    // Get the contents of the wasm file generated by Emscripten
-    const wasmFile = fs
-      .readdirSync(path.join(outDir, 'deps'))
-      .find(f => /\.wasm$/.test(f))
-    if (!wasmFile) {
-      return callback(new Error('No wasm file found', null))
+    let wasmFile;
+    if (builtin) {
+      wasmFile = path.join(outDir, `${packageName}.wasm`);
+    } else {
+      wasmFile = fs
+        .readdirSync(path.join(outDir, 'deps'))
+        .find(f => /\.wasm$/.test(f))
+      if (!wasmFile) {
+        return callback(new Error('No wasm file found', null))
+      }
     }
 
     // Emit the wasm file
     self.emitFile(
       `${packageName}.wasm`,
-      fs.readFileSync(path.join(outDir, 'deps', wasmFile))
+      fs.readFileSync(wasmFile)
     )
 
     if (builtin) {