Merge pull request codeBelt#26 from codeBelt/js/package-updates

update packages and node version

Author: codeBelt

.nvmrc

@@ -1 +1 @@
-12.2.0
+13.9.0

craco.config.js

@@ -2,6 +2,12 @@ const path = require('path');
 
 module.exports = function({ env, paths }) {
   return {
+    babel: {
+      presets: [],
+      plugins: ['@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-nullish-coalescing-operator'],
+      // loaderOptions: { /* Any babel-loader configuration options: https://github.com/babel/babel-loader. */ },
+      // loaderOptions: (babelLoaderOptions, { env, paths }) => { return babelLoaderOptions; }
+    },
     webpack: {
       alias: {
         environment: path.join(__dirname, 'src', 'environments', process.env.CLIENT_ENV),

package.json

@@ -42,16 +42,16 @@
     ]
   },
   "dependencies": {
-    "axios": "0.19.0",
+    "axios": "0.19.2",
     "classnames": "2.2.6",
-    "connected-react-router": "6.6.1",
-    "dayjs": "1.8.18",
+    "connected-react-router": "6.7.0",
+    "dayjs": "1.8.21",
     "history": "4.10.1",
     "lodash.groupby": "4.6.0",
-    "react": "16.12.0",
-    "react-app-polyfill": "1.0.5",
-    "react-dom": "16.12.0",
-    "react-redux": "7.1.3",
+    "react": "16.13.0",
+    "react-app-polyfill": "1.0.6",
+    "react-dom": "16.13.0",
+    "react-redux": "7.2.0",
     "react-router-dom": "5.1.2",
     "redux": "4.0.5",
     "redux-devtools-extension": "2.13.8",
@@ -61,35 +61,37 @@
     "semantic-ui-css": "2.4.1",
     "semantic-ui-react": "0.88.2",
     "sjs-base-model": "1.9.0",
-    "uuid": "3.3.3"
+    "uuid": "7.0.1"
   },
   "devDependencies": {
-    "@craco/craco": "5.6.2",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.8.3",
+    "@babel/plugin-proposal-optional-chaining": "7.8.3",
+    "@craco/craco": "5.6.3",
     "@types/classnames": "2.2.9",
-    "@types/history": "4.7.3",
-    "@types/jest": "24.0.25",
+    "@types/history": "4.7.5",
+    "@types/jest": "25.1.3",
     "@types/lodash.groupby": "4.6.6",
-    "@types/node": "13.1.2",
-    "@types/react": "16.9.17",
-    "@types/react-dom": "16.9.4",
-    "@types/react-redux": "7.1.5",
+    "@types/node": "13.7.7",
+    "@types/react": "16.9.23",
+    "@types/react-dom": "16.9.5",
+    "@types/react-redux": "7.1.7",
     "@types/react-router-dom": "5.1.3",
-    "@types/uuid": "3.4.6",
-    "@typescript-eslint/eslint-plugin": "2.14.0",
-    "@typescript-eslint/parser": "2.14.0",
-    "cross-env": "6.0.3",
+    "@types/uuid": "7.0.0",
+    "@typescript-eslint/eslint-plugin": "2.21.0",
+    "@typescript-eslint/parser": "2.21.0",
+    "cross-env": "7.0.0",
     "eslint": "6.8.0",
-    "eslint-config-prettier": "6.9.0",
+    "eslint-config-prettier": "6.10.0",
     "eslint-plugin-prettier": "3.1.2",
-    "eslint-plugin-react": "7.17.0",
-    "eslint-plugin-react-hooks": "2.3.0",
-    "generate-template-files": "2.2.0",
-    "gh-pages": "2.1.1",
-    "husky": "3.1.0",
-    "node-sass": "4.13.0",
+    "eslint-plugin-react": "7.18.3",
+    "eslint-plugin-react-hooks": "2.5.0",
+    "generate-template-files": "2.2.1",
+    "gh-pages": "2.2.0",
+    "husky": "4.2.3",
+    "node-sass": "4.13.1",
     "prettier": "1.19.1",
     "pretty-quick": "2.0.1",
-    "react-scripts": "3.3.0",
-    "typescript": "3.7.4"
+    "react-scripts": "3.4.0",
+    "typescript": "3.8.3"
   }
 }

src/environments/base.js

@@ -6,7 +6,7 @@
 export default function baseEnv(baseApi) {
   return {
     route: {
-      baseRoute: '',
+      baseRoute: '/react-redux-architecture', // Fixes issue with Github Pages
     },
     api: {
       cast: `${baseApi}/shows/:showId/cast`,

src/environments/production.js

@@ -10,10 +10,7 @@ const env = environment(baseApi);
 
 const productionEnv = {
   ...env,
-  route: {
-    ...env.route,
-    baseRoute: '/react-redux-architecture', // Fixes issue with Github Pages
-  },
+  // override anything that gets added from base.
 };
 
 export default productionEnv;