Merge pull request #127 from SH5H/testtest

Adding automatic linter for checking commit
Infisical · Dec 18, 2022 · 9b7f036 · 9b7f036
2 parents 02e5be2 + de11c50
commit 9b7f036
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 161 deletions.
diff --git a/.prettierrc b/.prettierrc
diff --git a/backend/.eslintrc b/backend/.eslintrc
@@ -1,11 +1,10 @@
 {
   "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint", "prettier"],
+  "plugins": ["@typescript-eslint"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
+    "plugin:@typescript-eslint/recommended"
   ],
   "rules": {
     "no-console": 2

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY package.json package-lock.json ./
 
-RUN npm ci --only-production
+RUN npm ci --only-production --ignore-scripts
 
 COPY . .
 

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -31,12 +31,12 @@
   "version": "1.0.0",
   "main": "src/index.js",
   "scripts": {
+    "prepare": "cd .. && npm install",
     "start": "npm run build && node build/index.js",
     "dev": "nodemon",
     "build": "rimraf ./build && tsc && cp -R ./src/templates ./src/json ./build",
     "lint": "eslint . --ext .ts",
     "lint-and-fix": "eslint . --ext .ts --fix",
-    "prettier-format": "prettier --config .prettierrc 'src/**/*.ts' --write",
     "lint-staged": "lint-staged"
   },
   "repository": {
@@ -63,13 +63,10 @@
     "@typescript-eslint/eslint-plugin": "^5.40.1",
     "@typescript-eslint/parser": "^5.40.1",
     "eslint": "^8.26.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
     "install": "^0.13.0",
     "jest": "^29.3.1",
     "nodemon": "^2.0.19",
     "npm": "^8.19.3",
-    "prettier": "^2.7.1",
     "ts-node": "^10.9.1"
   }
 }
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -10,7 +10,7 @@ WORKDIR /app
 COPY package.json package-lock.json next.config.js ./
 
 # Install dependencies
-RUN npm ci --only-production
+RUN npm ci --only-production --ignore-scripts
 
 
 # Rebuild the source code only when needed

diff --git a/frontend/Dockerfile.dev b/frontend/Dockerfile.dev
@@ -9,12 +9,12 @@ COPY package.json ./
 COPY package-lock.json ./
 
 # Install 
-RUN npm install 
+RUN npm install --ignore-scripts
 
 # Copy over next.js config 
 COPY next.config.js ./next.config.js
 
 # Copy all files 
 COPY . .
 
-CMD ["npm", "run", "dev"]
+CMD ["npm", "run", "dev"]
diff --git a/frontend/Dockerfile.prod b/frontend/Dockerfile.prod
@@ -9,7 +9,7 @@ COPY package.json ./
 COPY package-lock.json ./
 
 # Install 
-RUN npm install 
+RUN npm install --ignore-scripts
 
 # Copy over next.js config
 COPY next.config.js ./next.config.js

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "scripts": {
+    "prepare": "cd .. && npm install",
     "dev": "next dev",
     "build": "next build",
     "start": "next start",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,15 +14,12 @@
     "prepare": "husky install"
   },
   "lint-staged": {
-    "**/*": "prettier --write --ignore-unknown",
     "*.{js,jsx,ts,tsx}": [
-      "eslint --fix",
-      "prettier --write"
+      "eslint --fix"
     ]
   },
   "devDependencies": {
     "eslint": "^8.29.0",
-    "husky": "^8.0.2",
-    "prettier": "^2.8.1"
+    "husky": "^8.0.2"
   }
 }