diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 211c8a7..c26fcf0 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1843,8 +1843,7 @@ "@types/history": { "version": "4.7.5", "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.5.tgz", - "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==", - "dev": true + "integrity": "sha512-wLD/Aq2VggCJXSjxEwrMafIP51Z+13H78nXIX0ABEuIGhmB5sNGbR113MOKo+yfw+RDo1ZU3DM6yfnnRF/+ouw==" }, "@types/istanbul-lib-coverage": { "version": "2.0.1", @@ -1927,7 +1926,6 @@ "version": "5.1.7", "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.7.tgz", "integrity": "sha512-2ouP76VQafKjtuc0ShpwUebhHwJo0G6rhahW9Pb8au3tQTjYXd2jta4wv6U2tGLR/I42yuG00+UXjNYY0dTzbg==", - "dev": true, "requires": { "@types/history": "*", "@types/react": "*" @@ -1937,7 +1935,6 @@ "version": "5.1.5", "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.5.tgz", "integrity": "sha512-ArBM4B1g3BWLGbaGvwBGO75GNFbLDUthrDojV2vHLih/Tq8M+tgvY1DSwkuNrPSwdp/GUL93WSEpTZs8nVyJLw==", - "dev": true, "requires": { "@types/history": "*", "@types/react": "*", @@ -11643,6 +11640,11 @@ "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" }, + "prettier": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==" + }, "pretty-bytes": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", @@ -14229,9 +14231,9 @@ } }, "tailwindcss": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.4.2.tgz", - "integrity": "sha512-km9uPNjThE+3Jv26E9zqYe4F4Xl0mnAnyQO9hYWVIGo3JZE1pi4hsfroj5Bfr8X/khN8gZjVTMMY5r4sMVvhlg==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.4.4.tgz", + "integrity": "sha512-49Hy/+WnqQhxtGGjcGlhRlE7+hooX2A0/JOeJnA78fCEqDRlhURWujHY05aCl+lJ6G2qQ+1wlQTg4PqMPUcFVA==", "requires": { "@fullhuman/postcss-purgecss": "^2.1.2", "autoprefixer": "^9.4.5", diff --git a/frontend/package.json b/frontend/package.json index db8de01..b0c715c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,19 +11,22 @@ "@types/node": "^12.12.37", "@types/react": "^16.9.34", "@types/react-dom": "^16.9.7", + "@types/react-router-dom": "^5.1.5", "autoprefixer": "^9.7.6", "npm-run-all": "^4.1.5", "postcss-cli": "^7.1.1", + "prettier": "^2.0.5", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router-dom": "^5.1.2", "react-scripts": "3.4.1", - "tailwindcss": "^1.4.2", + "tailwindcss": "^1.4.4", "typescript": "^3.7.5" }, "scripts": { "build:tailwind": "postcss src/tailwind.css -o src/tailwind/generated.css", "watch:tailwind": "postcss -w src/tailwind.css -o src/tailwind/generated.css", + "format": "prettier --write \"./*.js\" \"src/**/*.(tsx|ts|css)\"", "start": "run-p start:react watch:tailwind", "start:react": "react-scripts start", "prebuild": "npm run build:tailwind", @@ -45,8 +48,5 @@ "last 1 firefox version", "last 1 safari version" ] - }, - "devDependencies": { - "@types/react-router-dom": "^5.1.5" } } diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js index 648f811..47b970a 100644 --- a/frontend/postcss.config.js +++ b/frontend/postcss.config.js @@ -3,13 +3,13 @@ const purgecss = require("@fullhuman/postcss-purgecss")({ content: ["./public/**/*.html", "./src/**/*.tsx"], // Include any special characters you're using in this regular expression - defaultExtractor: content => content.match(/[\w-/:]+(? content.match(/[\w-/:]+(?