Fix Code Review

Author: William Monk

.github/ISSUE_TEMPLATE.md

@@ -82,7 +82,7 @@
 1. `node -v`: 
 2. `npm -v`:
 4. `yarn --version` (if you use Yarn):
-3. `npm ls react-scripts` (if you haven’t ejected): 
+3. `npm ls react-scripts-ts` (if you haven’t ejected): 
 
 Then, specify:
 

packages/react-scripts/config/webpack.config.dev.js

@@ -100,9 +100,9 @@ module.exports = {
       '.ts',
       '.web.tsx',
       '.tsx',
+      '.web.js',
       '.js',
       '.json',
-      '.jsx',
       '.web.jsx',
       '.jsx',
     ],

packages/react-scripts/config/webpack.config.prod.js

@@ -100,9 +100,9 @@ module.exports = {
       '.ts',
       '.web.tsx',
       '.tsx',
+      '.web.js',
       '.js',
       '.json',
-      '.jsx',
       '.web.jsx',
       '.jsx',
     ],

packages/react-scripts/package.json

@@ -22,68 +22,36 @@
     "react-scripts-ts": "./bin/react-scripts-ts.js"
   },
   "dependencies": {
-<<<<<<< HEAD
-    "autoprefixer": "7.1.0",
-    "app-root-path": "^2.0.1",
-    "case-sensitive-paths-webpack-plugin": "2.0.0",
-    "chalk": "1.1.3",
-    "cli-highlight": "1.1.4",
-    "css-loader": "0.28.1",
-    "dotenv": "4.0.0",
-    "extract-text-webpack-plugin": "2.1.0",
-    "file-loader": "0.11.1",
-=======
     "autoprefixer": "7.1.1",
-    "babel-core": "6.25.0",
-    "babel-eslint": "7.2.3",
-    "babel-jest": "20.0.3",
-    "babel-loader": "7.0.0",
-    "babel-preset-react-app": "^3.0.1",
-    "babel-runtime": "6.23.0",
+    "app-root-path": "^2.0.1",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
+    "chalk": "1.1.3",
+    "cli-highlight": "1.1.4",
     "css-loader": "0.28.4",
     "dotenv": "4.0.0",
-    "eslint": "3.19.0",
-    "eslint-config-react-app": "^1.0.5",
-    "eslint-loader": "1.7.1",
-    "eslint-plugin-flowtype": "2.34.0",
-    "eslint-plugin-import": "2.2.0",
-    "eslint-plugin-jsx-a11y": "5.0.3",
-    "eslint-plugin-react": "7.1.0",
     "extract-text-webpack-plugin": "2.1.2",
     "file-loader": "0.11.2",
->>>>>>> c1221eb
     "fs-extra": "3.0.1",
     "html-webpack-plugin": "2.29.0",
     "jest": "20.0.4",
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.0.0",
     "postcss-loader": "2.0.6",
     "promise": "7.1.1",
-<<<<<<< HEAD
-    "react-dev-utils": "^2.0.1",
-    "react-error-overlay": "^1.0.6",
-    "style-loader": "0.17.0",
+    "react-dev-utils": "^3.0.1",
+    "react-error-overlay": "^1.0.8",
+    "style-loader": "0.18.2",
     "ts-loader": "^2.2.1",
     "tslint": "^5.2.0",
     "tslint-loader": "^3.5.3",
     "tslint-react": "^3.0.0",
     "typescript": "~2.4.0",
     "source-map-loader": "^0.2.1",
-    "sw-precache-webpack-plugin": "0.9.1",
-    "url-loader": "0.5.8",
-    "webpack": "2.6.0",
-    "webpack-dev-server": "2.4.5",
-=======
-    "react-dev-utils": "^3.0.1",
-    "react-error-overlay": "^1.0.8",
-    "style-loader": "0.18.2",
     "sw-precache-webpack-plugin": "0.11.3",
     "url-loader": "0.5.9",
     "webpack": "2.6.1",
     "webpack-dev-server": "2.5.0",
->>>>>>> c1221eb
     "webpack-manifest-plugin": "1.1.0",
     "whatwg-fetch": "2.0.3"
   },

packages/react-scripts/scripts/utils/createJestConfig.js

@@ -27,7 +27,17 @@ module.exports = (resolve, rootDir) => {
     collectCoverageFrom: ['src/**/*.{js,jsx,ts,tsx}'],
     setupFiles: [resolve('config/polyfills.js')],
     setupTestFrameworkScriptFile: setupTestsFile,
-    moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json'],
+    moduleFileExtensions: [
+      'web.ts',
+      'ts',
+      'web.tsx',
+      'tsx',
+      'web.js',
+      'js',
+      'web.jsx',
+      'jsx',
+      'json',
+    ],
     testMatch: [
       '<rootDir>/src/**/__tests__/**/*.ts?(x)',
       '<rootDir>/src/**/?(*.)(spec|test).ts?(x)',
@@ -45,7 +55,6 @@ module.exports = (resolve, rootDir) => {
     moduleNameMapper: {
       '^react-native$': 'react-native-web',
     },
-    moduleFileExtensions: ['web.js', 'js', 'json', 'web.jsx', 'jsx'],
   };
   if (rootDir) {
     config.rootDir = rootDir;