Merge branch 'dev' into dependabot/npm_and_yarn/frontend/adobe/css-to…

…ols-4.3.2
mcode · Dec 1, 2023 · cbb32b7 · cbb32b7
2 parents f3bcb8f + bf86746
commit cbb32b7
Show file tree

Hide file tree

Showing 29 changed files with 364 additions and 514 deletions.
diff --git a/backend/.prettierignore b/backend/.prettierignore
@@ -1 +1,3 @@
-dist
+dist
+node_modules
+package-lock.json
diff --git a/backend/.prettierrc b/backend/.prettierrc
@@ -4,5 +4,13 @@
   "endOfLine": "auto",
   "printWidth": 100,
   "tabWidth": 2,
-  "singleQuote": true
+  "singleQuote": true,
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "singleQuote": false
+      }
+    }
+  ]
 }
diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@types/node": "^16.18.2",
-    "axios": "^1.2.6",
+    "axios": "^1.6.0",
     "body-parser": "^1.20.1",
     "body-parser-xml": "^2.0.3",
     "cors": "^2.8.5",
@@ -51,9 +51,9 @@
     "start": "ts-node-dev src/server.ts",
     "test": "mocha",
     "build": "tsc",
-    "lint": "tsc && eslint \"**/*.{js,ts}\"",
-    "lint:fix": "tsc --noEmit && eslint \"**/*.{js,ts}\" --quiet --fix",
-    "prettier": "prettier --check \"**/*.{js,ts}\"",
-    "prettier:fix": "prettier --write \"**/*.{js,ts}\""
+    "lint": "tsc && eslint \"**/*.{js,ts,jsx,tsx}\"",
+    "lint:fix": "tsc --noEmit && eslint \"**/*.{js,ts,jsx,tsx}\" --quiet --fix",
+    "prettier": "prettier --check \"**/*.{js,ts,jsx,tsx,json}\"",
+    "prettier:fix": "prettier --write \"**/*.{js,ts,jsx,tsx,json}\""
   }
 }
diff --git a/frontend/.prettierignore b/frontend/.prettierignore
@@ -1,2 +1,4 @@
 dist
-build
+build
+node_modules
+package-lock.json
diff --git a/frontend/.prettierrc b/frontend/.prettierrc
@@ -4,5 +4,13 @@
   "endOfLine": "auto",
   "printWidth": 100,
   "tabWidth": 2,
-  "singleQuote": true
-}
+  "singleQuote": true,
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "singleQuote": false
+      }
+    }
+  ]
+}