Merge branch 'pluginupdate' of https://github.com/ethereum/remix-project into pluginupdate
bunsenstraat
2 years ago
commit
9e60fff348
@ -0,0 +1,13 @@ |
||||
{ |
||||
"presets": [ |
||||
[ |
||||
"@nrwl/react/babel", { |
||||
"runtime": "automatic" |
||||
|
||||
} |
||||
] |
||||
], |
||||
"plugins": [ |
||||
|
||||
] |
||||
} |
||||
@ -1 +0,0 @@ |
||||
export * from './app/debugger-api'; |
||||
@ -1,32 +1,83 @@ |
||||
const nxWebpack = require('@nrwl/react/plugins/webpack') |
||||
|
||||
module.exports = config => { |
||||
const nxWebpackConfig = nxWebpack(config) |
||||
|
||||
const webpackConfig = { |
||||
...nxWebpackConfig, |
||||
resolve : { |
||||
...nxWebpackConfig.resolve, |
||||
fallback: { |
||||
...nxWebpackConfig.resolve.fallback, |
||||
"crypto": require.resolve("crypto-browserify"), |
||||
"stream": require.resolve("stream-browserify"), |
||||
"http" : require.resolve("stream-http"), |
||||
"https" : require.resolve("https-browserify"), |
||||
"path" : require.resolve("path-browserify"), |
||||
"module": false, |
||||
"fs" : false |
||||
}, |
||||
} |
||||
const { composePlugins, withNx } = require('@nrwl/webpack') |
||||
const webpack = require('webpack') |
||||
const TerserPlugin = require("terser-webpack-plugin") |
||||
const CssMinimizerPlugin = require("css-minimizer-webpack-plugin") |
||||
|
||||
|
||||
// Nx plugins for webpack.
|
||||
module.exports = composePlugins(withNx(), (config) => { |
||||
// Update the webpack config as needed here.
|
||||
// e.g. `config.plugins.push(new MyPlugin())`
|
||||
|
||||
// add fallback for node modules
|
||||
config.resolve.fallback = { |
||||
...config.resolve.fallback, |
||||
"crypto": require.resolve("crypto-browserify"), |
||||
"stream": require.resolve("stream-browserify"), |
||||
"path": require.resolve("path-browserify"), |
||||
"http": require.resolve("stream-http"), |
||||
"https": require.resolve("https-browserify"), |
||||
"constants": require.resolve("constants-browserify"), |
||||
"os": false, //require.resolve("os-browserify/browser"),
|
||||
"timers": false, // require.resolve("timers-browserify"),
|
||||
"zlib": require.resolve("browserify-zlib"), |
||||
"fs": false, |
||||
"module": false, |
||||
"tls": false, |
||||
"net": false, |
||||
"readline": false, |
||||
"child_process": false, |
||||
"buffer": require.resolve("buffer/"), |
||||
"vm": require.resolve('vm-browserify'), |
||||
} |
||||
|
||||
|
||||
if (process.env.NODE_ENV === 'production') { |
||||
return { |
||||
...webpackConfig, |
||||
mode: 'production', |
||||
devtool: 'source-map', |
||||
} |
||||
} else { |
||||
return webpackConfig |
||||
// add externals
|
||||
config.externals = { |
||||
...config.externals, |
||||
solc: 'solc', |
||||
} |
||||
} |
||||
|
||||
// add public path
|
||||
config.output.publicPath = '/' |
||||
|
||||
|
||||
|
||||
// add copy & provide plugin
|
||||
config.plugins.push( |
||||
new webpack.ProvidePlugin({ |
||||
Buffer: ['buffer', 'Buffer'], |
||||
url: ['url', 'URL'], |
||||
process: 'process/browser', |
||||
}) |
||||
) |
||||
|
||||
// souce-map loader
|
||||
config.module.rules.push({ |
||||
test: /\.js$/, |
||||
use: ["source-map-loader"], |
||||
enforce: "pre" |
||||
}) |
||||
|
||||
config.ignoreWarnings = [/Failed to parse source map/] // ignore source-map-loader warnings
|
||||
|
||||
|
||||
// set minimizer
|
||||
config.optimization.minimizer = [ |
||||
new TerserPlugin({ |
||||
parallel: true, |
||||
terserOptions: { |
||||
ecma: 2015, |
||||
compress: false, |
||||
mangle: false, |
||||
format: { |
||||
comments: false, |
||||
}, |
||||
}, |
||||
extractComments: false, |
||||
}), |
||||
new CssMinimizerPlugin(), |
||||
]; |
||||
|
||||
return config; |
||||
}); |
||||
|
||||
@ -0,0 +1,23 @@ |
||||
{ |
||||
"name": "remix-ide-e2e", |
||||
"license": "MIT", |
||||
"engines": { |
||||
"node": "^14.17.6", |
||||
"npm": "^6.14.15" |
||||
}, |
||||
"dependencies": { |
||||
"@openzeppelin/contracts": "^4.7.3", |
||||
"@openzeppelin/contracts-upgradeable": "^4.8.1", |
||||
"@openzeppelin/upgrades-core": "^1.22.0", |
||||
"@openzeppelin/wizard": "^0.1.1", |
||||
"@remix-project/remixd": "../../dist/libs/remixd", |
||||
"deep-equal": "^1.0.1", |
||||
"ganache-cli": "^6.8.1", |
||||
"selenium-standalone": "^8.2.3", |
||||
"tree-kill": "^1.2.2" |
||||
}, |
||||
"devDependencies": { |
||||
"http-server": "^14.1.1", |
||||
"nightwatch": "2.3" |
||||
} |
||||
} |
||||
@ -1,4 +1,9 @@ |
||||
{ |
||||
"presets": ["@nrwl/react/babel"], |
||||
"plugins": [] |
||||
"presets": ["@babel/preset-env", ["@babel/preset-react", |
||||
{"runtime": "automatic"} |
||||
]], |
||||
"plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-transform-runtime", "@babel/plugin-proposal-nullish-coalescing-operator"], |
||||
"ignore": [ |
||||
"**/node_modules/**" |
||||
] |
||||
} |
||||
|
||||
@ -0,0 +1,21 @@ |
||||
const { composePlugins, withNx } = require('@nrwl/webpack') |
||||
|
||||
// Nx plugins for webpack.
|
||||
module.exports = composePlugins(withNx(), (config) => { |
||||
// Update the webpack config as needed here.
|
||||
// e.g. `config.plugins.push(new MyPlugin())`
|
||||
|
||||
// add public path
|
||||
config.output.publicPath = '/' |
||||
|
||||
// souce-map loader
|
||||
config.module.rules.push({ |
||||
test: /\.js$/, |
||||
use: ["source-map-loader"], |
||||
enforce: "pre" |
||||
}) |
||||
|
||||
config.ignoreWarnings = [/Failed to parse source map/] // ignore source-map-loader warnings
|
||||
|
||||
return config; |
||||
}); |
||||
File diff suppressed because it is too large
Load Diff
@ -1,26 +0,0 @@ |
||||
#!/usr/bin/env bash |
||||
|
||||
set -e |
||||
|
||||
BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}} |
||||
echo "$BUILD_ID" |
||||
TEST_EXITCODE=0 |
||||
|
||||
yarn build etherscan |
||||
yarn run serve:production & |
||||
npx nx serve etherscan & |
||||
|
||||
sleep 5 |
||||
|
||||
yarn run build:e2e |
||||
|
||||
TESTFILES=$(grep -IRiL "\'@disabled\': \?true" "dist/apps/remix-ide-e2e/src/tests" | grep "etherscan_api" | sort | circleci tests split ) |
||||
for TESTFILE in $TESTFILES; do |
||||
npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=chrome || TEST_EXITCODE=1 |
||||
done |
||||
|
||||
echo "$TEST_EXITCODE" |
||||
if [ "$TEST_EXITCODE" -eq 1 ] |
||||
then |
||||
exit 1 |
||||
fi |
||||
@ -1,26 +0,0 @@ |
||||
#!/usr/bin/env bash |
||||
|
||||
set -e |
||||
|
||||
BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}} |
||||
echo "$BUILD_ID" |
||||
TEST_EXITCODE=0 |
||||
|
||||
yarn build vyper |
||||
yarn run serve:production & |
||||
npx nx serve vyper & |
||||
|
||||
sleep 5 |
||||
|
||||
yarn run build:e2e |
||||
|
||||
TESTFILES=$(grep -IRiL "\'@disabled\': \?true" "dist/apps/remix-ide-e2e/src/tests" | grep "vyper_api" | sort | circleci tests split ) |
||||
for TESTFILE in $TESTFILES; do |
||||
npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=chrome || TEST_EXITCODE=1 |
||||
done |
||||
|
||||
echo "$TEST_EXITCODE" |
||||
if [ "$TEST_EXITCODE" -eq 1 ] |
||||
then |
||||
exit 1 |
||||
fi |
||||
|
After Width: | Height: | Size: 16 KiB |
@ -1,45 +0,0 @@ |
||||
<!DOCTYPE html> |
||||
|
||||
<html> |
||||
|
||||
<head> |
||||
<meta charset="utf-8"> |
||||
<!-- |
||||
The MIT License (MIT) |
||||
Copyright (c) 2014, 2015, the individual contributors |
||||
Permission is hereby granted, free of charge, to any person obtaining a copy |
||||
of this software and associated documentation files (the "Software"), to deal |
||||
in the Software without restriction, including without limitation the rights |
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
||||
copies of the Software, and to permit persons to whom the Software is |
||||
furnished to do so, subject to the following conditions: |
||||
The above copyright notice and this permission notice shall be included in |
||||
all copies or substantial portions of the Software. |
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
||||
THE SOFTWARE. |
||||
--> |
||||
<meta http-equiv="X-UA-Compatible" content="chrome=1"> |
||||
<title>Remix - Ethereum IDE</title> |
||||
<link rel="stylesheet" href="assets/css/pygment_trac.css"> |
||||
<link rel="icon" type="x-icon" href="assets/img/icon.png"> |
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/4.1.0/introjs.min.css"> |
||||
<link rel="stylesheet" integrity="ha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" |
||||
crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css"> |
||||
<script src="assets/js/browserfs.min.js"></script> |
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> |
||||
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/2.7.0/introjs.min.css"> |
||||
</head> |
||||
|
||||
<body> |
||||
|
||||
<div id="root"></div> |
||||
<script src="https://kit.fontawesome.com/41dd021e94.js" crossorigin="anonymous"></script> |
||||
<script type="text/javascript" src="assets/js/intro.min.js"></script> |
||||
</body> |
||||
|
||||
</html> |
||||
@ -1,4 +1,9 @@ |
||||
{ |
||||
"presets": ["@nrwl/react/babel"], |
||||
"plugins": [] |
||||
"presets": ["@babel/preset-env", ["@babel/preset-react", |
||||
{"runtime": "automatic"} |
||||
]], |
||||
"plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-transform-runtime", "@babel/plugin-proposal-nullish-coalescing-operator"], |
||||
"ignore": [ |
||||
"**/node_modules/**" |
||||
] |
||||
} |
||||
|
||||
@ -1 +0,0 @@ |
||||
export * from './app/compiler-api' |
||||
@ -1,44 +1,93 @@ |
||||
const nxWebpack = require('@nrwl/react/plugins/webpack') |
||||
const { composePlugins, withNx } = require('@nrwl/webpack') |
||||
const { withReact } = require('@nrwl/react') |
||||
const webpack = require('webpack') |
||||
const version = require('../../package.json').version |
||||
const fs = require('fs') |
||||
const TerserPlugin = require("terser-webpack-plugin") |
||||
const CssMinimizerPlugin = require("css-minimizer-webpack-plugin") |
||||
|
||||
module.exports = config => { |
||||
const nxWebpackConfig = nxWebpack(config) |
||||
const webpackConfig = { |
||||
...nxWebpackConfig, |
||||
resolve: { |
||||
...nxWebpackConfig.resolve, |
||||
fallback: { |
||||
...nxWebpackConfig.resolve.fallback, |
||||
"crypto": require.resolve("crypto-browserify"), |
||||
"stream": require.resolve("stream-browserify"), |
||||
"path": require.resolve("path-browserify"), |
||||
"http": require.resolve("stream-http"), |
||||
"https": require.resolve("https-browserify"), |
||||
"zlib": require.resolve("browserify-zlib"), |
||||
"fs": false, |
||||
"module": false, |
||||
"tls": false, |
||||
"net": false, |
||||
"readline": false, |
||||
"child_process": false, |
||||
"buffer": require.resolve("buffer/"), |
||||
}, |
||||
}, |
||||
plugins: [ |
||||
...nxWebpackConfig.plugins, |
||||
new webpack.ProvidePlugin({ |
||||
Buffer: ['buffer', 'Buffer'], |
||||
}), |
||||
], |
||||
const versionData = { |
||||
version: version, |
||||
timestamp: Date.now(), |
||||
mode: process.env.NODE_ENV === 'production' ? 'production' : 'development' |
||||
} |
||||
|
||||
fs.writeFileSync('./apps/remix-ide/src/assets/version.json', JSON.stringify(versionData)) |
||||
|
||||
// Nx plugins for webpack.
|
||||
module.exports = composePlugins(withNx(), withReact(), (config) => { |
||||
// Update the webpack config as needed here.
|
||||
// e.g. `config.plugins.push(new MyPlugin())`
|
||||
|
||||
// add fallback for node modules
|
||||
config.resolve.fallback = { |
||||
...config.resolve.fallback, |
||||
"crypto": require.resolve("crypto-browserify"), |
||||
"stream": require.resolve("stream-browserify"), |
||||
"path": require.resolve("path-browserify"), |
||||
"http": require.resolve("stream-http"), |
||||
"https": require.resolve("https-browserify"), |
||||
"constants": require.resolve("constants-browserify"), |
||||
"os": false, //require.resolve("os-browserify/browser"),
|
||||
"timers": false, // require.resolve("timers-browserify"),
|
||||
"zlib": require.resolve("browserify-zlib"), |
||||
"fs": false, |
||||
"module": false, |
||||
"tls": false, |
||||
"net": false, |
||||
"readline": false, |
||||
"child_process": false, |
||||
"buffer": require.resolve("buffer/"), |
||||
"vm": require.resolve('vm-browserify'), |
||||
} |
||||
|
||||
|
||||
if (process.env.NODE_ENV === 'production') { |
||||
return { |
||||
...webpackConfig, |
||||
mode: 'production', |
||||
devtool: 'source-map', |
||||
} |
||||
} else { |
||||
return webpackConfig |
||||
// add externals
|
||||
config.externals = { |
||||
...config.externals, |
||||
solc: 'solc', |
||||
} |
||||
} |
||||
|
||||
// add public path
|
||||
config.output.publicPath = '/' |
||||
|
||||
|
||||
|
||||
// add copy & provide plugin
|
||||
config.plugins.push( |
||||
new webpack.ProvidePlugin({ |
||||
Buffer: ['buffer', 'Buffer'], |
||||
url: ['url', 'URL'], |
||||
process: 'process/browser', |
||||
}) |
||||
) |
||||
|
||||
// souce-map loader
|
||||
config.module.rules.push({ |
||||
test: /\.js$/, |
||||
use: ["source-map-loader"], |
||||
enforce: "pre" |
||||
}) |
||||
|
||||
config.ignoreWarnings = [/Failed to parse source map/] // ignore source-map-loader warnings
|
||||
|
||||
|
||||
// set minimizer
|
||||
config.optimization.minimizer = [ |
||||
new TerserPlugin({ |
||||
parallel: true, |
||||
terserOptions: { |
||||
ecma: 2015, |
||||
compress: false, |
||||
mangle: false, |
||||
format: { |
||||
comments: false, |
||||
}, |
||||
}, |
||||
extractComments: false, |
||||
}), |
||||
new CssMinimizerPlugin(), |
||||
]; |
||||
|
||||
return config; |
||||
}); |
||||
|
||||
@ -1,31 +1,83 @@ |
||||
const nxWebpack = require('@nrwl/react/plugins/webpack') |
||||
|
||||
module.exports = config => { |
||||
const nxWebpackConfig = nxWebpack(config) |
||||
const webpackConfig = { |
||||
...nxWebpackConfig, |
||||
resolve : { |
||||
...nxWebpackConfig.resolve, |
||||
fallback: { |
||||
...nxWebpackConfig.resolve.fallback, |
||||
"crypto": require.resolve("crypto-browserify"), |
||||
"stream": require.resolve("stream-browserify"), |
||||
"http" : require.resolve("stream-http"), |
||||
"https" : require.resolve("https-browserify"), |
||||
"path" : require.resolve("path-browserify"), |
||||
"module": false, |
||||
"fs" : false |
||||
}, |
||||
} |
||||
const { composePlugins, withNx } = require('@nrwl/webpack') |
||||
const webpack = require('webpack') |
||||
const TerserPlugin = require("terser-webpack-plugin") |
||||
const CssMinimizerPlugin = require("css-minimizer-webpack-plugin") |
||||
|
||||
|
||||
// Nx plugins for webpack.
|
||||
module.exports = composePlugins(withNx(), (config) => { |
||||
// Update the webpack config as needed here.
|
||||
// e.g. `config.plugins.push(new MyPlugin())`
|
||||
|
||||
// add fallback for node modules
|
||||
config.resolve.fallback = { |
||||
...config.resolve.fallback, |
||||
"crypto": require.resolve("crypto-browserify"), |
||||
"stream": require.resolve("stream-browserify"), |
||||
"path": require.resolve("path-browserify"), |
||||
"http": require.resolve("stream-http"), |
||||
"https": require.resolve("https-browserify"), |
||||
"constants": require.resolve("constants-browserify"), |
||||
"os": false, //require.resolve("os-browserify/browser"),
|
||||
"timers": false, // require.resolve("timers-browserify"),
|
||||
"zlib": require.resolve("browserify-zlib"), |
||||
"fs": false, |
||||
"module": false, |
||||
"tls": false, |
||||
"net": false, |
||||
"readline": false, |
||||
"child_process": false, |
||||
"buffer": require.resolve("buffer/"), |
||||
"vm": require.resolve('vm-browserify'), |
||||
} |
||||
|
||||
|
||||
if (process.env.NODE_ENV === 'production') { |
||||
return { |
||||
...webpackConfig, |
||||
mode: 'production', |
||||
devtool: 'source-map', |
||||
} |
||||
} else { |
||||
return webpackConfig |
||||
// add externals
|
||||
config.externals = { |
||||
...config.externals, |
||||
solc: 'solc', |
||||
} |
||||
} |
||||
|
||||
// add public path
|
||||
config.output.publicPath = '/' |
||||
|
||||
|
||||
|
||||
// add copy & provide plugin
|
||||
config.plugins.push( |
||||
new webpack.ProvidePlugin({ |
||||
Buffer: ['buffer', 'Buffer'], |
||||
url: ['url', 'URL'], |
||||
process: 'process/browser', |
||||
}) |
||||
) |
||||
|
||||
// souce-map loader
|
||||
config.module.rules.push({ |
||||
test: /\.js$/, |
||||
use: ["source-map-loader"], |
||||
enforce: "pre" |
||||
}) |
||||
|
||||
config.ignoreWarnings = [/Failed to parse source map/] // ignore source-map-loader warnings
|
||||
|
||||
|
||||
// set minimizer
|
||||
config.optimization.minimizer = [ |
||||
new TerserPlugin({ |
||||
parallel: true, |
||||
terserOptions: { |
||||
ecma: 2015, |
||||
compress: false, |
||||
mangle: false, |
||||
format: { |
||||
comments: false, |
||||
}, |
||||
}, |
||||
extractComments: false, |
||||
}), |
||||
new CssMinimizerPlugin(), |
||||
]; |
||||
|
||||
return config; |
||||
}); |
||||
|
||||
@ -1,4 +0,0 @@ |
||||
|
||||
const nxPreset = require('@nrwl/jest/preset'); |
||||
|
||||
module.exports = { ...nxPreset } |
||||
@ -1,7 +1,7 @@ |
||||
{ |
||||
"extends": "../../tsconfig.base.json", |
||||
"compilerOptions": { |
||||
"types": ["jest", "node"] |
||||
"types": ["node"] |
||||
}, |
||||
"include": ["**/*.ts"] |
||||
} |
||||
@ -1,26 +0,0 @@ |
||||
module.exports = { |
||||
name: 'remix-solidity', |
||||
preset: '../../jest.config.js', |
||||
verbose: true, |
||||
silent: false, // Silent console messages, specially the 'remix-simulator' ones
|
||||
transform: { |
||||
'^.+\\.[tj]sx?$': ['ts-jest', |
||||
{ |
||||
useESM: true, |
||||
}] |
||||
}, |
||||
transformIgnorePatterns: ["/node_modules/", "/dist/", "\\.pnp\\.[^\\/]+$"], |
||||
rootDir: "./", |
||||
testTimeout: 40000, |
||||
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html', 'json'], |
||||
// Coverage
|
||||
collectCoverage: true, |
||||
coverageReporters: ['text', 'text-summary'], |
||||
collectCoverageFrom: [ |
||||
"**/*.ts", |
||||
"!**/sol/**", |
||||
"!src/types.ts", |
||||
"!src/logger.ts" |
||||
], |
||||
coverageDirectory: '../../coverage/libs/remix-solidity' |
||||
}; |
||||
@ -1,7 +1,7 @@ |
||||
{ |
||||
"extends": "../../tsconfig.base.json", |
||||
"compilerOptions": { |
||||
"types": ["jest", "node"], |
||||
"types": ["node"], |
||||
}, |
||||
"include": ["**/*.ts"] |
||||
} |
||||
@ -1,2 +1,3 @@ |
||||
export * from './lib/debugger-ui' |
||||
export * from './lib/idebugger-api' |
||||
export * from './lib/api/debugger-api' |
||||
@ -1 +1,2 @@ |
||||
export * from './lib/remix-ui-editor' |
||||
export { default as monacoTypes } from './types/monaco' |
||||
@ -1,3 +1,4 @@ |
||||
export * from './lib/solidity-compiler' |
||||
export * from './lib/logic' |
||||
export * from './lib/logic/flattenerUtilities' |
||||
export * from './lib/api/compiler-api' |
||||
Loading…
Reference in new issue