Skip to content

Commit

Permalink
Merge pull request #3614 from owid/remove-deps
Browse files Browse the repository at this point in the history 
chore(deps): remove unnecessary deps and move more to devDependencies
  • Loading branch information
@marcelgerber
marcelgerber authored May 17, 2024
2 parents 359a612 + d44c6e7 commit de17c42
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 101 deletions.
1 change: 0 additions & 1 deletion adminSiteServer/app.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { simpleGit } from "simple-git"
import express, { NextFunction } from "express"
require("express-async-errors") // todo: why the require?
import cookieParser from "cookie-parser"
import "reflect-metadata"
import http from "http"
import Bugsnag from "@bugsnag/js"
import BugsnagPluginExpress from "@bugsnag/plugin-express"
Expand Down
6 changes: 5 additions & 1 deletion functions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{
"name": "owid-thumbnails",
"name": "owid-functions",
"dependencies": {
"@cloudflare/pages-plugin-sentry": "^1.1.1",
"@ourworldindata/grapher": "workspace:^",
"@ourworldindata/utils": "workspace:^",
"itty-router": "^4.0.23",
"stripe": "^14.20.0",
"svg2png-wasm": "^1.4.1"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20240512.0"
}
}
99 changes: 44 additions & 55 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"@bugsnag/js": "^7.20.0",
"@bugsnag/plugin-express": "^7.19.0",
"@bugsnag/plugin-react": "^7.19.0",
"@cloudflare/pages-plugin-sentry": "^1.1.1",
"@fortawesome/fontawesome-svg-core": "^6.5.2",
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
Expand All @@ -65,53 +64,12 @@
"@sinclair/typebox": "^0.28.5",
"@slack/web-api": "^6.11.1",
"@tippyjs/react": "^4.2.6",
"@types/bcrypt": "^5.0.0",
"@types/chunk-text": "^1.0.0",
"@types/codemirror": "^5.60.5",
"@types/colorbrewer": "^1.0.29",
"@types/cookie-parser": "^1.4.3",
"@types/d3": "^6",
"@types/d3-format": "^2",
"@types/enzyme": "^3.10.12",
"@types/express": "^4.17.14",
"@types/express-rate-limit": "^5.1.0",
"@types/fs-extra": "^11.0.1",
"@types/fuzzyset": "^1.0.2",
"@types/hast": "2",
"@types/html-to-text": "^8.1.1",
"@types/js-cookie": "^3.0.2",
"@types/jsonwebtoken": "^9.0.0",
"@types/lodash": "^4.17.0",
"@types/md5": "^2.3.2",
"@types/mdast": "^3.0",
"@types/minimist": "^1.2.2",
"@types/mousetrap": "^1.6.9",
"@types/mysql": "^2.15.21",
"@types/papaparse": "^5.3.5",
"@types/progress": "^2.0.5",
"@types/randomstring": "^1.1.8",
"@types/react": "^17.0.69",
"@types/react-beautiful-dnd": "^13.1.2",
"@types/react-color": "^3.0.2",
"@types/react-dom": "^17.0.22",
"@types/react-recaptcha": "^2.3.4",
"@types/react-router-dom": "^4.3.3",
"@types/react-tag-autocomplete": "^6.1.1",
"@types/shell-quote": "^1.7.1",
"@types/shelljs": "^0.8.11",
"@types/string-pixel-width": "^1.7.2",
"@types/topojson-client": "^3.1.1",
"@types/url-join": "^4.0.1",
"@types/url-parse": "^1.4.8",
"@types/webfontloader": "^1.6.34",
"@types/workerpool": "^6.1.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
"algoliasearch": "^4.23.2",
"antd": "^4.23.1",
"archieml": "^0.5.0",
"bcrypt": "^5.1.0",
"bootstrap": "^4.6.1",
"bundlewatch": "^0.3.3",
"cheerio": "^1.0.0-rc.10",
"chunk-text": "^2.0.1",
"classnames": "^2.5.1",
Expand All @@ -124,17 +82,12 @@
"dotenv": "^16.0.1",
"entities": "^4.4.0",
"enzyme": "^3.11.0",
"eslint": "^8.57.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react-hooks": "^4.6.0",
"expr-eval": "^2.0.2",
"express": "^4.19.2",
"express-async-errors": "^3.1.1",
"express-rate-limit": "^5.1.3",
"filenamify": "^4.1.0",
"fs-extra": "^11.1.1",
"fuzzyset": "^1.0.5",
"fuzzysort": "^1.1.4",
"glob": "^10.3.3",
"googleapis": "^108.0.0",
Expand All @@ -148,7 +101,6 @@
"json8-pointer": "^1.0.6",
"jsonwebtoken": "^9.0.0",
"knex": "^3.1.0",
"lerna": "^7.4.2",
"lodash": "^4.17.21",
"mathjax-full": "^3.1.0",
"md5": "^2.3.0",
Expand All @@ -166,9 +118,7 @@
"openai": "^4.6.0",
"p-map": "^4.0.0",
"papaparse": "^5.3.1",
"prettier": "^3.2.5",
"progress": "^2.0.3",
"prop-types": "^15.7.2",
"randomstring": "^1.3.0",
"react": "^17.0.2",
"react-animate-height": "^3.1.1",
Expand All @@ -190,7 +140,6 @@
"react-select": "^5.8.0",
"react-tag-autocomplete": "^7.1.0",
"react-zoom-pan-pinch": "^2.1.3",
"reflect-metadata": "^0.1.13",
"rxjs": "6",
"s-expression": "^3.1.1",
"safe-stable-stringify": "^2.4.1",
Expand All @@ -201,15 +150,13 @@
"simple-git": "^3.16.1",
"simple-statistics": "^7.3.2",
"string-pixel-width": "^1.10.0",
"stripe": "^14.20.0",
"striptags": "^3.2.0",
"svgo": "^3.0.2",
"timezone-mock": "^1.0.18",
"topojson-client": "^3.1.0",
"ts-pattern": "^5.0.5",
"typeorm": "^0.3.20",
"typescript": "~5.4.2",
"unified": "^9.0",
"unist-util-visit": "^2.0.0",
"url-join": "^4.0.0",
"url-parse": "^1.5.10",
Expand All @@ -219,27 +166,69 @@
"yaml": "^2.4.2"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20240512.0",
"@rmp135/sql-ts": "^2.1.0",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^12.1.5",
"@types/bcrypt": "^5.0.0",
"@types/chunk-text": "^1.0.0",
"@types/codemirror": "^5.60.5",
"@types/colorbrewer": "^1.0.29",
"@types/cookie-parser": "^1.4.3",
"@types/d3": "^6",
"@types/enzyme": "^3.10.12",
"@types/express": "^4.17.14",
"@types/express-rate-limit": "^5.1.0",
"@types/fs-extra": "^11.0.1",
"@types/geojson": "^7946.0.10",
"@types/html-to-text": "^8.1.1",
"@types/indefinite": "^2.3.2",
"@types/ini": "^4",
"@types/jest": "^29.5.5",
"@types/js-cookie": "^3.0.2",
"@types/jsonwebtoken": "^9.0.0",
"@types/lodash": "^4.17.0",
"@types/md5": "^2.3.2",
"@types/mdast": "^3.0",
"@types/minimist": "^1.2.2",
"@types/mousetrap": "^1.6.9",
"@types/mysql": "^2.15.21",
"@types/papaparse": "^5.3.5",
"@types/progress": "^2.0.5",
"@types/randomstring": "^1.1.8",
"@types/react": "^17.0.69",
"@types/react-beautiful-dnd": "^13.1.2",
"@types/react-color": "^3.0.2",
"@types/react-dom": "^17.0.22",
"@types/react-recaptcha": "^2.3.4",
"@types/react-router-dom": "^4.3.3",
"@types/react-tag-autocomplete": "^6.1.1",
"@types/shell-quote": "^1.7.1",
"@types/shelljs": "^0.8.11",
"@types/string-pixel-width": "^1.7.2",
"@types/topojson-client": "^3.1.1",
"@types/topojson-server": "^3.0.1",
"@types/url-join": "^4.0.1",
"@types/url-parse": "^1.4.8",
"@types/webfontloader": "^1.6.34",
"@types/workerpool": "^6.1.0",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vitejs/plugin-react": "^4.1.0",
"@yarnpkg/types": "^4.0.0",
"bundlewatch": "^0.3.3",
"cypress": "9.3.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react-hooks": "^4.6.0",
"http-server": "^14.1.1",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lerna": "^7.4.2",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"sass": "^1.69.5",
"tmex": "^1.0.8",
"topojson-server": "^3.0.1",
Expand Down
49 changes: 5 additions & 44 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4881,13 +4881,6 @@ __metadata:
languageName: node
linkType: hard

"@types/fuzzyset@npm:^1.0.2":
version: 1.0.2
resolution: "@types/fuzzyset@npm:1.0.2"
checksum: 10/6f7746c5410f1955ad58858f4cfeaa5e3e8502beab1991e34cb02ba50df75c8581157a0a5f9f487ee90e302c1d2c469b656ad2fb5d44f534ef68121bc1e61fe6
languageName: node
linkType: hard

"@types/geojson@npm:*, @types/geojson@npm:^7946.0.10":
version: 7946.0.10
resolution: "@types/geojson@npm:7946.0.10"
Expand Down Expand Up @@ -4921,15 +4914,6 @@ __metadata:
languageName: node
linkType: hard

"@types/hast@npm:2":
version: 2.3.7
resolution: "@types/hast@npm:2.3.7"
dependencies:
"@types/unist": "npm:^2"
checksum: 10/3e63332825ed88117e7f355ba0cfd35367f1d951a1c381333b56188f7645947c3bbbe96abb4c8239324ba1317fd241d5afdb42e104a3654a424327340d49052c
languageName: node
linkType: hard

"@types/history@npm:*":
version: 4.7.2
resolution: "@types/history@npm:4.7.2"
Expand Down Expand Up @@ -10476,13 +10460,6 @@ __metadata:
languageName: node
linkType: hard

"fuzzyset@npm:^1.0.5":
version: 1.0.5
resolution: "fuzzyset@npm:1.0.5"
checksum: 10/777910fb1906c7b44ab8dd3ba87b266d68e9c58edf07404e5baee79585c9ccb47b8aa6969aa0110b81455ad38a8b1ae5fa743283afe1d2a496bdd86449fce4e8
languageName: node
linkType: hard

"fuzzysort@npm:^1.1.4":
version: 1.1.4
resolution: "fuzzysort@npm:1.1.4"
Expand Down Expand Up @@ -11004,8 +10981,6 @@ __metadata:
"@bugsnag/js": "npm:^7.20.0"
"@bugsnag/plugin-express": "npm:^7.19.0"
"@bugsnag/plugin-react": "npm:^7.19.0"
"@cloudflare/pages-plugin-sentry": "npm:^1.1.1"
"@cloudflare/workers-types": "npm:^4.20240512.0"
"@fortawesome/fontawesome-svg-core": "npm:^6.5.2"
"@fortawesome/free-brands-svg-icons": "npm:^6.5.2"
"@fortawesome/free-solid-svg-icons": "npm:^6.5.2"
Expand All @@ -11029,18 +11004,14 @@ __metadata:
"@types/colorbrewer": "npm:^1.0.29"
"@types/cookie-parser": "npm:^1.4.3"
"@types/d3": "npm:^6"
"@types/d3-format": "npm:^2"
"@types/enzyme": "npm:^3.10.12"
"@types/express": "npm:^4.17.14"
"@types/express-rate-limit": "npm:^5.1.0"
"@types/fs-extra": "npm:^11.0.1"
"@types/fuzzyset": "npm:^1.0.2"
"@types/geojson": "npm:^7946.0.10"
"@types/hast": "npm:2"
"@types/html-to-text": "npm:^8.1.1"
"@types/indefinite": "npm:^2.3.2"
"@types/ini": "npm:^4"
"@types/jest": "npm:^29.5.5"
"@types/js-cookie": "npm:^3.0.2"
"@types/jsonwebtoken": "npm:^9.0.0"
"@types/lodash": "npm:^4.17.0"
Expand Down Expand Up @@ -11104,7 +11075,6 @@ __metadata:
express-rate-limit: "npm:^5.1.3"
filenamify: "npm:^4.1.0"
fs-extra: "npm:^11.1.1"
fuzzyset: "npm:^1.0.5"
fuzzysort: "npm:^1.1.4"
glob: "npm:^10.3.3"
googleapis: "npm:^108.0.0"
Expand Down Expand Up @@ -11143,7 +11113,6 @@ __metadata:
papaparse: "npm:^5.3.1"
prettier: "npm:^3.2.5"
progress: "npm:^2.0.3"
prop-types: "npm:^15.7.2"
randomstring: "npm:^1.3.0"
react: "npm:^17.0.2"
react-animate-height: "npm:^3.1.1"
Expand All @@ -11165,7 +11134,6 @@ __metadata:
react-select: "npm:^5.8.0"
react-tag-autocomplete: "npm:^7.1.0"
react-zoom-pan-pinch: "npm:^2.1.3"
reflect-metadata: "npm:^0.1.13"
rxjs: "npm:6"
s-expression: "npm:^3.1.1"
safe-stable-stringify: "npm:^2.4.1"
Expand All @@ -11177,7 +11145,6 @@ __metadata:
simple-git: "npm:^3.16.1"
simple-statistics: "npm:^7.3.2"
string-pixel-width: "npm:^1.10.0"
stripe: "npm:^14.20.0"
striptags: "npm:^3.2.0"
svgo: "npm:^3.0.2"
timezone-mock: "npm:^1.0.18"
Expand All @@ -11188,7 +11155,6 @@ __metadata:
tsx: "npm:^4.10.2"
typeorm: "npm:^0.3.20"
typescript: "npm:~5.4.2"
unified: "npm:^9.0"
unist-util-visit: "npm:^2.0.0"
url-join: "npm:^4.0.0"
url-parse: "npm:^1.5.10"
Expand Down Expand Up @@ -15434,10 +15400,12 @@ __metadata:
languageName: node
linkType: hard

"owid-thumbnails@workspace:functions":
"owid-functions@workspace:functions":
version: 0.0.0-use.local
resolution: "owid-thumbnails@workspace:functions"
resolution: "owid-functions@workspace:functions"
dependencies:
"@cloudflare/pages-plugin-sentry": "npm:^1.1.1"
"@cloudflare/workers-types": "npm:^4.20240512.0"
"@ourworldindata/grapher": "workspace:^"
"@ourworldindata/utils": "workspace:^"
itty-router: "npm:^4.0.23"
Expand Down Expand Up @@ -17463,13 +17431,6 @@ __metadata:
languageName: node
linkType: hard

"reflect-metadata@npm:^0.1.13":
version: 0.1.13
resolution: "reflect-metadata@npm:0.1.13"
checksum: 10/732570da35d2d96f8fdd5aac60fb263aa92f6512eaded5962b052bd9e90f22a9dec5aaf0d7ff4bfe97646c9530e8444e8435c2d80b24d0bdf938b5d47f6f5b83
languageName: node
linkType: hard

"reflect-metadata@npm:^0.2.1":
version: 0.2.2
resolution: "reflect-metadata@npm:0.2.2"
Expand Down Expand Up @@ -19745,7 +19706,7 @@ __metadata:
languageName: node
linkType: hard

"unified@npm:^9.0, unified@npm:^9.0.0":
"unified@npm:^9.0.0":
version: 9.2.2
resolution: "unified@npm:9.2.2"
dependencies:
Expand Down

0 comments on commit de17c42

Please sign in to comment.