Merge branch 'master' into refactor_remix_debug1b

apps/remix-ide/src/app/compiler/compiler-artefacts.js

@@ -1,6 +1,6 @@
 'use strict'
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 import CompilerAbstract from './compiler-abstract'
 
 const profile = {

apps/remix-ide/src/app/compiler/compiler-imports.js

@@ -5,7 +5,7 @@ var swarmgw = require('swarmgw')()
 var resolver = require('@resolver-engine/imports').ImportsEngine()
 var request = require('request')
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const profile = {
   name: 'contentImport',

apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js

@@ -1,5 +1,5 @@
 const ethutil = require('ethereumjs-util')
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 import { Plugin } from '@remixproject/engine'
 import { compile } from './compiler-helpers'
 import globalRegistry from '../../global/registry'

apps/remix-ide/src/app/components/hidden-panel.js

@@ -1,5 +1,5 @@
 import { AbstractPanel } from './panel'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 const csjs = require('csjs-inject')
 const yo = require('yo-yo')
 

apps/remix-ide/src/app/components/main-panel.js

@@ -1,5 +1,5 @@
 import { AbstractPanel } from './panel'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 const yo = require('yo-yo')
 const csjs = require('csjs-inject')
 

apps/remix-ide/src/app/components/plugin-manager-component.js

@@ -4,7 +4,7 @@ const EventEmitter = require('events')
 const LocalPlugin = require('./local-plugin')
 import { ViewPlugin, IframePlugin, WebsocketPlugin } from '@remixproject/engine'
 import { PluginManagerSettings } from './plugin-manager-settings'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 const addToolTip = require('../ui/tooltip')
 
 const css = csjs`

apps/remix-ide/src/app/components/side-panel.js

@@ -1,5 +1,5 @@
 import { AbstractPanel } from './panel'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 const csjs = require('csjs-inject')
 const yo = require('yo-yo')
 

apps/remix-ide/src/app/components/vertical-icons.js

@@ -3,7 +3,7 @@ var csjs = require('csjs-inject')
 var helper = require('../../lib/helper')
 let globalRegistry = require('../../global/registry')
 const { Plugin } = require('@remixproject/engine')
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 import { basicLogo } from '../ui/svgLogo'
 
 const EventEmitter = require('events')

apps/remix-ide/src/app/editor/contextualListener.js

@@ -6,7 +6,7 @@ const AstWalker = remixLib.AstWalker
 const EventManager = require('../../lib/events')
 const globalRegistry = require('../../global/registry')
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const profile = {
   name: 'contextualListener',

apps/remix-ide/src/app/editor/editor.js

@@ -4,7 +4,7 @@ const yo = require('yo-yo')
 const csjs = require('csjs-inject')
 const ace = require('brace')
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const globalRegistry = require('../../global/registry')
 const SourceHighlighters = require('./SourceHighlighters')

apps/remix-ide/src/app/files/compiler-metadata.js

@@ -1,7 +1,7 @@
 'use strict'
 var CompilerAbstract = require('../compiler/compiler-abstract')
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const profile = {
   name: 'compilerMetadata',

apps/remix-ide/src/app/files/fileManager.js

@@ -9,7 +9,7 @@ const toaster = require('../ui/tooltip')
 const modalDialogCustom = require('../ui/modal-dialog-custom')
 const helper = require('../../lib/helper.js')
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 /*
   attach to files event (removed renamed)

apps/remix-ide/src/app/files/remixd-handle.js

@@ -1,6 +1,6 @@
 import isElectron from 'is-electron'
 import { WebsocketPlugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 var yo = require('yo-yo')
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')

apps/remix-ide/src/app/panels/file-panel.js

@@ -6,7 +6,7 @@ var globalRegistry = require('../../global/registry')
 var css = require('./styles/file-panel-styles')
 import { ViewPlugin } from '@remixproject/engine'
 
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 var canUpload = window.File || window.FileReader || window.FileList || window.Blob
 

apps/remix-ide/src/app/panels/terminal.js

@@ -1,4 +1,7 @@
 /* global Node, requestAnimationFrame */
+import { Plugin } from '@remixproject/engine'
+import * as packageJson from '../../../../../package.json'
+
 var yo = require('yo-yo')
 var javascriptserialize = require('javascript-serialize')
 var jsbeautify = require('js-beautify')
@@ -16,10 +19,6 @@ var TxLogger = require('../../app/ui/txLogger')
 var csjs = require('csjs-inject')
 
 var css = require('./styles/terminal-styles')
-import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
-
-var packageV = require('../../../package.json')
 
 var KONSOLES = []
 
@@ -451,7 +450,7 @@ class Terminal extends Plugin {
     self._cmdTemp = ''
 
     var intro = yo`
-      <div><div> - Welcome to Remix ${packageV.version} - </div><br>
+      <div><div> - Welcome to Remix ${packageJson.version} - </div><br>
       <div>You can use this terminal for: </div>
       <ul class=${css2.ul}>
         <li>Checking transactions details and start debugging.</li>

apps/remix-ide/src/app/tabs/analysis-tab.js

@@ -4,7 +4,7 @@ var EventManager = require('../../lib/events')
 
 import { ViewPlugin } from '@remixproject/engine'
 import { EventEmitter } from 'events'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const profile = {
   name: 'solidityStaticAnalysis',

apps/remix-ide/src/app/tabs/compile-tab.js

@@ -18,7 +18,7 @@ const CompileTabLogic = require('./compileTab/compileTab.js')
 const CompilerContainer = require('./compileTab/compilerContainer.js')
 
 import { ViewPlugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 import publishToStorage from '../../publishToStorage'
 import { compile } from '../compiler/compiler-helpers'
 

apps/remix-ide/src/app/tabs/debugger-tab.js

@@ -4,7 +4,7 @@ const css = require('./styles/debugger-tab-styles')
 import toaster from '../ui/tooltip'
 const DebuggerUI = require('./debugger/debuggerUI')
 import { ViewPlugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const profile = {
   name: 'debugger',

apps/remix-ide/src/app/tabs/network-module.js

@@ -1,5 +1,5 @@
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 export const profile = {
   name: 'network',

apps/remix-ide/src/app/tabs/settings-tab.js

@@ -5,7 +5,7 @@ const copyToClipboard = require('../ui/copy-to-clipboard')
 const EventManager = require('../../lib/events')
 const css = require('./styles/settings-tab-styles')
 import { ViewPlugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const profile = {
   name: 'settings',

apps/remix-ide/src/app/tabs/theme-module.js

@@ -1,7 +1,7 @@
 import { Plugin } from '@remixproject/engine'
 import { EventEmitter } from 'events'
 import QueryParams from '../../lib/query-params'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 import yo from 'yo-yo'
 
 const themes = [

apps/remix-ide/src/app/tabs/web3-provider.js

@@ -1,5 +1,5 @@
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 export const profile = {
   name: 'web3Provider',

apps/remix-ide/src/app/udapp/run-tab.js

@@ -1,5 +1,5 @@
 import { LibraryPlugin } from '@remixproject/engine'
-import * as packageJson from '../../../package.json'
+import * as packageJson from '../../../../../package.json'
 
 const $ = require('jquery')
 const yo = require('yo-yo')

apps/remix-ide/src/app/ui/landing-page/landing-page.js

@@ -6,7 +6,7 @@ var modalDialogCustom = require('../modal-dialog-custom')
 var tooltip = require('../tooltip')
 var GistHandler = require('../../../lib/gist-handler')
 var QueryParams = require('../../../lib/query-params.js')
-import * as packageJson from '../../../../package.json'
+import * as packageJson from '../../../../../../package.json'
 import { ViewPlugin } from '@remixproject/engine'
 
 let css = csjs`

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

@@ -1,7 +1,7 @@
 'use strict'
-var SourceMappingDecoder = require('@remix-project/remix-lib').SourceMappingDecoder
 import { Plugin } from '@remixproject/engine'
-import * as packageJson from '../../package.json'
+import * as packageJson from '../../../../package.json'
+const SourceMappingDecoder = require('@remix-project/remix-lib').SourceMappingDecoder
 
 const profile = {
   name: 'offsetToLineColumnConverter',

apps/remix-ide/test-browser/helpers/init.js

@@ -11,8 +11,9 @@ module.exports = function (browser, callback, url, preloadPlugins = true) {
           console.log('preloadPlugins: ', preloadPlugins)
           initModules(browser, () => {
             browser.clickLaunchIcon('solidity')
-            .waitForElementPresent('[for="autoCompile"]')
+            .waitForElementVisible('[for="autoCompile"]')
             .click('[for="autoCompile"]')
+            .verify.elementPresent('[data-id="compilerContainerAutoCompile"]:checked')
           })
         }
       })

gulpfile.js

@@ -36,4 +36,29 @@ task('updateChangelog', async function () {
     // Write the concatenated content to CHANGELOG.md (We delete and create file to place the new data on top)
     fs.writeFileSync(__dirname + '/CHANGELOG.md', data); 
     await Promise.resolve();
+});
+
+/**
+ * @dev Task to sync libs version from 'dist' folder as lerna published from there
+ */
+task('syncLibVersions', async function () {
+    const libs = [
+        'remix-analyzer',
+        'remix-astwalker',
+        'remix-debug',
+        'remix-lib',
+        'remix-simulator',
+        'remix-solidity',
+        'remix-tests',
+        'remix-url-resolver'
+    ]
+
+    libs.forEach(lib => {
+        const distPackageJSON = require(__dirname + '/dist/libs/' + lib + '/package.json')
+        const libVersion = distPackageJSON.version
+        let packageJSON = require(__dirname + '/libs/' + lib + '/package.json')
+        packageJSON.version = libVersion
+        fs.writeFileSync(__dirname + '/libs/' + lib + '/package.json', JSON.stringify(packageJSON, null, 2), 'utf8')
+    })
+    await Promise.resolve();
 });

libs/remix-tests/src/run.ts

@@ -20,7 +20,7 @@ function mapVerbosity (v: number) {
     }
     return levels[v]
 }
-const version = require('../package.json').version
+const version = require('../../../package.json').version
 
 commander.version(version)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.0.0",
+  "version": "0.10.4",
   "license": "MIT",
   "description": "Ethereum Remix Monorepo",
   "keywords": [
@@ -46,7 +46,8 @@
     "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver",
     "build:libs": "nx run-many --target=build --parallel=false --with-deps=true --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver",
     "test:libs": "nx run-many --target=test --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver",
-    "publish:libs": "npm run build:libs; lerna publish --skip-git",
+    "publish:libs": "npm run build:libs; lerna publish --skip-git; npm run bumpVersion:libs",
+    "bumpVersion:libs": "gulp; gulp syncLibVersions;",
     "browsertest": "sleep 5 && npm run nightwatch_local",
     "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/assets/css/font-awesome.min.css' apps/remix-ide/assets/css/",
     "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.6+commit.6c089d02.js -O ./apps/remix-ide/soljson.js",
@@ -205,6 +206,7 @@
     "fast-levenshtein": "^2.0.6",
     "ganache-cli": "^6.8.1",
     "gists": "^1.0.1",
+    "gulp": "^4.0.2",
     "ipfs-http-client": "35.1.1",
     "ipfs-mini": "^1.1.5",
     "is-electron": "^2.2.0",

release-process.md

@@ -25,7 +25,7 @@ This document includes:
  - git checkout origin/master
  - git tag v(version-number)
  - git push --tags
- - github-changes -o ethereum -r remix-ide -a --only-pulls --use-commit-body --only-merges --between-tags previous_version...next_version
+ - github-changes -o ethereum -r remix-project -a --only-pulls --use-commit-body --only-merges --between-tags previous_version...next_version
  - publish a release in github using the changelog
  - after remix_live is updated, drop the zip (from https://github.com/ethereum/remix-live/) to the release.
 
@@ -40,7 +40,7 @@ This document includes:
  - git checkout origin/master
  - git tag v(version-number) (with "vx.x.x-beta.1")
  - git push --tags
- - github-changes -o ethereum -r remix-ide -a --only-pulls --use-commit-body --only-merges --between-tags previous_version...next_version
+ - github-changes -o ethereum -r remix-project -a --only-pulls --use-commit-body --only-merges --between-tags previous_version...next_version
  - publish a beta release in github using the changelog
  - drop zip file to the beta release (from https://github.com/ethereum/remix-live-alpha)