diff --git a/package.json b/package.json index 836dd3254..28a5b4328 100644 --- a/package.json +++ b/package.json @@ -6,31 +6,22 @@ "scripts": { "start": "docker compose -f docker-compose-dev.yml up --build -d", "stop": "docker compose -f docker-compose-dev.yml down", - - "logs-server": "docker logs tachi-server -f", "logs-client": "docker logs tachi-client -f", "logs-seeds": "docker logs tachi-seeds -f", - "test-server": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm test", "test-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds pnpm --filter ./scripts test", - "enter-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds bash", "sort-seeds": "docker compose -f docker-compose-dev.yml exec tachi-seeds node scripts/deterministic-collection-sort.js", "view-seeds": "xdg-open http://127.0.0.1:3000/utils/seeds", "load-seeds": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm sync-database-local", - "validate-db": "docker compose -f docker-compose-dev.yml exec tachi-server pnpm validate-database", - "start-docs": "cd docs/ && mkdocs serve", - "raw-start-server": "pnpm --filter ./server start", "raw-start-client": "pnpm --filter ./client start", "raw-start-dbs": "redis-server --daemonize yes; sudo systemctl start mongodb.service", - "^^ DEV STUFF IS HERE ^^": "comment", "vv PROD STUFF YOU WON'T TOUCH vv": "comment", - "build": "pnpm -r build", "sync-database": "pnpm --filter ./server sync-database", "start-score-import-worker": "pnpm --filter ./server runscoreworker" @@ -60,7 +51,8 @@ "peerDependencies": { "@types/bson": "1.0.11", "@types/mongodb": "3.6.20", - "@types/node": "16.11.7" + "@types/node": "16.11.7", + "mongodb": "3.6.3" }, "pnpm": { "overrides": { @@ -68,7 +60,8 @@ "@types/bson": "1.0.11", "@types/node": "18.11.18", "@types/express-serve-static-core": "4.17.29", - "ts-node": "10.9.1" + "ts-node": "10.9.1", + "mongodb": "3.6.3" }, "patchedDependencies": { "@types/mongodb@3.6.20": "patches/@types__mongodb@3.6.20.patch", diff --git a/patches/browserslist@4.21.4.patch b/patches/browserslist@4.21.4.patch index 0fe81bbe4..a65fcf68b 100644 --- a/patches/browserslist@4.21.4.patch +++ b/patches/browserslist@4.21.4.patch @@ -1,25 +1,27 @@ diff --git a/node.js b/node.js -index a3c7ef7e5bfef7e467e166161fc38738234d941e..2859ebb691b3577770215ba528af337e24f6259f 100644 +index a3c7ef7e5bfef7e467e166161fc38738234d941e..d96d8b838a151471451d133b7704e19fd9e96325 100644 --- a/node.js +++ b/node.js -@@ -392,12 +392,14 @@ module.exports = { - var halfYearAgo = Date.now() - TIME_TO_UPDATE_CANIUSE +@@ -384,21 +384,7 @@ module.exports = { + }, - if (latest !== 0 && latest < halfYearAgo) { + oldDataWarning: function oldDataWarning(agentsObj) { +- if (dataTimeChecked) return +- dataTimeChecked = true +- if (process.env.BROWSERSLIST_IGNORE_OLD_DATA) return +- +- var latest = latestReleaseTime(agentsObj) +- var halfYearAgo = Date.now() - TIME_TO_UPDATE_CANIUSE +- +- if (latest !== 0 && latest < halfYearAgo) { - console.warn( - 'Browserslist: caniuse-lite is outdated. Please run:\n' + - ' npx update-browserslist-db@latest\n' + - ' Why you should do it regularly: ' + - 'https://github.com/browserslist/update-db#readme' - ) -+ // this warning is useless, annoying, and should NEVER go -+ // to my stderr. Shut up. -+ // console.warn( -+ // 'Browserslist: caniuse-lite is outdated. Please run:\n' + -+ // ' npx update-browserslist-db@latest\n' + -+ // ' Why you should do it regularly: ' + -+ // 'https://github.com/browserslist/update-db#readme' -+ // ) - } +- } ++ return }, - \ No newline at end of file + + currentNode: function currentNode() { \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dafe1ecd2..c0f99cc62 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,13 +6,14 @@ overrides: '@types/node': 18.11.18 '@types/express-serve-static-core': 4.17.29 ts-node: 10.9.1 + mongodb: 3.6.3 patchedDependencies: '@types/mongodb@3.6.20': hash: fmazw77vmtotccsa6gb66mxijq path: patches/@types__mongodb@3.6.20.patch browserslist@4.21.4: - hash: 3sk7x5xyu7mtmw3sdh5izkeejy + hash: iybzhxekp633yoleg54ca3ov2a path: patches/browserslist@4.21.4.patch monk@7.3.4: hash: vvho35r54xdabf3z6x2eo4lz7q @@ -1468,7 +1469,7 @@ packages: '@babel/compat-data': 7.20.5 '@babel/core': 7.20.12 '@babel/helper-validator-option': 7.18.6 - browserslist: 4.21.4_3sk7x5xyu7mtmw3sdh5izkeejy + browserslist: 4.21.4_iybzhxekp633yoleg54ca3ov2a lru-cache: 5.1.1 semver: 6.3.0 @@ -4097,6 +4098,18 @@ packages: dev: false /browserslist/4.21.4_3sk7x5xyu7mtmw3sdh5izkeejy: + resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + dependencies: + caniuse-lite: 1.0.30001441 + electron-to-chromium: 1.4.284 + node-releases: 2.0.8 + update-browserslist-db: 1.0.10_browserslist@4.21.4 + dev: true + patched: true + + /browserslist/4.21.4_iybzhxekp633yoleg54ca3ov2a: resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true @@ -7884,39 +7897,6 @@ packages: saslprep: 1.0.3 dev: false - /mongodb/3.7.3: - resolution: {integrity: sha512-Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw==} - engines: {node: '>=4'} - peerDependencies: - aws4: '*' - bson-ext: '*' - kerberos: '*' - mongodb-client-encryption: '*' - mongodb-extjson: '*' - snappy: '*' - peerDependenciesMeta: - aws4: - optional: true - bson-ext: - optional: true - kerberos: - optional: true - mongodb-client-encryption: - optional: true - mongodb-extjson: - optional: true - snappy: - optional: true - dependencies: - bl: 2.2.1 - bson: 1.1.6 - denque: 1.5.1 - optional-require: 1.1.8 - safe-buffer: 5.2.1 - optionalDependencies: - saslprep: 1.0.3 - dev: false - /monk-middleware-cast-ids/0.2.1: resolution: {integrity: sha512-Hp9gwjXo+inSPhXUlsV1u3DyZh2cXT3Osij/1gSNCJQCgacAF1lfmnTj6bKmlf1Et4dvLhwUL0PquxdZRIofkA==} dev: false @@ -7946,7 +7926,7 @@ packages: dependencies: '@types/mongodb': 3.6.20_fmazw77vmtotccsa6gb66mxijq debug: 4.3.4 - mongodb: 3.7.3 + mongodb: 3.6.3 monk-middleware-cast-ids: 0.2.1 monk-middleware-fields: 0.2.0 monk-middleware-handle-callback: 0.2.2 @@ -8385,13 +8365,6 @@ packages: hasBin: true dev: true - /optional-require/1.1.8: - resolution: {integrity: sha512-jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA==} - engines: {node: '>=4'} - dependencies: - require-at: 1.0.6 - dev: false - /optionator/0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} engines: {node: '>= 0.8.0'} @@ -9248,11 +9221,6 @@ packages: uuid: 3.4.0 dev: true - /require-at/1.0.6: - resolution: {integrity: sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==} - engines: {node: '>=4'} - dev: false - /require-directory/2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} @@ -10542,7 +10510,7 @@ packages: peerDependencies: browserslist: '>= 4.21.0' dependencies: - browserslist: 4.21.4_3sk7x5xyu7mtmw3sdh5izkeejy + browserslist: 4.21.4_iybzhxekp633yoleg54ca3ov2a escalade: 3.1.1 picocolors: 1.0.0 diff --git a/server/src/test-utils/hack-setup.js b/server/src/test-utils/hack-setup.js index c530fd0c7..2e88dec23 100644 --- a/server/src/test-utils/hack-setup.js +++ b/server/src/test-utils/hack-setup.js @@ -6,7 +6,7 @@ const path = require("path"); const assert = require("assert"); -console.log(`Hit HACK_SETUP.js @ ${Date.now()}.`); +console.log("Starting test setup via hack-setup.js"); assert(process.env.NODE_ENV === "test", "NODE_ENV WAS NOT TEST, BAILING"); execSync(`ts-node ${path.join(__dirname, "./setup.ts")}`, { stdio: "inherit" });