fix(rn): web display warnings

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Aug 22, 2018 · d18c696 · d18c696
1 parent 6ae6b1b
commit d18c696
Show file tree

Hide file tree

Showing 7 changed files with 513 additions and 511 deletions.
diff --git a/client/react-native/.babelrc b/client/react-native/.babelrc
@@ -1,5 +1,5 @@
 {
-  "presets": ["react-native"],
+  "presets": ["react-native", "react-app"],
   "plugins": [
     "@babel/plugin-proposal-function-bind",
 
@@ -20,5 +20,6 @@
     "@babel/plugin-syntax-import-meta",
     ["@babel/plugin-proposal-class-properties", { "loose": false }],
     "@babel/plugin-proposal-json-strings"
+
   ]
 }
diff --git a/client/react-native/.eslintrc b/client/react-native/.eslintrc
@@ -3,7 +3,8 @@
   "extends": [
     "eslint:recommended",
     "standard",
-    "standard-react"
+    "standard-react",
+    "react-app"
   ],
   "plugins": [
     "jsx-a11y",

diff --git a/client/react-native/common/.gitkeep b/client/react-native/common/.gitkeep
diff --git a/client/react-native/package.json b/client/react-native/package.json
@@ -38,12 +38,12 @@
     "babel-plugin-react-native-web": "^0.8.9",
     "babel-plugin-relay": "^1.6.2",
     "babel-plugin-transform-export-extensions": "^6.22.0",
-    "babel-preset-react-app": "4.0.0-next.3e165448",
+    "babel-preset-react-app": "^4.0.0-next.3e165448",
     "babel-preset-react-native": "^5.0.2",
     "eslint": "^5.2.0",
     "eslint-config-prettier": "^3.0.1",
     "eslint-config-prettier-standard": "^2.0.0",
-    "eslint-config-react-app": "^2.1.0",
+    "eslint-config-react-app": "^3.0.0-next.3e165448",
     "eslint-config-standard": "^11.0.0",
     "eslint-config-standard-react": "^6.0.0",
     "eslint-config-typescript": "^1.1.0",

diff --git a/client/react-native/web/config/paths.js b/client/react-native/web/config/paths.js
@@ -1,4 +1,3 @@
-'use strict'
 
 const path = require('path')
 const fs = require('fs')
@@ -57,10 +56,7 @@ module.exports = {
 
 let checkForMonorepo = true
 
-module.exports.srcPaths = [
-  module.exports.appSrc + '/web',
-  module.exports.appSrc + '/common'
-]
+module.exports.srcPaths = [module.exports.appSrc + '/common']
 
 module.exports.useYarn = fs.existsSync(
   path.join(module.exports.appPath, 'yarn.lock')

diff --git a/client/react-native/web/config/webpack.config.dev.js b/client/react-native/web/config/webpack.config.dev.js
@@ -1,8 +1,7 @@
-'use strict'
-
 const autoprefixer = require('autoprefixer')
 const path = require('path')
 const webpack = require('webpack')
+const eslintFormatter = require('react-dev-utils/eslintFormatter')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin')
 const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin')
@@ -166,6 +165,13 @@ module.exports = {
         enforce: 'pre',
         use: [
           {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+              baseConfig: {
+                extends: [require.resolve('eslint-config-react-app')]
+              }
+            },
             loader: require.resolve('eslint-loader')
           }
         ],