From 026c40ea2cf579259c4d58f1f28a0989db709250 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 13 Aug 2020 10:44:31 +0200 Subject: [PATCH] bumped version to 0.10.4. Using root package.json from now on --- apps/remix-ide/src/app/compiler/compiler-artefacts.js | 2 +- apps/remix-ide/src/app/compiler/compiler-imports.js | 2 +- .../compiler/compiler-sourceVerifier-fetchAndCompile.js | 2 +- apps/remix-ide/src/app/components/hidden-panel.js | 2 +- apps/remix-ide/src/app/components/main-panel.js | 2 +- .../src/app/components/plugin-manager-component.js | 2 +- apps/remix-ide/src/app/components/side-panel.js | 2 +- apps/remix-ide/src/app/components/vertical-icons.js | 2 +- apps/remix-ide/src/app/editor/contextualListener.js | 2 +- apps/remix-ide/src/app/editor/editor.js | 2 +- apps/remix-ide/src/app/files/compiler-metadata.js | 2 +- apps/remix-ide/src/app/files/fileManager.js | 2 +- apps/remix-ide/src/app/files/remixd-handle.js | 2 +- apps/remix-ide/src/app/panels/file-panel.js | 2 +- apps/remix-ide/src/app/panels/terminal.js | 9 ++++----- apps/remix-ide/src/app/tabs/analysis-tab.js | 2 +- apps/remix-ide/src/app/tabs/compile-tab.js | 2 +- apps/remix-ide/src/app/tabs/debugger-tab.js | 2 +- apps/remix-ide/src/app/tabs/network-module.js | 2 +- apps/remix-ide/src/app/tabs/settings-tab.js | 2 +- apps/remix-ide/src/app/tabs/theme-module.js | 2 +- apps/remix-ide/src/app/tabs/web3-provider.js | 2 +- apps/remix-ide/src/app/udapp/run-tab.js | 2 +- apps/remix-ide/src/app/ui/landing-page/landing-page.js | 2 +- apps/remix-ide/src/lib/offsetToLineColumnConverter.js | 4 ++-- libs/remix-tests/src/run.ts | 2 +- package.json | 2 +- 27 files changed, 31 insertions(+), 32 deletions(-) diff --git a/apps/remix-ide/src/app/compiler/compiler-artefacts.js b/apps/remix-ide/src/app/compiler/compiler-artefacts.js index 8895859c9b..327c9c3e36 100644 --- a/apps/remix-ide/src/app/compiler/compiler-artefacts.js +++ b/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 = { diff --git a/apps/remix-ide/src/app/compiler/compiler-imports.js b/apps/remix-ide/src/app/compiler/compiler-imports.js index 244d1c4f31..343ca2875e 100644 --- a/apps/remix-ide/src/app/compiler/compiler-imports.js +++ b/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', 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 9d8fec7e10..b03ef1f513 100644 --- a/apps/remix-ide/src/app/compiler/compiler-sourceVerifier-fetchAndCompile.js +++ b/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' diff --git a/apps/remix-ide/src/app/components/hidden-panel.js b/apps/remix-ide/src/app/components/hidden-panel.js index 048df1fd51..d3724f9274 100644 --- a/apps/remix-ide/src/app/components/hidden-panel.js +++ b/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') diff --git a/apps/remix-ide/src/app/components/main-panel.js b/apps/remix-ide/src/app/components/main-panel.js index 082ccb61c5..53b6c0f94c 100644 --- a/apps/remix-ide/src/app/components/main-panel.js +++ b/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') diff --git a/apps/remix-ide/src/app/components/plugin-manager-component.js b/apps/remix-ide/src/app/components/plugin-manager-component.js index 3772b55a9b..9538182662 100644 --- a/apps/remix-ide/src/app/components/plugin-manager-component.js +++ b/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` diff --git a/apps/remix-ide/src/app/components/side-panel.js b/apps/remix-ide/src/app/components/side-panel.js index 2a0623ebac..411b40f416 100644 --- a/apps/remix-ide/src/app/components/side-panel.js +++ b/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') diff --git a/apps/remix-ide/src/app/components/vertical-icons.js b/apps/remix-ide/src/app/components/vertical-icons.js index ff64bb3f57..6e8ea6a370 100644 --- a/apps/remix-ide/src/app/components/vertical-icons.js +++ b/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') diff --git a/apps/remix-ide/src/app/editor/contextualListener.js b/apps/remix-ide/src/app/editor/contextualListener.js index f30018143a..8db324be53 100644 --- a/apps/remix-ide/src/app/editor/contextualListener.js +++ b/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', diff --git a/apps/remix-ide/src/app/editor/editor.js b/apps/remix-ide/src/app/editor/editor.js index da49867e25..49922c8ba0 100644 --- a/apps/remix-ide/src/app/editor/editor.js +++ b/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') diff --git a/apps/remix-ide/src/app/files/compiler-metadata.js b/apps/remix-ide/src/app/files/compiler-metadata.js index fe1f66f67c..b1dd9239e3 100644 --- a/apps/remix-ide/src/app/files/compiler-metadata.js +++ b/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', diff --git a/apps/remix-ide/src/app/files/fileManager.js b/apps/remix-ide/src/app/files/fileManager.js index 5ab6ed3320..d2d21b6ac3 100644 --- a/apps/remix-ide/src/app/files/fileManager.js +++ b/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) diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js index 81e6b5b458..bcf112779c 100644 --- a/apps/remix-ide/src/app/files/remixd-handle.js +++ b/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') diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js index 532591daec..8927981620 100644 --- a/apps/remix-ide/src/app/panels/file-panel.js +++ b/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 diff --git a/apps/remix-ide/src/app/panels/terminal.js b/apps/remix-ide/src/app/panels/terminal.js index 1c10850e11..95b5b0929b 100644 --- a/apps/remix-ide/src/app/panels/terminal.js +++ b/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` -
- Welcome to Remix ${packageV.version} -

+
- Welcome to Remix ${packageJson.version} -

You can use this terminal for:
  • Checking transactions details and start debugging.
  • diff --git a/apps/remix-ide/src/app/tabs/analysis-tab.js b/apps/remix-ide/src/app/tabs/analysis-tab.js index 78b45b9c20..3ff067f96a 100644 --- a/apps/remix-ide/src/app/tabs/analysis-tab.js +++ b/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', diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js index 9a61b6d0c1..42413443ae 100644 --- a/apps/remix-ide/src/app/tabs/compile-tab.js +++ b/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' diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js index 65b1322b8a..8a05c979ee 100644 --- a/apps/remix-ide/src/app/tabs/debugger-tab.js +++ b/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', diff --git a/apps/remix-ide/src/app/tabs/network-module.js b/apps/remix-ide/src/app/tabs/network-module.js index 2174040135..cb3e465044 100644 --- a/apps/remix-ide/src/app/tabs/network-module.js +++ b/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', diff --git a/apps/remix-ide/src/app/tabs/settings-tab.js b/apps/remix-ide/src/app/tabs/settings-tab.js index c44a1101d8..8b5ddf7863 100644 --- a/apps/remix-ide/src/app/tabs/settings-tab.js +++ b/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', diff --git a/apps/remix-ide/src/app/tabs/theme-module.js b/apps/remix-ide/src/app/tabs/theme-module.js index c84f1961d4..e6adedbc32 100644 --- a/apps/remix-ide/src/app/tabs/theme-module.js +++ b/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 = [ diff --git a/apps/remix-ide/src/app/tabs/web3-provider.js b/apps/remix-ide/src/app/tabs/web3-provider.js index 88976e874e..4ab36888ef 100644 --- a/apps/remix-ide/src/app/tabs/web3-provider.js +++ b/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', diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js index d8b9e3f3d8..4c1978bf87 100644 --- a/apps/remix-ide/src/app/udapp/run-tab.js +++ b/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') diff --git a/apps/remix-ide/src/app/ui/landing-page/landing-page.js b/apps/remix-ide/src/app/ui/landing-page/landing-page.js index c62993ca32..4e4967e2d3 100644 --- a/apps/remix-ide/src/app/ui/landing-page/landing-page.js +++ b/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` diff --git a/apps/remix-ide/src/lib/offsetToLineColumnConverter.js b/apps/remix-ide/src/lib/offsetToLineColumnConverter.js index 001dcbcbe2..e0f893a0e2 100644 --- a/apps/remix-ide/src/lib/offsetToLineColumnConverter.js +++ b/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', diff --git a/libs/remix-tests/src/run.ts b/libs/remix-tests/src/run.ts index 7422ee2a43..97262f89cb 100644 --- a/libs/remix-tests/src/run.ts +++ b/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) diff --git a/package.json b/package.json index 57d4ccc93c..3176fd8b9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "remix-project", - "version": "0.0.0", + "version": "0.10.4", "license": "MIT", "description": "Ethereum Remix Monorepo", "keywords": [