Skip to content

Commit

Permalink
chore: upgrade root deps (#1940)
Browse files Browse the repository at this point in the history
casperiv0 authored Jun 9, 2024

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
1 parent b66b034 commit ced8c37
Showing 19 changed files with 17,478 additions and 13,299 deletions.
74 changes: 0 additions & 74 deletions .github/workflows/codeql.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ jobs:

- uses: pnpm/action-setup@v4
with:
version: 8
run_install: false

- name: Get pnpm store directory
5 changes: 2 additions & 3 deletions .github/workflows/test-builds-typecheck.yml
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@ jobs:

- uses: pnpm/action-setup@v4
with:
version: 8
run_install: false

- name: Get pnpm store directory
@@ -45,15 +44,15 @@ jobs:
run: pnpm install

- name: Build packages
run: pnpm turbo run build --filter="{packages/**/**}"
run: pnpm turbo run build --filter="{packages/*}"
env:
NODE_OPTIONS: --max-old-space-size=6144

- name: Run turbo typecheck
run: pnpm turbo run typecheck

- name: Build apps
run: pnpm turbo run build --filter="{apps/**/**}"
run: pnpm turbo run build --filter="{apps/*}"
env:
NODE_OPTIONS: --max-old-space-size=6144

3 changes: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
legacy-peer-deps=true
auto-install-peers=true
auto-install-peers=true
package-manager-strict=false
64 changes: 32 additions & 32 deletions apps/api/package.json
Original file line number Diff line number Diff line change
@@ -25,46 +25,46 @@
"@types/ejs": "^3.1.5",
"@types/express": "^4.17.21",
"@types/glob": "^8.1.0",
"@types/jsonwebtoken": "9.0.5",
"@types/jsonwebtoken": "9.0.6",
"@types/lodash.set": "^4.3.9",
"@types/multer": "^1.4.11",
"@types/node": "^20.9.3",
"@types/node": "^20.14.2",
"@types/qrcode": "^1.5.5",
"@types/sharp": "^0.31.1",
"dotenv": "^16.3.1",
"regenerator-runtime": "^0.14.0",
"dotenv": "^16.4.5",
"regenerator-runtime": "^0.14.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.3.2",
"vite": "^5.0.0",
"vitest": "^0.34.6"
},
"dependencies": {
"@discordjs/rest": "^2.2.0",
"@discordjs/rest": "^2.3.0",
"@paralleldrive/cuid2": "^2.2.2",
"@prisma/client": "^5.6.0",
"@prisma/client": "^5.15.0",
"@sentry/node": "^7.81.0",
"@snailycad/audit-logger": "workspace:*",
"@snailycad/config": "^1.79.1",
"@snailycad/config": "workspace:*",
"@snailycad/image-data-uri": "^3.2.0",
"@snailycad/permissions": "workspace:*",
"@snailycad/prisma-generator-redundant-types": "^2.0.2",
"@snailycad/schemas": "workspace:*",
"@snailycad/types": "workspace:*",
"@snailycad/utils": "^1.79.1",
"@tsed/common": "^7.48.0",
"@tsed/components-scan": "^7.48.0",
"@tsed/core": "^7.48.0",
"@tsed/di": "^7.48.0",
"@tsed/exceptions": "^7.48.0",
"@tsed/json-mapper": "^7.48.0",
"@tsed/logger": "^6.6.3",
"@tsed/platform-exceptions": "^7.48.0",
"@tsed/platform-express": "^7.48.0",
"@tsed/platform-middlewares": "^7.48.0",
"@tsed/platform-params": "^7.48.0",
"@tsed/schema": "^7.48.0",
"@tsed/socketio": "^7.48.0",
"@tsed/swagger": "^7.48.0",
"@snailycad/utils": "workspace:*",
"@tsed/common": "^7.71.1",
"@tsed/components-scan": "^7.71.1",
"@tsed/core": "^7.71.1",
"@tsed/di": "^7.71.1",
"@tsed/exceptions": "^7.71.1",
"@tsed/json-mapper": "^7.71.1",
"@tsed/logger": "^6.7.5",
"@tsed/platform-exceptions": "^7.71.1",
"@tsed/platform-express": "^7.71.1",
"@tsed/platform-middlewares": "^7.71.1",
"@tsed/platform-params": "^7.71.1",
"@tsed/schema": "^7.71.1",
"@tsed/socketio": "^7.71.1",
"@tsed/swagger": "^7.71.1",
"bcrypt": "^5.1.1",
"command-exists": "^1.2.9",
"compression": "1.7.4",
@@ -73,26 +73,26 @@
"cors": "^2.8.5",
"date-fns": "^2.30.0",
"discord-api-types": "0.37.64",
"ejs": "^3.1.9",
"express": "4.18.2",
"glob": "^10.3.10",
"ejs": "^3.1.10",
"express": "4.19.2",
"glob": "^10.4.1",
"is-ip": "3.1.0",
"jsonwebtoken": "9.0.2",
"lodash.set": "^4.3.2",
"multer": "^1.4.5-lts.1",
"nanoid": "^3.3.4",
"nodemon": "^3.0.1",
"nodemon": "^3.1.3",
"otplib": "^12.0.1",
"prisma": "^5.6.0",
"prisma": "^5.15.0",
"puppeteer": "^21.5.2",
"qrcode": "^1.5.3",
"reflect-metadata": "^0.1.13",
"sharp": "^0.32.6",
"socket.io": "^4.7.2",
"ts-node": "^10.9.1",
"tslib": "^2.6.2",
"undici": "^5.27.2",
"socket.io": "^4.7.5",
"ts-node": "^10.9.2",
"tslib": "^2.6.3",
"undici": "^6.18.2",
"use-intl": "2.22.1",
"zod": "^3.22.4"
"zod": "^3.23.8"
}
}
50 changes: 25 additions & 25 deletions apps/client/package.json
Original file line number Diff line number Diff line change
@@ -25,38 +25,38 @@
"@radix-ui/react-tabs": "^1.0.4",
"@radix-ui/react-toolbar": "^1.0.4",
"@radix-ui/react-tooltip": "^1.0.7",
"@react-aria/label": "^3.7.3",
"@react-aria/ssr": "^3.9.0",
"@react-aria/label": "^3.7.8",
"@react-aria/ssr": "^3.9.4",
"@react-types/shared": "^3.22.0",
"@sentry/browser": "^7.81.1",
"@sentry/nextjs": "^7.81.1",
"@sentry/tracing": "^7.81.1",
"@snailycad/audit-logger": "workspace:*",
"@snailycad/config": "^1.79.1",
"@snailycad/config": "workspace:*",
"@snailycad/permissions": "workspace:*",
"@snailycad/schemas": "workspace:*",
"@snailycad/types": "workspace:*",
"@snailycad/ui": "workspace:*",
"@snailycad/utils": "^1.79.1",
"@tailwindcss/typography": "^0.5.10",
"@tanstack/react-query": "^5.8.4",
"@tanstack/react-table": "8.10.7",
"@snailycad/utils": "workspace:*",
"@tailwindcss/typography": "^0.5.13",
"@tanstack/react-query": "^5.40.1",
"@tanstack/react-table": "8.17.3",
"@types/color": "^3.0.6",
"@types/connect": "^3.4.38",
"@types/is-hotkey": "^0.1.10",
"@types/leaflet": "^1.9.8",
"@types/leaflet": "^1.9.12",
"@types/nprogress": "^0.2.3",
"@types/react": "18.2.34",
"@types/react-dom": "18.2.14",
"@types/sortablejs": "^1.15.6",
"@types/uuid": "^9.0.7",
"autoprefixer": "^10.4.16",
"axios": "^1.6.2",
"@types/sortablejs": "^1.15.8",
"@types/uuid": "^9.0.8",
"autoprefixer": "^10.4.19",
"axios": "^1.7.2",
"bignumber.js": "^9.1.2",
"color": "^4.2.3",
"date-fns": "^2.30.0",
"eslint-config-next": "^14.0.3",
"formik": "^2.4.5",
"formik": "^2.4.6",
"hex-color-regex": "^1.1.0",
"is-hotkey": "^0.2.0",
"leaflet": "^1.9.4",
@@ -68,11 +68,11 @@
"nprogress": "^0.2.0",
"pretty-bytes": "^6.1.1",
"react": "18.2.0",
"react-bootstrap-icons": "^1.10.3",
"react-bootstrap-icons": "^1.11.4",
"react-colorful": "^5.6.1",
"react-cool-onclickoutside": "^1.7.0",
"react-cropper": "^2.3.3",
"react-diff-viewer-continued": "^3.3.1",
"react-diff-viewer-continued": "^3.4.0",
"react-digit-input": "^2.1.0",
"react-dom": "18.2.0",
"react-google-recaptcha-v3": "^1.10.1",
@@ -89,21 +89,21 @@
"slate": "^0.100.0",
"slate-history": "^0.100.0",
"slate-react": "^0.101.0",
"socket.io-client": "^4.7.2",
"sortablejs": "^1.15.0",
"socket.io-client": "^4.7.5",
"sortablejs": "^1.15.2",
"storage-factory": "^0.2.1",
"use-intl": "2.22.1",
"uuid": "^9.0.1",
"zod": "3.22.4",
"zustand": "^4.4.6"
"uuid": "^10.0.0",
"zod": "3.23.8",
"zustand": "^4.5.2"
},
"devDependencies": {
"dotenv": "^16.3.1",
"postcss": "^8.4.31",
"sass": "^1.69.5",
"tailwindcss": "^3.3.5",
"dotenv": "^16.4.5",
"postcss": "^8.4.38",
"sass": "^1.77.4",
"tailwindcss": "^3.4.4",
"typescript": "^5.3.2",
"vite": "^5.0.2",
"vite": "^5.2.13",
"vitest": "^0.34.6"
}
}
2 changes: 1 addition & 1 deletion apps/client/src/components/bleeter/manage-bleet-modal.tsx
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ export function ManageBleetModal({ post, onCreate, onUpdate }: Props) {
title: post?.title ?? "",
body: post?.body ?? "",
bodyData: dataToSlate(post),
image: null as unknown as File,
image: null as unknown as File | null,
};

return (
Original file line number Diff line number Diff line change
@@ -153,10 +153,18 @@ export function MergeUnitModal({
}
}}
fetchOptions={{
apiPath: (query) =>
`/admin/values/emergency_vehicle/search?query=${query}&department=${(
activeUnit ?? unit
)?.departmentId}`,
apiPath: (query) => {
const basePath = "/admin/values/emergency_vehicle/search?query";
const queryParams = new URLSearchParams();
const departmentId = activeUnit?.departmentId || unit.departmentId;

if (query) queryParams.set("query", query);
if (departmentId) {
queryParams.set("department", departmentId);
}

return `${basePath}${queryParams.toString()}`;
},
filterTextRequired: true,
}}
>
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
"scripts": {
"start": "pnpm concurrently \"pnpm --filter \"@snailycad/client\" start\" \"pnpm --filter \"@snailycad/api\" generate && pnpm --filter \"@snailycad/api\" start\"",
"full-start": "git stash && git pull && pnpm install && node scripts/copy-env.mjs --client --api && pnpm run build && pnpm run start",
"build": "pnpm turbo run build --filter=\"{packages/**/**}\" && pnpm turbo run build --filter=\"{apps/**/**}\"",
"build": "pnpm turbo run build --filter=\"{packages/*}\" && pnpm turbo run build --filter=\"{apps/*}\"",
"dev": "docker compose up -d && pnpm turbo run watch --parallel --concurrency 11",
"format": "prettier --write \"./(packages|apps)/**/**/*.{js,jsx,ts,mjs,tsx,md,css,json}\" --ignore-path .gitignore",
"lint": "pnpm eslint . --ext .ts,.js,.tsx,.jsx,.mjs",
@@ -23,8 +23,8 @@
"@casperiv/eslint-config-react": "8.0.0",
"eslint": "8.56.0",
"eslint-plugin-deprecation": "^2.0.0",
"lerna": "^8.0.1",
"lint-staged": "^15.2.0"
"lerna": "^8.1.3",
"lint-staged": "^15.2.5"
},
"lint-staged": {
"*.{js,jsx,json,ts,tsx,md,mdx,css,html,yml,yaml,scss,sass}\"": "prettier --write --ignore-path .prettierignore"
@@ -33,14 +33,14 @@
"node": ">=18.16.0"
},
"dependencies": {
"@faker-js/faker": "^8.3.1",
"@faker-js/faker": "^8.4.1",
"colorette": "2.0.20",
"concurrently": "^8.2.2",
"copy": "^0.3.2",
"dotenv": "^16.3.1",
"dotenv": "^16.4.5",
"husky": "^8.0.3",
"prettier": "3.1.1",
"turbo": "1.10.16"
"prettier": "3.3.1",
"turbo": "2.0.3"
},
"pnpm": {
"overrides": {
@@ -50,5 +50,6 @@
"undici@<5.26.2": ">=5.26.2",
"@babel/traverse@<7.23.2": ">=7.23.2"
}
}
},
"packageManager": "[email protected]"
}
4 changes: 2 additions & 2 deletions packages/audit-logger/package.json
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
"devDependencies": {
"tsup": "6.6.2",
"typescript": "^5.3.2",
"vite": "^5.0.0"
"vite": "^5.2.13"
},
"peerDependencies": {
"@sentry/node": ">=7.72.0"
@@ -50,7 +50,7 @@
},
"dependencies": {
"@snailycad/types": "workspace:*",
"rimraf": "^5.0.5",
"rimraf": "^5.0.7",
"superjson": "^1.13.3"
},
"typesVersions": {
2 changes: 1 addition & 1 deletion packages/config/package.json
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
"devDependencies": {
"tsup": "6.6.2",
"typescript": "^5.3.2",
"vite": "^5.0.0",
"vite": "^5.2.13",
"vitest": "^0.34.6"
},
"tsup": {
1 change: 1 addition & 0 deletions packages/config/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"extends": "../../tsconfig.base.json",
"include": ["src/**/*"],
"compilerOptions": {
"moduleResolution": "Bundler",
"module": "ESNext",
2 changes: 1 addition & 1 deletion packages/permissions/package.json
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
"devDependencies": {
"tsup": "6.6.2",
"typescript": "^5.3.2",
"vite": "^5.0.0",
"vite": "^5.2.13",
"vitest": "^0.34.6"
},
"tsup": {
4 changes: 2 additions & 2 deletions packages/schemas/package.json
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@
},
"dependencies": {
"@snailycad/types": "workspace:*",
"tslib": "^2.6.2",
"zod": "3.22.4"
"tslib": "^2.6.3",
"zod": "3.23.8"
},
"tsup": {
"entry": [
2 changes: 1 addition & 1 deletion packages/types/package.json
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
"prepublish": "pnpm build"
},
"dependencies": {
"@snailycad/permissions": "^1.79.1",
"@snailycad/permissions": "workspace:*",
"discord-api-types": "0.37.58"
},
"devDependencies": {
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -104,9 +104,9 @@
"@react-types/overlays": "^3.8.4",
"@react-types/select": "^3.9.0",
"@react-types/shared": "^3.22.0",
"@snailycad/config": "^1.79.1",
"@snailycad/config": "workspace:*",
"@snailycad/types": "workspace:*",
"@snailycad/utils": "^1.79.1",
"@snailycad/utils": "workspace:*",
"@types/react": "18.2.34",
"@types/react-dom": "18.2.14",
"class-variance-authority": "^0.7.0",
10 changes: 5 additions & 5 deletions packages/utils/package.json
Original file line number Diff line number Diff line change
@@ -75,11 +75,11 @@
"test": "pnpm vitest run"
},
"devDependencies": {
"@types/node": "^20.9.1",
"@types/node": "^20.14.2",
"c8": "^8.0.1",
"tsup": "6.6.2",
"typescript": "^5.3.2",
"vite": "^5.0.0",
"vite": "^5.2.13",
"vitest": "^0.34.6"
},
"tsup": {
@@ -99,12 +99,12 @@
},
"sideEffects": false,
"dependencies": {
"@snailycad/types": "^1.79.1",
"@snailycad/types": "workspace:*",
"date-fns": "^2.30.0",
"slate": "0.100.0",
"slate-history": "^0.100.0",
"slate-react": "^0.101.0",
"tslib": "^2.6.2",
"undici": "5.27.2"
"tslib": "^2.6.3",
"undici": "6.18.2"
}
}
30,510 changes: 17,377 additions & 13,133 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions turbo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://turborepo.org/schema.json",
"pipeline": {
"globalDependencies": ["**/.env"],
"tasks": {
"@snailycad/client#build": {
"dependsOn": ["copy-env", "^build"],
"outputs": [".next/**"]
@@ -39,6 +40,5 @@
"cache": false,
"outputs": [".next/*", "dist/*"]
}
},
"globalDependencies": ["**/.env"]
}
}

0 comments on commit ced8c37

Please sign in to comment.