From 7bb6d4bc7d8108c841ab619b922dcb20aa5870ea Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Mon, 13 Jul 2020 15:19:29 +0100
Subject: [PATCH] Referenced libs locally

---
 apps/remix-ide/src/app.js                                     | 2 +-
 apps/remix-ide/src/app/compiler/compiler-abstract.js          | 2 +-
 .../app/compiler/compiler-sourceVerifier-fetchAndCompile.js   | 2 +-
 apps/remix-ide/src/app/editor/contextView.js                  | 2 +-
 apps/remix-ide/src/app/editor/contextualListener.js           | 2 +-
 apps/remix-ide/src/app/files/fileProvider.js                  | 2 +-
 apps/remix-ide/src/app/tabs/compileTab/compileTab.js          | 2 +-
 apps/remix-ide/src/app/tabs/compileTab/contractParser.js      | 2 +-
 apps/remix-ide/src/app/tabs/debugger-tab.js                   | 2 +-
 apps/remix-ide/src/app/tabs/debugger/debuggerUI.js            | 4 ++--
 apps/remix-ide/src/app/tabs/runTab/contractDropdown.js        | 2 +-
 apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js     | 2 +-
 apps/remix-ide/src/app/tabs/runTab/model/recorder.js          | 2 +-
 apps/remix-ide/src/app/tabs/runTab/recorder.js                | 2 +-
 apps/remix-ide/src/app/tabs/runTab/settings.js                | 2 +-
 .../src/app/tabs/staticanalysis/staticAnalysisView.js         | 4 ++--
 apps/remix-ide/src/app/tabs/test-tab.js                       | 2 +-
 apps/remix-ide/src/app/udapp/make-udapp.js                    | 2 +-
 apps/remix-ide/src/app/ui/auto-complete-popup.js              | 2 +-
 apps/remix-ide/src/app/ui/multiParamManager.js                | 2 +-
 apps/remix-ide/src/app/ui/sendTxCallbacks.js                  | 2 +-
 apps/remix-ide/src/app/ui/txLogger.js                         | 2 +-
 apps/remix-ide/src/app/ui/universal-dapp-ui.js                | 2 +-
 apps/remix-ide/src/blockchain/blockchain.js                   | 2 +-
 apps/remix-ide/src/blockchain/providers/vm.js                 | 2 +-
 apps/remix-ide/src/lib/cmdInterpreterAPI.js                   | 4 ++--
 apps/remix-ide/src/lib/events.js                              | 2 +-
 apps/remix-ide/src/lib/offsetToLineColumnConverter.js         | 2 +-
 apps/remix-ide/src/migrateFileSystem.js                       | 2 +-
 apps/remix-ide/webpack.config.js                              | 1 +
 30 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 5a0951dbea..e66b950f66 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -3,7 +3,7 @@
 var isElectron = require('is-electron')
 var csjs = require('csjs-inject')
 var yo = require('yo-yo')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var registry = require('./global/registry')
 var Remixd = require('./lib/remixd')
 var loadFileFromParent = require('./loadFilesFromParent')
diff --git a/apps/remix-ide/src/app/compiler/compiler-abstract.js b/apps/remix-ide/src/app/compiler/compiler-abstract.js
index aa3b1cfaa7..6df09dd93d 100644
--- a/apps/remix-ide/src/app/compiler/compiler-abstract.js
+++ b/apps/remix-ide/src/app/compiler/compiler-abstract.js
@@ -1,5 +1,5 @@
 'use strict'
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var txHelper = remixLib.execution.txHelper
 
 module.exports = class CompilerAbstract {
diff --git a/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js b/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js
index 04956b5ac7..15ffb741b0 100644
--- a/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js
+++ b/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js
@@ -5,7 +5,7 @@ import { urlFromVersion } from './compiler-utils'
 import { compile } from './compiler-helpers'
 import globalRegistry from '../../global/registry'
 
-import remixLib from 'remix-lib'
+import remixLib from '@remix-project/remix-lib'
 
 const profile = {
   name: 'fetchAndCompile',
diff --git a/apps/remix-ide/src/app/editor/contextView.js b/apps/remix-ide/src/app/editor/contextView.js
index 97f1281216..9ec89edc1e 100644
--- a/apps/remix-ide/src/app/editor/contextView.js
+++ b/apps/remix-ide/src/app/editor/contextView.js
@@ -1,6 +1,6 @@
 'use strict'
 const yo = require('yo-yo')
-const remixLib = require('remix-lib')
+const remixLib = require('@remix-project/remix-lib')
 const SourceMappingDecoder = remixLib.SourceMappingDecoder
 const globalRegistry = require('../../global/registry')
 
diff --git a/apps/remix-ide/src/app/editor/contextualListener.js b/apps/remix-ide/src/app/editor/contextualListener.js
index 99b492316f..f30018143a 100644
--- a/apps/remix-ide/src/app/editor/contextualListener.js
+++ b/apps/remix-ide/src/app/editor/contextualListener.js
@@ -1,5 +1,5 @@
 'use strict'
-const remixLib = require('remix-lib')
+const remixLib = require('@remix-project/remix-lib')
 const csjs = require('csjs-inject')
 const SourceMappingDecoder = remixLib.SourceMappingDecoder
 const AstWalker = remixLib.AstWalker
diff --git a/apps/remix-ide/src/app/files/fileProvider.js b/apps/remix-ide/src/app/files/fileProvider.js
index 116f42b368..bcf066a5a7 100644
--- a/apps/remix-ide/src/app/files/fileProvider.js
+++ b/apps/remix-ide/src/app/files/fileProvider.js
@@ -4,7 +4,7 @@ const CompilerImport = require('../compiler/compiler-imports')
 const EventManager = require('../../lib/events')
 const modalDialogCustom = require('../ui/modal-dialog-custom')
 const tooltip = require('../ui/tooltip')
-const remixLib = require('remix-lib')
+const remixLib = require('@remix-project/remix-lib')
 const Storage = remixLib.Storage
 
 class FileProvider {
diff --git a/apps/remix-ide/src/app/tabs/compileTab/compileTab.js b/apps/remix-ide/src/app/tabs/compileTab/compileTab.js
index 2b2d8e7d9e..778f11d1d1 100644
--- a/apps/remix-ide/src/app/tabs/compileTab/compileTab.js
+++ b/apps/remix-ide/src/app/tabs/compileTab/compileTab.js
@@ -1,6 +1,6 @@
 const async = require('async')
 const EventEmitter = require('events')
-var remixTests = require('remix-tests')
+var remixTests = require('@remix-project/remix-tests')
 var Compiler = require('@remix-project/remix-solidity').Compiler
 var CompilerImport = require('../../compiler/compiler-imports')
 
diff --git a/apps/remix-ide/src/app/tabs/compileTab/contractParser.js b/apps/remix-ide/src/app/tabs/compileTab/contractParser.js
index de9abb5c34..90ae785d82 100644
--- a/apps/remix-ide/src/app/tabs/compileTab/contractParser.js
+++ b/apps/remix-ide/src/app/tabs/compileTab/contractParser.js
@@ -1,7 +1,7 @@
 'use strict'
 
 var solcTranslate = require('solc/translate')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var txHelper = remixLib.execution.txHelper
 
 module.exports = (contractName, contract, compiledSource) => {
diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js
index 84959edad2..9e8025534f 100644
--- a/apps/remix-ide/src/app/tabs/debugger-tab.js
+++ b/apps/remix-ide/src/app/tabs/debugger-tab.js
@@ -1,5 +1,5 @@
 const yo = require('yo-yo')
-const remixLib = require('remix-lib')
+const remixLib = require('@remix-project/remix-lib')
 const css = require('./styles/debugger-tab-styles')
 import toaster from '../ui/tooltip'
 const DebuggerUI = require('./debugger/debuggerUI')
diff --git a/apps/remix-ide/src/app/tabs/debugger/debuggerUI.js b/apps/remix-ide/src/app/tabs/debugger/debuggerUI.js
index 8359762412..89a2a8c982 100644
--- a/apps/remix-ide/src/app/tabs/debugger/debuggerUI.js
+++ b/apps/remix-ide/src/app/tabs/debugger/debuggerUI.js
@@ -3,7 +3,7 @@ var StepManagerUI = require('./debuggerUI/StepManager')
 var VmDebugger = require('./debuggerUI/VmDebugger')
 var toaster = require('../../ui/tooltip')
 
-var Debugger = require('remix-debug').TransactionDebugger
+var Debugger = require('@remix-project/remix-debug').TransactionDebugger
 
 var SourceHighlighter = require('../../editor/sourceHighlighter')
 
@@ -11,7 +11,7 @@ var EventManager = require('../../../lib/events')
 
 var globalRegistry = require('../../../global/registry')
 
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 
 var init = remixLib.init
 
diff --git a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
index 5135854478..925719ea44 100644
--- a/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
+++ b/apps/remix-ide/src/app/tabs/runTab/contractDropdown.js
@@ -1,7 +1,7 @@
 var yo = require('yo-yo')
 var css = require('../styles/run-tab-styles')
 var modalDialogCustom = require('../../ui/modal-dialog-custom')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var EventManager = remixLib.EventManager
 var confirmDialog = require('../../ui/confirmDialog')
 var modalDialog = require('../../ui/modaldialog')
diff --git a/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js b/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
index c2dc932aa1..31d823756a 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/dropdownlogic.js
@@ -1,5 +1,5 @@
 var ethJSUtil = require('ethereumjs-util')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var txHelper = remixLib.execution.txHelper
 var CompilerAbstract = require('../../../compiler/compiler-abstract')
 var EventManager = remixLib.EventManager
diff --git a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
index 1308483adc..ea2333bc9c 100644
--- a/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
+++ b/apps/remix-ide/src/app/tabs/runTab/model/recorder.js
@@ -1,6 +1,6 @@
 var async = require('async')
 var ethutil = require('ethereumjs-util')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var EventManager = remixLib.EventManager
 var format = remixLib.execution.txFormat
 var txHelper = remixLib.execution.txHelper
diff --git a/apps/remix-ide/src/app/tabs/runTab/recorder.js b/apps/remix-ide/src/app/tabs/runTab/recorder.js
index ba7da014e3..7fa784da6b 100644
--- a/apps/remix-ide/src/app/tabs/runTab/recorder.js
+++ b/apps/remix-ide/src/app/tabs/runTab/recorder.js
@@ -1,5 +1,5 @@
 var yo = require('yo-yo')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var EventManager = remixLib.EventManager
 var csjs = require('csjs-inject')
 var css = require('../styles/run-tab-styles')
diff --git a/apps/remix-ide/src/app/tabs/runTab/settings.js b/apps/remix-ide/src/app/tabs/runTab/settings.js
index 30333f8755..692828e25e 100644
--- a/apps/remix-ide/src/app/tabs/runTab/settings.js
+++ b/apps/remix-ide/src/app/tabs/runTab/settings.js
@@ -1,6 +1,6 @@
 const $ = require('jquery')
 const yo = require('yo-yo')
-const remixLib = require('remix-lib')
+const remixLib = require('@remix-project/remix-lib')
 const EventManager = remixLib.EventManager
 const css = require('../styles/run-tab-styles')
 const copyToClipboard = require('../../ui/copy-to-clipboard')
diff --git a/apps/remix-ide/src/app/tabs/staticanalysis/staticAnalysisView.js b/apps/remix-ide/src/app/tabs/staticanalysis/staticAnalysisView.js
index 2723c73754..6e6764c135 100644
--- a/apps/remix-ide/src/app/tabs/staticanalysis/staticAnalysisView.js
+++ b/apps/remix-ide/src/app/tabs/staticanalysis/staticAnalysisView.js
@@ -1,8 +1,8 @@
 'use strict'
-var StaticAnalysisRunner = require('remix-analyzer').CodeAnalysis
+var StaticAnalysisRunner = require('@remix-project/remix-analyzer').CodeAnalysis
 var yo = require('yo-yo')
 var $ = require('jquery')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var utils = remixLib.util
 var css = require('./styles/staticAnalysisView-styles')
 var Renderer = require('../../ui/renderer')
diff --git a/apps/remix-ide/src/app/tabs/test-tab.js b/apps/remix-ide/src/app/tabs/test-tab.js
index aec8e5292c..edc9730fa3 100644
--- a/apps/remix-ide/src/app/tabs/test-tab.js
+++ b/apps/remix-ide/src/app/tabs/test-tab.js
@@ -2,7 +2,7 @@ var yo = require('yo-yo')
 var async = require('async')
 var tooltip = require('../ui/tooltip')
 var css = require('./styles/test-tab-styles')
-var remixTests = require('remix-tests')
+var remixTests = require('@remix-project/remix-tests')
 import { ViewPlugin } from '@remixproject/engine'
 import { canUseWorker, baseUrl } from '../compiler/compiler-utils'
 
diff --git a/apps/remix-ide/src/app/udapp/make-udapp.js b/apps/remix-ide/src/app/udapp/make-udapp.js
index 9b7a247f50..68c9b9dc66 100644
--- a/apps/remix-ide/src/app/udapp/make-udapp.js
+++ b/apps/remix-ide/src/app/udapp/make-udapp.js
@@ -1,5 +1,5 @@
 var registry = require('../../global/registry')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var yo = require('yo-yo')
 var EventsDecoder = remixLib.execution.EventsDecoder
 var TransactionReceiptResolver = require('../../lib/transactionReceiptResolver')
diff --git a/apps/remix-ide/src/app/ui/auto-complete-popup.js b/apps/remix-ide/src/app/ui/auto-complete-popup.js
index 9a472c503d..92445bc30c 100644
--- a/apps/remix-ide/src/app/ui/auto-complete-popup.js
+++ b/apps/remix-ide/src/app/ui/auto-complete-popup.js
@@ -1,5 +1,5 @@
 var yo = require('yo-yo')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var EventManager = remixLib.EventManager
 var Commands = require('../../lib/commands')
 
diff --git a/apps/remix-ide/src/app/ui/multiParamManager.js b/apps/remix-ide/src/app/ui/multiParamManager.js
index 3fb87ec011..221578add8 100644
--- a/apps/remix-ide/src/app/ui/multiParamManager.js
+++ b/apps/remix-ide/src/app/ui/multiParamManager.js
@@ -3,7 +3,7 @@
 var yo = require('yo-yo')
 var css = require('../../universal-dapp-styles')
 var copyToClipboard = require('./copy-to-clipboard')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var txFormat = remixLib.execution.txFormat
 
 class MultiParamManager {
diff --git a/apps/remix-ide/src/app/ui/sendTxCallbacks.js b/apps/remix-ide/src/app/ui/sendTxCallbacks.js
index b531ad20c0..9f30937c95 100644
--- a/apps/remix-ide/src/app/ui/sendTxCallbacks.js
+++ b/apps/remix-ide/src/app/ui/sendTxCallbacks.js
@@ -1,5 +1,5 @@
 const yo = require('yo-yo')
-const remixLib = require('remix-lib')
+const remixLib = require('@remix-project/remix-lib')
 const confirmDialog = require('./confirmDialog')
 const modalCustom = require('./modal-dialog-custom')
 const modalDialog = require('./modaldialog')
diff --git a/apps/remix-ide/src/app/ui/txLogger.js b/apps/remix-ide/src/app/ui/txLogger.js
index 3af548f78a..bcb8fb8427 100644
--- a/apps/remix-ide/src/app/ui/txLogger.js
+++ b/apps/remix-ide/src/app/ui/txLogger.js
@@ -4,7 +4,7 @@ var copyToClipboard = require('./copy-to-clipboard')
 
 // -------------- styling ----------------------
 var csjs = require('csjs-inject')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 
 var EventManager = require('../../lib/events')
 var helper = require('../../lib/helper')
diff --git a/apps/remix-ide/src/app/ui/universal-dapp-ui.js b/apps/remix-ide/src/app/ui/universal-dapp-ui.js
index c56f6f4650..ca4cc28482 100644
--- a/apps/remix-ide/src/app/ui/universal-dapp-ui.js
+++ b/apps/remix-ide/src/app/ui/universal-dapp-ui.js
@@ -9,7 +9,7 @@ var helper = require('../../lib/helper')
 var copyToClipboard = require('./copy-to-clipboard')
 var css = require('../../universal-dapp-styles')
 var MultiParamManager = require('./multiParamManager')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var txFormat = remixLib.execution.txFormat
 const txHelper = remixLib.execution.txHelper
 var TreeView = require('./TreeView')
diff --git a/apps/remix-ide/src/blockchain/blockchain.js b/apps/remix-ide/src/blockchain/blockchain.js
index 7e71f57000..81b4a37c3c 100644
--- a/apps/remix-ide/src/blockchain/blockchain.js
+++ b/apps/remix-ide/src/blockchain/blockchain.js
@@ -1,4 +1,4 @@
-const remixLib = require('remix-lib')
+const remixLib = require('@remix-project/remix-lib')
 const txFormat = remixLib.execution.txFormat
 const txExecution = remixLib.execution.txExecution
 const typeConversion = remixLib.execution.typeConversion
diff --git a/apps/remix-ide/src/blockchain/providers/vm.js b/apps/remix-ide/src/blockchain/providers/vm.js
index 7b8379cc34..c034689d15 100644
--- a/apps/remix-ide/src/blockchain/providers/vm.js
+++ b/apps/remix-ide/src/blockchain/providers/vm.js
@@ -1,6 +1,6 @@
 const Web3 = require('web3')
 const { BN, privateToAddress, stripHexPrefix, hashPersonalMessage } = require('ethereumjs-util')
-const RemixSimulator = require('remix-simulator')
+const RemixSimulator = require('@remix-project/remix-simulator')
 
 class VMProvider {
 
diff --git a/apps/remix-ide/src/lib/cmdInterpreterAPI.js b/apps/remix-ide/src/lib/cmdInterpreterAPI.js
index 290e40d573..010e4b016f 100644
--- a/apps/remix-ide/src/lib/cmdInterpreterAPI.js
+++ b/apps/remix-ide/src/lib/cmdInterpreterAPI.js
@@ -1,14 +1,14 @@
 'use strict'
 var yo = require('yo-yo')
 var async = require('async')
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var EventManager = require('../lib/events')
 
 var CompilerImport = require('../app/compiler/compiler-imports')
 var toolTip = require('../app/ui/tooltip')
 var globalRegistry = require('../global/registry')
 var SourceHighlighter = require('../app/editor/sourceHighlighter')
-var RemixDebug = require('remix-debug').EthDebugger
+var RemixDebug = require('@remix-project/remix-debug').EthDebugger
 var TreeView = require('../app/ui/TreeView') // TODO setup a direct reference to the UI components
 var solidityTypeFormatter = require('../app/tabs/debugger/debuggerUI/vmDebugger/utils/SolidityTypeFormatter')
 var GistHandler = require('./gist-handler')
diff --git a/apps/remix-ide/src/lib/events.js b/apps/remix-ide/src/lib/events.js
index 882da1893a..b5c723e220 100644
--- a/apps/remix-ide/src/lib/events.js
+++ b/apps/remix-ide/src/lib/events.js
@@ -1,4 +1,4 @@
-var remixLib = require('remix-lib')
+var remixLib = require('@remix-project/remix-lib')
 var EventManager = remixLib.EventManager
 
 module.exports = EventManager
diff --git a/apps/remix-ide/src/lib/offsetToLineColumnConverter.js b/apps/remix-ide/src/lib/offsetToLineColumnConverter.js
index 46e192b120..5880531a3c 100644
--- a/apps/remix-ide/src/lib/offsetToLineColumnConverter.js
+++ b/apps/remix-ide/src/lib/offsetToLineColumnConverter.js
@@ -1,5 +1,5 @@
 'use strict'
-var SourceMappingDecoder = require('remix-lib').SourceMappingDecoder
+var SourceMappingDecoder = require('@remix-project/remix-lib').SourceMappingDecoder
 import { Plugin } from '@remixproject/engine'
 import * as packageJson from '../../package.json'
 
diff --git a/apps/remix-ide/src/migrateFileSystem.js b/apps/remix-ide/src/migrateFileSystem.js
index 4e3cee7dcc..401b0ad0a2 100644
--- a/apps/remix-ide/src/migrateFileSystem.js
+++ b/apps/remix-ide/src/migrateFileSystem.js
@@ -1,5 +1,5 @@
 
-import { Storage } from 'remix-lib'
+import { Storage } from '@remix-project/remix-lib'
 
 /*
   Migrating the files to the BrowserFS storage instead or raw localstorage
diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index bacc6e251e..75fbc3af86 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -15,3 +15,4 @@ module.exports = config => {
         }
     }
 }
+ 
\ No newline at end of file