Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/compiler/compiler-artefacts.js
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/compiler/compiler-imports.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/components/hidden-panel.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/components/main-panel.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/components/side-panel.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/components/vertical-icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/editor/contextualListener.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/editor/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/files/compiler-metadata.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/files/fileManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/files/remixd-handle.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/panels/file-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 4 additions & 5 deletions apps/remix-ide/src/app/panels/terminal.js
Original file line number Diff line number Diff line change
@@ -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')
Expand All @@ -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 = []

Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/analysis-tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/compile-tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/debugger-tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/network-module.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/settings-tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/theme-module.js
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/web3-provider.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/udapp/run-tab.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/ui/landing-page/landing-page.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions apps/remix-ide/src/lib/offsetToLineColumnConverter.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
3 changes: 2 additions & 1 deletion apps/remix-ide/test-browser/helpers/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
}
})
Expand Down
2 changes: 1 addition & 1 deletion libs/remix-tests/src/run.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading