Merge branch 'resolve_with_package' of https://github.com/ethereum/remix-project into resolve_with_package

libs/remix-core-plugin/src/lib/compiler-content-imports.ts

@@ -16,7 +16,6 @@ export type ResolvedImport = {
 }
 
 export class CompilerImports extends Plugin {
-  previouslyHandled: Record<string, ResolvedImport>
   urlResolver: any
   constructor () {
     super(profile)
@@ -45,7 +44,7 @@ export class CompilerImports extends Plugin {
         return {}
       }
     })
-    this.previouslyHandled = {} // cache import so we don't make the request at each compilation.
+    this.on('filePanel', 'setWorkspace', () => this.urlResolver.clearCache())
   }
 
   async setToken () {
@@ -95,22 +94,12 @@ export class CompilerImports extends Plugin {
     if (!cb) cb = () => {}
 
     const self = this
-    if (force) delete this.previouslyHandled[url]
-    const imported = this.previouslyHandled[url]
-    if (imported) {
-      return cb(null, imported.content, imported.cleanUrl, imported.type, url)
-    }
 
     let resolved
     try {
       await this.setToken()
-      resolved = await this.urlResolver.resolve(url)
+      resolved = await this.urlResolver.resolve(url, [], force)
       const { content, cleanUrl, type } = resolved
-      self.previouslyHandled[url] = {
-        content,
-        cleanUrl,
-        type
-      }
       cb(null, content, cleanUrl, type, url)
     } catch (e) {
       return cb(new Error('not found ' + url))

libs/remix-url-resolver/src/resolve.ts

@@ -42,6 +42,10 @@ export class RemixURLResolver {
     this.protocol = protocol
   }
 
+  clearCache () {
+    this.previouslyHandled = {}
+  }
+
   /**
   * Handle an import statement based on github
   * @param root The root of the github import statement
@@ -137,28 +141,35 @@ export class RemixURLResolver {
       if (this.getDependencies) {
         try {
           const { deps, yarnLock, packageLock }  = await this.getDependencies()
-          for (const pkg of Object.keys(deps)) {
+          let matchLength = 0
-            if (url.startsWith(pkg)) {
+          let pkg
-              let version
+          Object.keys(deps).map((dep) => {
-              if (yarnLock) {
+            const reg = new RegExp(dep, 'g')
-                // yarn.lock
+            const match = url.match(reg)
-                const regex = new RegExp(`"${pkg}@(.*)"`, 'g')
+            if (match && match.length > 0 && matchLength < match[0].length) {
-                const yarnVersion = regex.exec(yarnLock)
+              matchLength = match[0].length
-                if (yarnVersion && yarnVersion.length > 1) {
+              pkg = dep
-                  version = yarnVersion[1]
+            }
-                }
+          })
-              }
+          if (pkg) {
-              if (!version && packageLock['dependencies'] && packageLock['dependencies'][pkg] && packageLock['dependencies'][pkg]['version']) {
+            let version
-                // package-lock.json
+            if (yarnLock) {
-                version = packageLock['dependencies'][pkg]['version']
+              // yarn.lock
-              }
+              const regex = new RegExp(`"${pkg}@(.*)"`, 'g')
-              if (!version) {
+              const yarnVersion = regex.exec(yarnLock)
-                // package.json
+              if (yarnVersion && yarnVersion.length > 1) {
-                version = deps[pkg]
+                version = yarnVersion[1]
               }
-              if (version) url = url.replace(pkg, `${pkg}@${version}`)
-              break
             }
+            if (!version && packageLock['dependencies'] && packageLock['dependencies'][pkg] && packageLock['dependencies'][pkg]['version']) {
+              // package-lock.json
+              version = packageLock['dependencies'][pkg]['version']
+            }
+            if (!version) {
+              // package.json
+              version = deps[pkg]
+            }
+            if (version) url = url.replace(pkg, `${pkg}@${version}`)
           }          
         } catch (e) {
           console.log(e)
@@ -207,9 +218,9 @@ export class RemixURLResolver {
     ]
   }
 
-  public async resolve (filePath: string, customHandlers?: Handler[]): Promise<Imported> {
+  public async resolve (filePath: string, customHandlers?: Handler[], force?: boolean): Promise<Imported> {
     let imported: Imported = this.previouslyHandled[filePath]
-    if (imported) {
+    if (!force && imported) {
       return imported
     }
     const builtinHandlers: Handler[] = this.getHandlers()