Merge pull request #1745 from ethereum/urlresolver

Use @resolver-engine/imports

package.json

@@ -48,6 +48,7 @@
     "remix-tests": "0.1.1",
     "remixd": "0.1.8-alpha.6",
     "request": "^2.83.0",
+    "@resolver-engine/imports": "^0.3.0",
     "rimraf": "^2.6.1",
     "selenium-standalone": "^6.0.1",
     "solc": "^0.5.0",

src/app/compiler/compiler-imports.js

@@ -1,6 +1,7 @@
 'use strict'
 var base64 = require('js-base64').Base64
 var swarmgw = require('swarmgw')()
+var resolver = require('@resolver-engine/imports').ImportsEngine()
 var request = require('request')
 
 module.exports = class CompilerImports {
@@ -112,13 +113,19 @@ module.exports = class CompilerImports {
         })
       }
     })
+    if (found) return
 
-    if (found) {
+    resolver
-      return
+    .resolve(url)
-    } else if (/^[^:]*:\/\//.exec(url)) {
+    .then(result => {
-      cb('Unable to import "' + url + '": Unsupported URL schema')
+      return resolver.require(url)
-    } else {
+    })
+    .then(result => {
+      cb(null, result.source, url, result.provider, result.url)
+    })
+    .catch(err => {
+      err
       cb('Unable to import "' + url + '": File not found')
-    }
+    })
   }
 }

src/app/components/plugin-manager-proxy.js

@@ -27,7 +27,7 @@ class PluginManagerProxy {
 
   unregister (name, instance) {
     if (this._listeners[name]) {
-      instance.events.off('compilationFinished', this._listeners[name])
+      instance.events.removeListener('compilationFinished', this._listeners[name])
     }
   }
 

src/app/tabs/compile-tab.js

@@ -28,7 +28,6 @@ class CompileTab extends ApiFactory {
       el: null,
       warnCompilationSlow: null,
       errorContainer: null,
-      contractNames: null,
       contractEl: null
     }
     this.queryParams = new QueryParams()

src/app/ui/landing-page/generate.js

@@ -63,7 +63,7 @@ export function generateHomePage (appManager, appStore) {
     payload: () => {
       appStore.getActives()
       .filter(({profile}) => !profile.required)
-      .forEach((profile) => { appManager.deactivateOne(profile.name) })
+      .forEach(({profile}) => { appManager.deactivateOne(profile.name) })
     }})
   defaultWorkspaces(appManager).forEach((workspace) => {
     sectionsWorkspaces.push({