Resolved merge conflict
Showing
.editorconfig
0 → 100644
.prettierignore
0 → 100644
.prettierrc
0 → 100644
.vscode/extensions.json
0 → 100644
apps/.gitkeep
0 → 100644
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File added
File added
File added
File added
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
{ | { | ||
"name": "new-workspace", | "name": "remix-project", | ||
"version": "0.0.0", | "version": "0.0.0", | ||
"license": "MIT", | "license": "MIT", | ||
"description": "Ethereum Remix Monorepo", | |||
"keywords": [ | |||
"ethereum", | |||
"solidity", | |||
"compiler" | |||
], | |||
"repository": { | |||
"type": "git", | |||
"url": "git+https://github.com/ethereum/remix-project.git" | |||
}, | |||
"author": "@yann300", | |||
"bugs": { | |||
"url": "https://github.com/ethereum/remix-project/issues" | |||
}, | |||
"homepage": "https://github.com/ethereum/remix-project#readme", | |||
"bin": { | |||
"remix-ide": "./apps/remix-ide/bin/remix-ide" | |||
}, | |||
"scripts": { | "scripts": { | ||
"nx": "nx", | "nx": "nx", | ||
"start": "nx serve", | "start": "nx start", | ||
"serve": "nx serve", | |||
"build": "nx build", | "build": "nx build", | ||
"test": "nx test", | "test": "nx test", | ||
"lint": "nx workspace-lint && nx lint", | "lint": "nx lint", | ||
"e2e": "nx e2e", | "e2e": "nx e2e", | ||
"affected:apps": "nx affected:apps", | "affected:apps": "nx affected:apps", | ||
"affected:libs": "nx affected:libs", | "affected:libs": "nx affected:libs", | ||
... | @@ -23,18 +42,186 @@ | ... | @@ -23,18 +42,186 @@ |
"update": "nx migrate latest", | "update": "nx migrate latest", | ||
"workspace-schematic": "nx workspace-schematic", | "workspace-schematic": "nx workspace-schematic", | ||
"dep-graph": "nx dep-graph", | "dep-graph": "nx dep-graph", | ||
"help": "nx help" | "help": "nx help", | ||
"setupremix": "npm run linkremixdebug && npm run linkremixlib && npm run linkremixsolidity && npm run linkremixanalyzer && npm run linkremixtests && npm run linkremixsimulator", | |||
"pullremix": "git clone https://github.com/ethereum/remix", | |||
"linkremixlib": "cd node_modules && rm -rf remix-lib && ln -s ../../remix/remix-lib remix-lib && cd ..", | |||
"linkremixsolidity": "cd node_modules && rm -rf remix-solidity && ln -s ../../remix/remix-solidity remix-solidity && cd ..", | |||
"linkremixtests": "cd node_modules && rm -rf remix-tests && ln -s ../../remix/remix-tests remix-tests && cd ..", | |||
"linkremixdebug": "cd node_modules && rm -rf remix-debug && ln -s ../../remix/remix-debug remix-debug && cd ..", | |||
"linkremixanalyzer": "cd node_modules && rm -rf remix-analyzer && ln -s ../../remix/remix-analyzer remix-analyzer && cd ..", | |||
"linkremixsimulator": "cd node_modules && rm -rf remix-simulator && ln -s ../../remix/remix-simulator remix-simulator && cd ..", | |||
"build_debugger": "browserify apps/remix-ide/src/app/debugger/remix-debugger/index.js -o apps/remix-ide/src/app/debugger/remix-debugger/build/app.js", | |||
"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 soljson.js", | |||
"make-mock-compiler": "node ci/makeMockCompiler.js", | |||
"minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false", | |||
"nightwatch_parallel": "nightwatch -e chrome,firefox --config apps/remix-ide/nightwatch.js", | |||
"nightwatch_local_firefox": "nightwatch --config apps/remix-ide/nightwatch.js --env firefox", | |||
"nightwatch_local_chrome": "nightwatch --config apps/remix-ide/nightwatch.js --env chrome", | |||
"nightwatch_local_ballot": "nightwatch ./apps/remix-ide/test-browser/tests/ballot.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_libraryDeployment": "nightwatch ./apps/remix-ide/test-browser/tests/libraryDeployment.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_solidityImport": "nightwatch ./apps/remix-ide/test-browser/tests/solidityImport.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_recorder": "nightwatch ./apps/remix-ide/test-browser/tests/recorder.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_transactionExecution": "nightwatch ./apps/remix-ide/test-browser/tests/transactionExecution.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_staticAnalysis": "nightwatch ./apps/remix-ide/test-browser/tests/staticAnalysis.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_signingMessage": "nightwatch ./apps/remix-ide/test-browser/tests/signingMessage.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_specialFunctions": "nightwatch ./apps/remix-ide/test-browser/tests/specialFunctions.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_solidityUnitTests": "nightwatch ./apps/remix-ide/test-browser/tests/solidityUnittests.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_remixd": "nightwatch ./apps/remix-ide/test-browser/tests/remixd.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_terminal": "nightwatch ./apps/remix-ide/test-browser/tests/terminal.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_gist": "nightwatch ./apps/remix-ide/test-browser/tests/gist.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_workspace": "nightwatch ./apps/remix-ide/test-browser/tests/workspace.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_defaultLayout": "nightwatch ./apps/remix-ide/test-browser/tests/defaultLayout.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_pluginManager": "nightwatch ./apps/remix-ide/test-browser/tests/pluginManager.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_publishContract": "nightwatch ./apps/remix-ide/test-browser/tests/publishContract.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_generalSettings": "nightwatch ./apps/remix-ide/test-browser/tests/generalSettings.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_fileExplorer": "nightwatch ./apps/remix-ide/test-browser/tests/fileExplorer.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_debugger": "nightwatch ./apps/remix-ide/test-browser/tests/debugger.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_editor": "nightwatch ./apps/remix-ide/test-browser/tests/editor.test.js --config nightwatch.js --env chrome ", | |||
"nightwatch_local_runAndDeploy": "nightwatch ./apps/remix-ide/test-browser/tests/runAndDeploy.js --config 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", | |||
"remixd": "remixd -s ./apps/remix-ide/contracts --remix-ide http://127.0.0.1:8080", | |||
"selenium": "selenium-standalone start", | |||
"selenium-install": "selenium-standalone install", | |||
"sourcemap": "exorcist --root ../ apps/remix-ide/build/app.js.map > apps/remix-ide/build/app.js", | |||
"test-browser": "npm-run-all -lpr selenium downloadsolc_root make-mock-compiler serve browsertest", | |||
"watch": "watchify apps/remix-ide/src/index.js -dv -p browserify-reload -o apps/remix-ide/build/app.js --exclude solc", | |||
"reinstall": "rm ./node-modules/ -rf; rm package-lock.json; rm ./build/ -rf; npm install; npm run build", | |||
"ganache-cli": "npx ganache-cli" | |||
}, | |||
"standard": { | |||
"ignore": [ | |||
"apps/remix-ide/build/", | |||
"apps/remix-ide/src/app/editor/mode-solidity.js", | |||
"apps/remix-ide/soljson.js", | |||
"apps/remix-ide/assets/js/" | |||
], | |||
"parser": "babel-eslint" | |||
}, | |||
"browserify": { | |||
"transform": [ | |||
[ | |||
"babelify", | |||
{ | |||
"sourceMapsAbsolute": false, | |||
"sourceMaps": true, | |||
"plugins": [ | |||
[ | |||
"module:fast-async", | |||
{ | |||
"runtimePattern": null, | |||
"compiler": { | |||
"es7": true, | |||
"noRuntime": true, | |||
"promises": true, | |||
"wrapAwait": true | |||
} | |||
} | |||
], | |||
[ | |||
"module:babel-plugin-yo-yoify" | |||
], | |||
[ | |||
"module:@babel/plugin-transform-object-assign" | |||
] | |||
], | |||
"presets": [ | |||
"@babel/preset-env" | |||
] | |||
} | |||
] | |||
] | |||
}, | |||
"dependencies": { | |||
"@remixproject/engine": "^0.2.3", | |||
"http-server": "^0.11.1", | |||
"remixd": "0.1.8-alpha.10", | |||
"standard": "^8.5.0" | |||
}, | }, | ||
"private": true, | |||
"dependencies": {}, | |||
"devDependencies": { | "devDependencies": { | ||
"@nrwl/workspace": "9.3.0", | "@nrwl/workspace": "9.2.4", | ||
"@types/node": "~8.9.4", | "@types/node": "~8.9.4", | ||
"dotenv": "6.2.0", | |||
"ts-node": "~7.0.0", | "ts-node": "~7.0.0", | ||
"tslint": "~6.0.0", | "tslint": "~6.0.0", | ||
"eslint": "6.8.0", | "eslint": "6.8.0", | ||
"typescript": "~3.8.3", | "typescript": "~3.8.3", | ||
"prettier": "2.0.4" | "prettier": "1.19.1", | ||
"@babel/core": "^7.4.5", | |||
"@babel/plugin-transform-object-assign": "^7.2.0", | |||
"@babel/polyfill": "^7.4.4", | |||
"@babel/preset-env": "^7.4.5", | |||
"@babel/preset-es2015": "latest", | |||
"@babel/preset-es2017": "latest", | |||
"@babel/preset-stage-0": "^7.0.0", | |||
"@babel/register": "^7.4.4", | |||
"@fortawesome/fontawesome-free": "^5.8.1", | |||
"@resolver-engine/imports": "^0.3.0", | |||
"ace-mode-move": "0.0.1", | |||
"ace-mode-solidity": "^0.1.0", | |||
"ace-mode-zokrates": "^1.0.0", | |||
"async": "^2.1.2", | |||
"babel-eslint": "^10.0.0", | |||
"babel-plugin-fast-async": "^6.1.2", | |||
"babel-plugin-transform-object-rest-spread": "^6.26.0", | |||
"babel-plugin-yo-yoify": "^2.0.0", | |||
"babelify": "^10.0.0", | |||
"brace": "^0.8.0", | |||
"browserify": "^16.2.3", | |||
"browserify-reload": "^1.0.3", | |||
"component-type": "^1.2.1", | |||
"copy-text-to-clipboard": "^1.0.4", | |||
"csjs-inject": "^1.0.1", | |||
"csslint": "^1.0.2", | |||
"deep-equal": "^1.0.1", | |||
"dotenv": "^8.2.0", | |||
"ethereumjs-util": "^6.2.0", | |||
"ethers": "^4.0.27", | |||
"events": "^3.0.0", | |||
"execr": "^1.0.1", | |||
"exorcist": "^0.4.0", | |||
"fast-async": "^7.0.6", | |||
"fast-levenshtein": "^2.0.6", | |||
"ganache-cli": "^6.8.1", | |||
"gists": "^1.0.1", | |||
"ipfs-mini": "^1.1.5", | |||
"is-electron": "^2.2.0", | |||
"javascript-serialize": "^1.6.1", | |||
"jquery": "^3.3.1", | |||
"js-base64": "^2.1.9", | |||
"js-beautify": "1.6.14", | |||
"minixhr": "^3.2.2", | |||
"mkdirp": "^0.5.1", | |||
"nanohtml": "^1.6.3", | |||
"nightwatch": "^1.3.5", | |||
"notify-error": "^1.2.0", | |||
"npm-link-local": "^1.1.0", | |||
"npm-merge-driver": "^2.3.5", | |||
"npm-run-all": "^4.0.2", | |||
"onchange": "^3.2.1", | |||
"remix-analyzer": "0.5.2", | |||
"remix-debug": "0.4.4", | |||
"remix-lib": "0.4.29", | |||
"remix-simulator": "0.1.9-beta.5", | |||
"remix-solidity": "0.3.30", | |||
"remix-tabs": "1.0.48", | |||
"remix-tests": "0.1.33", | |||
"remixd": "0.1.8-alpha.10", | |||
"request": "^2.83.0", | |||
"rimraf": "^2.6.1", | |||
"selenium-standalone": "^6.17.0", | |||
"semver": "^6.1.2", | |||
"solc": "^0.6.0", | |||
"swarmgw": "^0.3.1", | |||
"tape": "^4.5.1", | |||
"uglify-js": "^2.8.16", | |||
"vm-browserify": "0.0.4", | |||
"watchify": "^3.9.0", | |||
"web3": "1.2.4", | |||
"webworkify": "^1.2.1", | |||
"yo-yo": "^1.2.2", | |||
"yo-yoify": "^3.7.3" | |||
} | } | ||
} | } |
soljson.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Please
register
or
sign in
to comment