Merge pull request #1 from oslabs-beta/carlyNewDep

Carly new dep merging into dev

Author: ahsan-rao

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactype",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "description": "Prototyping tool for React/Typescript Applications.",
   "private": true,
   "main": "app/electron/main.js",
@@ -114,120 +114,123 @@
   },
   "homepage": "https://github.com/open-source-labs/ReacType#readme",
   "dependencies": {
-    "@apollo/client": "^3.3.11",
-    "@babel/cli": "^7.10.4",
-    "@babel/register": "^7.10.4",
-    "@mui/icons-material": "^5.8.2",
-    "@mui/lab": "^5.0.0-alpha.83",
-    "@types/js-cookie": "^2.2.6",
-    "@types/node": "^14.0.20",
-    "@types/prettier": "^1.19.0",
-    "@types/react": "^16.8.14",
-    "@types/react-redux": "^7.0.8",
-    "@types/react-router-dom": "^5.1.5",
-    "ace-builds": "^1.4.12",
-    "apollo-server-express": "^2.21.0",
+    "@apollo/client": "^3.6.9",
+    "@babel/cli": "^7.18.10",
+    "@babel/register": "^7.18.9",
+    "@mui/icons-material": "^5.8.4",
+    "@mui/lab": "^5.0.0-alpha.93",
+    "@nestjs/graphql": "^10.0.21",
+    "@types/js-cookie": "^3.0.2",
+    "@types/node": "^18.6.3",
+    "@types/prettier": "^2.6.4",
+    "@types/react": "^18.0.15",
+    "@types/react-redux": "^7.1.24",
+    "@types/react-router-dom": "^5.3.3",
+    "ace-builds": "^1.8.1",
+    "apollo-server": "^2.0.0",
+    "apollo-server-core": "^2.22.0-alpha.0",
+    "apollo-server-express": "^2.25.4",
     "app-root-path": "^3.0.0",
-    "autoprefixer": "^9.0.1",
+    "autoprefixer": "^10.4.8",
     "babel-polyfill": "^6.26.0",
     "bcryptjs": "^2.4.3",
-    "connected-react-router": "^6.8.0",
-    "cookie-parser": "^1.4.5",
+    "connected-react-router": "^6.9.3",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
-    "d3": "^6.2.0",
-    "dotenv": "^8.2.0",
+    "d3": "^7.6.1",
+    "dotenv": "^16.0.1",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-window-manager": "^1.0.6",
     "enzyme": "^3.11.0",
-    "esbuild-wasm": "^0.8.27",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "esbuild-wasm": "^0.14.51",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "express-graphql": "^0.12.0",
-    "graphql": "^15.5.0",
+    "graphql": "^15.8.0",
     "identity-obj-proxy": "^3.0.0",
-    "immutable": "^4.0.0-rc.12",
-    "js-cookie": "^2.2.1",
-    "localforage": "^1.7.2",
-    "lodash": "^4.17.20",
-    "node-fetch": "^2.6.0",
-    "passport": "^0.4.1",
+    "immutable": "^4.1.0",
+    "js-cookie": "^3.0.1",
+    "localforage": "^1.10.0",
+    "lodash": "^4.17.21",
+    "node-fetch": "^2.6.1",
+    "passport": "^0.6.0",
     "passport-github2": "^0.1.12",
-    "prettier": "^1.19.1",
-    "prop-types": "^15.6.2",
-    "re-resizable": "^6.7.0",
+    "prettier": "^2.7.1",
+    "prop-types": "^15.8.1",
+    "radium": "^0.26.2",
+    "re-resizable": "^6.9.9",
     "react-dnd": "^11.1.3",
     "react-dnd-html5-backend": "^11.1.3",
     "react-google-charts": "^4.0.0",
-    "react-google-login": "^5.1.22",
+    "react-google-login": "^5.2.2",
     "react-router-dom": "^5.2.0",
     "redux-devtools-extension": "^2.13.9",
-    "regenerator-runtime": "^0.13.7",
+    "regenerator-runtime": "^0.13.9",
     "resize-observer-polyfill": "^1.5.1",
     "seamless-immutable": "^7.1.4",
-    "source-map-support": "^0.5.19",
-    "spectron": "^15.0.0",
-    "uniqid": "^5.3.0",
-    "use-debounce": "^7.0.1",
-    "uuid": "^8.2.0"
+    "source-map-support": "^0.5.21",
+    "uniqid": "^5.4.0",
+    "use-debounce": "^8.0.3",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@babel/preset-react": "^7.16.0",
-    "@babel/preset-typescript": "^7.16.0",
-    "@emotion/react": "^11.9.0",
-    "@emotion/styled": "^11.8.1",
-    "@material-ui/core": "^4.12.3",
-    "@material-ui/icons": "^4.11.2",
-    "@mui/material": "^5.8.1",
-    "@mui/styled-engine-sc": "^5.1.0",
-    "@mui/x-data-grid": "^5.2.1",
-    "@testing-library/jest-dom": "^5.11.5",
-    "@testing-library/react": "^10.4.6",
-    "@types/chai": "^4.2.11",
-    "@types/jest": "^25.2.3",
-    "apollo": "^2.32.5",
-    "axios": "^0.24.0",
+    "@babel/core": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.18.6",
+    "@emotion/react": "^11.10.0",
+    "@emotion/styled": "^11.10.0",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
+    "@mui/material": "^5.9.3",
+    "@mui/styled-engine-sc": "^5.9.3",
+    "@mui/x-data-grid": "^5.15.0",
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^13.3.0",
+    "@types/chai": "^4.3.1",
+    "@types/jest": "^28.1.6",
+    "apollo": "^2.34.0",
+    "axios": "^0.27.2",
     "babel-eslint": "^10.1.0",
-    "babel-jest": "^27.3.1",
-    "babel-loader": "^8.2.3",
+    "babel-jest": "^28.1.3",
+    "babel-loader": "^8.2.5",
     "babel-plugin-module-resolver": "^4.1.0",
-    "concurrently": "^5.3.0",
-    "cross-env": "^5.2.1",
-    "csp-html-webpack-plugin": "^4.0.0",
+    "concurrently": "^7.3.0",
+    "cross-env": "^7.0.3",
+    "csp-html-webpack-plugin": "^5.1.0",
     "css-loader": "^2.1.1",
-    "dotenv-webpack": "^5.0.1",
-    "electron": "^16.0.6",
-    "electron-builder": "^23.0.2",
-    "enzyme-to-json": "^3.5.0",
-    "esbuild": "^0.14.10",
-    "eslint": "^4.19.1",
-    "eslint-config-airbnb-base": "^13.2.0",
+    "dotenv-webpack": "^8.0.0",
+    "electron": "^20.0.0",
+    "electron-builder": "^23.3.3",
+    "enzyme-to-json": "^3.6.2",
+    "esbuild": "^0.14.51",
+    "eslint": "^8.21.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jest": "^21.21.0",
-    "eslint-plugin-jsx-a11y": "^6.1.1",
-    "eslint-plugin-react": "^7.20.3",
-    "html-loader": "^1.1.0",
-    "html-webpack-plugin": "^3.1.0",
-    "jest": "^25.5.4",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.7.0",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-react": "^7.30.1",
+    "html-loader": "^4.1.0",
+    "html-webpack-plugin": "^4.5.2",
+    "jest": "^28.1.3",
     "mini-css-extract-plugin": "^0.9.0",
     "mongodb": "^3.5.9",
     "mongoose": "^5.9.22",
-    "node-sass": "^6.0.1",
-    "nodemon": "^2.0.15",
+    "node-sass": "^7.0.1",
+    "nodemon": "^2.0.19",
     "react": "^17.0.2",
-    "react-ace": "^9.5.0",
+    "react-ace": "^10.1.0",
     "react-dom": "^17.0.2",
-    "react-redux": "^7.2.6",
-    "redux": "^4.1.2",
-    "style-loader": "^0.20.3",
-    "styled-components": "^5.3.3",
-    "supertest": "^4.0.2",
-    "ts-jest": "^25.5.1",
-    "ts-node": "^8.10.2",
-    "typescript": "^3.9.6",
-    "url-loader": "^4.1.0",
+    "react-redux": "^8.0.2",
+    "redux": "^4.2.0",
+    "style-loader": "^3.3.1",
+    "styled-components": "^5.3.5",
+    "supertest": "^6.2.4",
+    "ts-jest": "^28.0.7",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.7.4",
+    "url-loader": "^4.1.1",
     "webpack": "^4.46.0",
     "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.11.0",

webpack.production.js

@@ -1,6 +1,6 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const base = require('./webpack.config');
 const path = require('path');
 const nonce = require('./app/src/utils/createNonce')();