From 21057ba7d84f209c3d5fabe8f8b565ce7ca27ab6 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Tue, 30 Jan 2018 15:50:37 -0500 Subject: [PATCH] remove compiler-imports back to browser-solidity (still too specific to browser-solidity) --- remix-solidity/package.json | 2 - .../src/compiler/compiler-imports.js | 85 ------------------- 2 files changed, 87 deletions(-) delete mode 100644 remix-solidity/src/compiler/compiler-imports.js diff --git a/remix-solidity/package.json b/remix-solidity/package.json index c17eccc7fc..a5d55cc919 100644 --- a/remix-solidity/package.json +++ b/remix-solidity/package.json @@ -23,8 +23,6 @@ "fast-async": "^6.1.2", "remix-core": "latest", "remix-lib": "latest", - "js-base64": "^2.1.9", - "swarmgw": "^0.2.0", "webworkify": "^1.2.1", "solc": "^0.4.13", "standard": "^7.0.1", diff --git a/remix-solidity/src/compiler/compiler-imports.js b/remix-solidity/src/compiler/compiler-imports.js deleted file mode 100644 index a6162cb972..0000000000 --- a/remix-solidity/src/compiler/compiler-imports.js +++ /dev/null @@ -1,85 +0,0 @@ -'use strict' -// TODO: can just use request or fetch instead -var $ = require('jquery') -var base64 = require('js-base64').Base64 -var swarmgw = require('swarmgw') - -module.exports = { - handleGithubCall: function (root, path, cb) { - return $.getJSON('https://api.github.com/repos/' + root + '/contents/' + path) - .done(function (data) { - if ('content' in data) { - cb(null, base64.decode(data.content), root + '/' + path) - } else { - cb('Content not received') - } - }) - .fail(function (xhr, text, err) { - // NOTE: on some browsers, err equals to '' for certain errors (such as offline browser) - cb(err || 'Unknown transport error') - }) - }, - - handleSwarmImport: function (url, cb) { - swarmgw.get(url, function (err, content) { - cb(err, content, url) - }) - }, - - handleIPFS: function (url, cb) { - // replace ipfs:// with /ipfs/ - url = url.replace(/^ipfs:\/\/?/, 'ipfs/') - - return $.ajax({ type: 'GET', url: 'https://gateway.ipfs.io/' + url }) - .done(function (data) { - cb(null, data, url) - }) - .fail(function (xhr, text, err) { - // NOTE: on some browsers, err equals to '' for certain errors (such as offline browser) - cb(err || 'Unknown transport error') - }) - }, - - handlers: function () { - return [ - { type: 'github', match: /^(https?:\/\/)?(www.)?github.com\/([^/]*\/[^/]*)\/(.*)/, handler: (match, cb) => { this.handleGithubCall(match[3], match[4], cb) } }, - { type: 'swarm', match: /^(bzz[ri]?:\/\/?.*)$/, handler: (match, cb) => { this.handleSwarmImport(match[1], cb) } }, - { type: 'ipfs', match: /^(ipfs:\/\/?.+)/, handler: (match, cb) => { this.handleIPFS(match[1], cb) } } - ] - }, - - import: function (url, cb) { - var handlers = this.handlers() - - var found = false - handlers.forEach(function (handler) { - if (found) { - return - } - - var match = handler.match.exec(url) - if (match) { - found = true - - // TODO: this needs to be moved to the caller - $('#output').append($('
').append($('
').text('Loading ' + url + ' ...')))
-        handler.handler(match, function (err, content, cleanUrl) {
-          if (err) {
-            cb('Unable to import "' + cleanUrl + '": ' + err)
-            return
-          }
-
-          cb(null, content, cleanUrl, handler.type, url)
-        })
-      }
-    })
-
-    if (found) {
-      return
-    } else if (/^[^:]*:\/\//.exec(url)) {
-      cb('Unable to import "' + url + '": Unsupported URL schema')
-    } else {
-      cb('Unable to import "' + url + '": File not found')
-    }
-  }
-}