Merge pull request #100 from apicgg/feature/argon2

argon2, new release

README.md

@@ -6,27 +6,29 @@
 > Simple opinionated boilerplate for MERN stack with Vite and Redux Toolkit.
 > This includes React+TypeScript with familiar configuration for vite.config.ts for front-end and Express+TypeScript for back-end.
 
-This has been created with the official [Vite](https://vitejs.dev/) template (`npm create vite@latest`) and some extended setup. There are two separate folders called `server` and `client`. The entry point for the backend is `server/src/index.js`.
+Feel free to add or tweak the setup as needed.
 
-Any package manager can be used with this project (e.g. npm, yarn or pnpm).
+This has been created with the official [Vite](https://vitejs.dev/) template (`npm create vite@latest`) and some extended setup. There are two separate folders called `backend` and `frontend`. The entry point for the backend is `backend/src/index.js`.
+
+Any package manager can be used with this project (e.g. npm or yarn or pnpm).
 
 > Thanks to [awesome-vite](https://github.com/vitejs/awesome-vite) for publishing this project.
 
 ## Tools
 
 - [React](https://reactjs.org/)
-- [Tailwind CSS](https://tailwindcss.com/)
 - [TypeScript](https://www.typescriptlang.org/)
+- [React Router DOM](https://reactrouter.com/)
 - [Redux Toolkit](https://redux-toolkit.js.org/)
+- [Tailwind CSS](https://tailwindcss.com/)
 - [Axios](https://axios-http.com/)
-- [React Router DOM](https://reactrouter.com/)
-- [Vitest](https://vitest.dev/)
 - [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/)
+- [Vitest](https://vitest.dev/)
 - [Express](https://expressjs.com/)
+- [express-async-handler](https://www.npmjs.com/package/express-async-handler)
 - [mongoose](https://mongoosejs.com/)
-- [bcrypt.js](https://www.npmjs.com/package/bcryptjs)
+- [argon2](https://www.npmjs.com/package/argon2)
 - [jsonwebtoken](https://www.npmjs.com/package/jsonwebtoken)
-- [express-async-handler](https://www.npmjs.com/package/express-async-handler)
 
 #### The dependency versions are managed by [depfu](https://depfu.com/).
 
@@ -44,6 +46,12 @@ Any package manager can be used with this project (e.g. npm, yarn or pnpm).
 npx degit apicgg/vite-mern-template my-app
 ```
 
+or
+
+```bash
+git clone https://github.com/apicgg/vite-mern-template.git
+```
+
 ## Install dependencies (npm or yarn or pnpm)
 
 - Backend
@@ -64,13 +72,13 @@ npm install
 - Backend
 
 ```bash
-npm run dev:be
+npm run dev:backend
 ```
 
 - Frontend
 
 ```bash
-npm run dev:fe
+npm run dev:frontend
 ```
 
 - Remove the .git and .github folder and initialize your own git repository.

frontend/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "vite-mern-template-client",
-  "version": "1.0.2",
+  "name": "vite-mern-template-frontend",
+  "version": "2.0.0-rc",
   "type": "module",
   "repository": "https://github.com/apicgg/vite-mern-template.git",
   "license": "MIT",
@@ -13,31 +13,31 @@
     "coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@reduxjs/toolkit": "^1.9.5",
-    "axios": "^1.3.6",
+    "@reduxjs/toolkit": "^2.2.1",
+    "axios": "^1.6.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-redux": "^8.0.5",
-    "react-router-dom": "^6.10.0",
+    "react-redux": "^9.1.0",
+    "react-router-dom": "^6.22.3",
     "vite-plugin-svgr": "^4.2.0"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^6.1.5",
-    "@testing-library/react": "^14.1.2",
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.1",
-    "@typescript-eslint/eslint-plugin": "^6.11.0",
-    "@typescript-eslint/parser": "^6.11.0",
+    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/react": "^14.2.1",
+    "@types/react": "^18.2.64",
+    "@types/react-dom": "^18.2.21",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "@vitejs/plugin-react": "^4.2.1",
-    "autoprefixer": "^10.4.14",
-    "eslint": "^8.53.0",
-    "eslint-plugin-react": "^7.33.2",
-    "jsdom": "^23.0.1",
-    "postcss": "^8.4.23",
-    "prettier": "3.1.0",
-    "tailwindcss": "^3.3.2",
-    "typescript": "^5.0.4",
-    "vite": "^5.0.10",
-    "vitest": "^1.0.4"
+    "autoprefixer": "^10.4.18",
+    "eslint": "^8.57.0",
+    "eslint-plugin-react": "^7.34.0",
+    "jsdom": "^24.0.0",
+    "postcss": "^8.4.35",
+    "prettier": "3.2.5",
+    "tailwindcss": "^3.4.1",
+    "typescript": "^5.4.2",
+    "vite": "^5.1.5",
+    "vitest": "^1.3.1"
   }
 }

package.json

@@ -1,12 +1,12 @@
 {
   "name": "vite-mern-template",
-  "version": "1.0.2",
+  "version": "2.0.0-rc",
   "main": "backend/src/index.ts",
   "scripts": {
     "watch": "tsc --watch",
     "backend": "node --watch build/index.js",
-    "dev:be": "concurrently \"npm run watch\" \"npm run backend\"",
-    "dev:fe": "npm start --prefix ./frontend",
+    "dev:backend": "concurrently \"npm run watch\" \"npm run backend\"",
+    "dev:frontend": "npm start --prefix ./frontend",
     "check-types": "tsc",
     "prettier": "prettier --write .",
     "build:backend": "tsc",
@@ -16,23 +16,22 @@
   "repository": "https://github.com/apicgg/vite-mern-template.git",
   "license": "MIT",
   "dependencies": {
-    "bcryptjs": "^2.4.3",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
+    "argon2": "^0.40.1",
+    "dotenv": "^16.4.5",
+    "express": "^4.18.3",
     "express-async-handler": "^1.2.0",
     "jsonwebtoken": "^9.0.2",
-    "mongoose": "^8.0.3"
+    "mongoose": "^8.2.1"
   },
   "devDependencies": {
-    "@types/bcryptjs": "^2.4.6",
     "@types/express": "^4.17.21",
-    "@types/jsonwebtoken": "^9.0.5",
-    "@types/node": "^20.10.4",
-    "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@typescript-eslint/parser": "^6.14.0",
+    "@types/jsonwebtoken": "^9.0.6",
+    "@types/node": "^20.11.25",
+    "@typescript-eslint/eslint-plugin": "^7.1.1",
+    "@typescript-eslint/parser": "^7.1.1",
     "concurrently": "^8.2.2",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "prettier": "3.2.5",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   }
 }