Merge pull request #12 from ethereum/ci-build

Referenced libs locally

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')
 

apps/remix-ide/src/app/tabs/staticanalysis/staticAnalysisView.js

@@ -1,5 +1,5 @@
 '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-project/remix-lib')

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 {
 

apps/remix-ide/src/lib/cmdInterpreterAPI.js

@@ -8,7 +8,7 @@ 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')

libs/remix-analyzer/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "remix-analyzer",
+  "name": "@remix-project/remix-analyzer",
   "version": "0.5.3",
   "description": "Tool to perform static analysis on Solidity smart contracts",
   "main": "./dist/index.js",

libs/remix-debug/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "remix-debug",
+  "name": "@remix-project/remix-debug",
   "version": "0.4.5",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [

libs/remix-simulator/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "remix-simulator",
+  "name": "@remix-project/remix-simulator",
   "version": "0.1.9-beta.6",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [

libs/remix-simulator/src/provider.js

@@ -14,8 +14,8 @@ const Transactions = require('./methods/transactions.js')
 const generateBlock = require('./genesis.js')
 
 class Provider { 
-  constructor(options) {
-    this.options = options || {}
+  constructor(options = {}) {
+    this.options = options
     // TODO: init executionContext here
     this.executionContext = executionContext
     this.Accounts = new Accounts(this.executionContext)

libs/remix-tests/src/compiler.ts

@@ -10,7 +10,7 @@ function regexIndexOf (inputString: string, regex: RegExp, startpos = 0) {
 }
 
 function writeTestAccountsContract (accounts: string[]) {
-    const testAccountContract = require('../sol/tests_accounts.sol.js')
+    const testAccountContract = require('../sol/tests_accounts.sol')
     let body = `address[${accounts.length}] memory accounts;`
     if (!accounts.length) body += ';'
     else {
@@ -86,8 +86,8 @@ export function compileFileOrFiles(filename: string, isDirectory: boolean, opts:
     let compiler: any
     const accounts: string[] = opts.accounts || []
     const sources: SrcIfc = {
-        'tests.sol': { content: require('../sol/tests.sol.js') },
-        'remix_tests.sol': { content: require('../sol/tests.sol.js') },
+        'tests.sol': { content: require('../sol/tests.sol') },
+        'remix_tests.sol': { content: require('../sol/tests.sol') },
         'remix_accounts.sol': { content: writeTestAccountsContract(accounts) }
     }
     const filepath: string = (isDirectory ? filename : path.dirname(filename))

libs/remix-tests/src/index.ts

@@ -2,4 +2,4 @@ export { runTestFiles } from './runTestFiles'
 export { runTestSources } from './runTestSources'
 export { runTest } from './testRunner'
 export * from './types'
-export const assertLibCode = require('../sol/tests.sol.js')
+export const assertLibCode = require('../sol/tests.sol')

libs/remix-tests/src/run.ts

@@ -48,7 +48,7 @@ commander
             log.info('verbosity level set to ' + commander.verbose.blue)
         }
         const web3 = new Web3()
-        const provider = new Provider()
+        const provider: any = new Provider()
         await provider.init()
         web3.setProvider(provider)
 

libs/remix-tests/src/runTestSources.ts

@@ -12,7 +12,7 @@ import { FinalResult, SrcIfc, compilationInterface, ASTInterface, Options,
 
 const createWeb3Provider = async function () {
     const web3 = new Web3()
-    const provider = new Provider()
+    const provider: any = new Provider()
     await provider.init()
     web3.setProvider(provider)
     return web3

libs/remix-tests/tsconfig.lib.json

@@ -4,7 +4,7 @@
       "module": "commonjs",
       "outDir": "../../dist/out-tsc",
       "declaration": true,
-      "rootDir": "./src",
+      "rootDir": "./",
       "types": ["node"]
     },
     "exclude": [

package.json

@@ -85,7 +85,7 @@
     "nightwatch_local_editor": "nightwatch ./apps/remix-ide/test-browser/tests/editor.test.js --config apps/remix-ide/nightwatch.js --env chrome ",
     "nightwatch_local_runAndDeploy": "nightwatch ./apps/remix-ide/test-browser/tests/runAndDeploy.js --config apps/remix-ide/nightwatch.js --env chrome-runAndDeploy ",
     "onchange": "onchange apps/remix-ide/build/app.js -- npm-run-all lint",
-      "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build",
+    "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build:libs build",
     "remixd": "remixd -s ./apps/remix-ide/contracts --remix-ide http://127.0.0.1:4200",
     "selenium": "selenium-standalone start",
     "selenium-install": "selenium-standalone install",
@@ -140,6 +140,7 @@
     "ethereumjs-vm": "4.1.3",
     "http-server": "^0.11.1",
     "npm-install-version": "^6.0.2",
+    "signale": "^1.4.0",
     "time-stamp": "^2.2.0",
     "winston": "^3.3.3"
   },

tsconfig.json

@@ -22,7 +22,7 @@
       "@remix-project/remix-lib": ["dist/libs/remix-lib/index.js"],
       "@remix-project/remix-simulator": ["dist/libs/remix-simulator/index.js"],
       "@remix-project/remix-solidity": ["dist/libs/remix-solidity/index.js"],
-      "@remix-project/remix-tests": ["dist/libs/remix-tests/index.js"],
+      "@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"],
       "@remix-project/remix-url-resolver": ["dist/libs/remix-url-resolver/index.js"]
     }
   },