Skip to content

Commit

Permalink
Merge pull request #103 from poanetwork/feature/#87-new-style-for-xda…
Browse files Browse the repository at this point in the history
…i-network

(Feature) New style for xDai network
  • Loading branch information
varasev committed Jan 30, 2019
2 parents 20e90ec + cbdfd75 commit 90b3c7e
Show file tree
Hide file tree
Showing 228 changed files with 6,405 additions and 2,599 deletions.
16 changes: 0 additions & 16 deletions .eslintrc

This file was deleted.

32 changes: 32 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"extends": [
"react-app",
"plugin:prettier/recommended"
],
"plugins": [
"dependencies",
"prettier"
],
"rules": {
"no-control-regex": 0,
"dependencies/no-cycles": "error",
"dependencies/no-unresolved": [
"error",
{
"ignore": [
"web3"
]
}
]
},
"settings": {
"import/resolver": {
"node": {
"extensions": [
".js",
".jsx"
]
}
}
}
}
3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ build_scripts
config
public
scripts
submodules
*.js
submodules
9 changes: 5 additions & 4 deletions config/webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
const eslintFormatter = require('react-dev-utils/eslintFormatter');
const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
const getClientEnvironment = require('./env');
Expand Down Expand Up @@ -184,9 +185,9 @@ module.exports = {
use: [
{
options: {
formatter: require.resolve('react-dev-utils/eslintFormatter'),
formatter: eslintFormatter,
eslintPath: require.resolve('eslint'),

},
loader: require.resolve('eslint-loader'),
},
Expand Down Expand Up @@ -219,7 +220,7 @@ module.exports = {
customize: require.resolve(
'babel-preset-react-app/webpack-overrides'
),

plugins: [
[
require.resolve('babel-plugin-named-asset-import'),
Expand Down Expand Up @@ -259,7 +260,7 @@ module.exports = {
cacheDirectory: true,
// Don't waste time on Gzipping the cache
cacheCompression: false,

// If an error happens in a package, it's possible to be
// because it was compiled. Thus, we don't want the browser
// debugger to show the original code. Instead, the code
Expand Down
Loading

0 comments on commit 90b3c7e

Please sign in to comment.