Update fether-react to create-react-app 2 (closes #212)

axelchalon · axelchalon · commit 8b7d9edd6fc9 · 2018-12-14T17:37:34.000+01:00
diff --git a/package.json b/package.json
@@ -39,15 +39,15 @@
     "yarn": "^1.4.2"
   },
   "scripts": {
-    "build": "lerna run build",
+    "build": "cross-env SKIP_PREFLIGHT_CHECK=true lerna run build",
     "preelectron": "yarn build",
-    "electron": "cd packages/fether-electron && yarn electron",
+    "electron": "cd packages/fether-electron && cross-env SKIP_PREFLIGHT_CHECK=true yarn electron",
     "lint-files": "./scripts/lint-files.sh",
     "lint": "yarn lint-files '**/*.{js,ts}'",
     "prepackage": "yarn build",
     "package": "cd packages/fether-electron && yarn package",
     "release": "cd packages/fether-electron && yarn release",
-    "start": "npm-run-all -l -p start-*",
+    "start": "cross-env SKIP_PREFLIGHT_CHECK=true npm-run-all -l -p start-*",
     "start-electron": "cd packages/fether-electron && yarn start",
     "start-react": "cd packages/fether-react && yarn start",
     "start-ui": "cd packages/fether-ui && yarn start",
@@ -59,11 +59,11 @@
     }
   },
   "devDependencies": {
-    "babel-eslint": "^8.2.5",
+    "babel-eslint": "^9.0.0",
     "husky": "^1.0.0-rc.13",
     "lerna": "^2.11.0",
     "npm-run-all": "^4.1.2",
     "prettier": "^1.14.2",
-    "semistandard": "^12.0.1"
+    "semistandard": "^13.0.1"
   }
 }
diff --git a/packages/fether-react/config-overrides.js b/packages/fether-react/config-overrides.js
@@ -3,7 +3,9 @@ const { injectBabelPlugin } = require('react-app-rewired');
 /* config-overrides.js */
 module.exports = function override (config) {
   // use the MobX rewire to use @decorators
-  config = injectBabelPlugin('transform-decorators-legacy', config);
-
+  config = injectBabelPlugin(
+    ['@babel/proposal-decorators', { legacy: true }],
+    config
+  );
   return config;
 };
diff --git a/packages/fether-react/package.json b/packages/fether-react/package.json
@@ -60,16 +60,22 @@
     "react-markdown": "^3.3.4",
     "react-resize-detector": "^3.0.1",
     "react-router-dom": "^4.2.2",
-    "react-scripts": "1.1.4",
+    "react-scripts": "^2.1.1",
     "recompose": "^0.27.1",
     "rxjs": "^6.2.0"
   },
   "devDependencies": {
-    "babel-plugin-transform-decorators-legacy": "^1.3.5",
+    "@babel/plugin-proposal-decorators": "^7.2.0",
     "capitalize": "^1.0.0",
     "node-sass": "^4.9.0",
     "node-sass-chokidar": "^1.2.2",
     "npm-run-all": "^4.1.2",
     "react-app-rewired": "^1.5.2"
-  }
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }
diff --git a/packages/fether-react/public/index.html b/packages/fether-react/public/index.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <meta http-equiv="Content-Security-Policy" content="default-src 'self';connect-src file: http: https: ws: wss:;img-src 'self' 'unsafe-inline' file: data: blob: http: https:;style-src 'unsafe-inline' file:;">
+  <meta http-equiv="Content-Security-Policy" content="default-src 'self';script-src file: http: 'unsafe-inline'; connect-src file: http: https: ws: wss:;img-src 'self' 'unsafe-inline' file: data: blob: http: https:;style-src 'unsafe-inline' file:;">
   <meta name="theme-color" content="#000000">
   <!--
       manifest.json provides metadata used when your web app is added to the
diff --git a/yarn.lock b/yarn.lock
