Merge pull request #2250 from transcom/cg_fix_node_gyp_problem

Fix node-gyp problem

.rescriptsrc

@@ -0,0 +1,3 @@
+module.exports = [
+  ['use-eslint-config', '.eslintrc'],
+]

src/jsconfig.json → jsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
+    "baseUrl": "./src/",
     "jsx": "react"
   }
 }

package.json

@@ -4,9 +4,9 @@
     "@fortawesome/fontawesome": "^1.1.6",
     "@fortawesome/fontawesome-free-solid": "^5.0.11",
     "@fortawesome/react-fontawesome": "^0.0.19",
-    "babel-polyfill": "^6.26.0",
     "bytes": "^3.0.0",
     "classnames": "^2.2.5",
+    "core-js": "^3.1.3",
     "enzyme": "^3.2.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "eslint-plugin-no-only-tests": "^2.3.0",
@@ -45,7 +45,7 @@
     "react-router-last-location": "^1.1.0",
     "react-router-redux": "^5.0.0-alpha.8",
     "react-router-tabs": "^1.1.1",
-    "react-scripts": "2.1.3",
+    "react-scripts": "^3.0.1",
     "react-select": "^2.4.3",
     "react-table": "^6.8.2",
     "react-tabs": "^2.2.2",
@@ -56,6 +56,7 @@
     "redux-form": "^7.2.1",
     "redux-mock-store": "1.5.1",
     "redux-thunk": "^2.2.0",
+    "regenerator-runtime": "^0.13.2",
     "reselect": "^4.0.0",
     "selenium-webdriver": "^3.6.0",
     "swagger-client": "^3.4.6",
@@ -65,21 +66,20 @@
   "name": "client",
   "private": true,
   "scripts": {
-    "build": "NODE_PATH=./src rescripts build",
-    "eject": "NODE_PATH=./src rescripts eject",
-    "start": "NODE_PATH=./src rescripts start",
-    "test": "NODE_PATH=./src rescripts test --env=jsdom",
-    "test:debug": "NODE_PATH=./src rescripts --inspect-brk test --runInBand --env=jsdom",
-    "test:coverage": "NODE_PATH=./src rescripts test --coverage --env=jsdom",
-    "e2e-test": "NODE_PATH=./e2e jest ./e2e.test.js --env=jsdom",
+    "build": "rescripts build",
+    "eject": "rescripts eject",
+    "start": "rescripts start",
+    "test": "rescripts test --env=jsdom",
+    "test:debug": "rescripts --inspect-brk test --runInBand --env=jsdom",
+    "test:coverage": "rescripts test --coverage --env=jsdom",
     "prettier": "prettier --loglevel warn 'src/**/*.{js,jsx}'",
     "adr-log": "adr-log -d ./docs/adr -i ./docs/adr/readme.md",
     "lint": "eslint --ext .js --ext .jsx src"
   },
   "version": "0.1.0",
   "devDependencies": {
-    "@rescripts/cli": "^0.0.7",
-    "@rescripts/rescript-env": "^0.0.3",
+    "@rescripts/cli": "^0.0.10",
+    "@rescripts/rescript-env": "^0.0.10",
     "adr-log": "^2.1.1",
     "cypress": "~3.1.0",
     "markdown-spellcheck": "^1.3.1",
@@ -97,8 +97,5 @@
     "not dead",
     "not ie < 11",
     "not op_mini all"
-  ],
-  "rescripts": [
-    "env"
   ]
 }

src/index.js

@@ -1,6 +1,7 @@
 // This must be the first line in src/index.js
 import 'react-app-polyfill/ie11';
-import 'babel-polyfill'; //todo: is this still needed?
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import 'uswds';

src/shared/Invoice/LineItemTable.module.scss

@@ -1,4 +1,4 @@
-@import 'shared/styles/themes.scss';
+@import '../styles/themes.scss';
 
 .invoice-panel__table {
   table-layout: fixed;
@@ -35,4 +35,4 @@
     }
     &:last-child td {  border-bottom: none };
   }
-}
+}

src/shared/Invoice/UnbilledTable.module.scss

@@ -1,3 +1,3 @@
 .button__approve-payment {
-  composes: align-right from 'shared/styles/common.module.scss';
+  composes: align-right from '../styles/common.module.scss';
 }