Skip to content

Commit

Permalink
chore(deps): update all non-major dependencies (#32)
Browse files Browse the repository at this point in the history
* chore(deps): update all non-major dependencies

* chore: remove patches

* style: run eslint

* fix: typecheck

---------

Co-authored-by: hywax <me@hywax.space>
  • Loading branch information
hywax-assistant and hywax authored Oct 9, 2024
1 parent 3cbc593 commit f8b4147
Show file tree
Hide file tree
Showing 34 changed files with 2,764 additions and 2,285 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
</template>

<script setup lang="ts">
import { computed } from 'vue'
import { useData } from 'vitepress'
import { computed } from 'vue'
defineProps<{
type: string
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/.vitepress/theme/components/Sponsor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
</template>

<script setup lang="ts">
import { computed } from 'vue'
import { useData } from 'vitepress'
import { computed } from 'vue'
const { lang } = useData()
const label = computed(() => lang.value === 'en-US' ? 'Sponsoring' : 'Поддержать проект')
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/.vitepress/theme/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { h } from 'vue'
import type { Theme } from 'vitepress'
import DefaultTheme from 'vitepress/theme'
import { h } from 'vue'
import Sponsor from './components/Sponsor.vue'

import './custom.css'
Expand Down
16 changes: 8 additions & 8 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
"lint:fix": "eslint --fix ."
},
"dependencies": {
"vue": "^3.4.38"
"vue": "^3.5.11"
},
"devDependencies": {
"@hywax/vitepress-yandex-metrika": "^0.4.0",
"@iconify-json/carbon": "^1.2.1",
"@iconify-json/ph": "^1.2.0",
"@iconify/json": "^2.2.243",
"@iconify-json/carbon": "^1.2.2",
"@iconify-json/ph": "^1.2.1",
"@iconify/json": "^2.2.258",
"@shorter/eslint-config": "workspace:*",
"@types/node": "^22.5.2",
"unocss": "^0.62.3",
"@types/node": "^22.7.5",
"unocss": "^0.63.4",
"unplugin-vue-components": "^0.27.4",
"vite": "^5.4.2",
"vitepress": "^1.3.4"
"vite": "^5.4.8",
"vitepress": "^1.4.0"
}
}
4 changes: 2 additions & 2 deletions apps/docs/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resolve } from 'node:path'
import { defineConfig } from 'vite'
import Components from 'unplugin-vue-components/vite'
import UnoCSS from 'unocss/vite'
import Components from 'unplugin-vue-components/vite'
import { defineConfig } from 'vite'

export default defineConfig({
optimizeDeps: {
Expand Down
5 changes: 2 additions & 3 deletions apps/web/app/composables/useAPI.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { defu } from 'defu'
import type { FetchError } from 'ofetch'
import type { AvailableRouterMethod, NitroFetchRequest } from 'nitropack'
import type { AsyncData, FetchResult, UseFetchOptions } from 'nuxt/app'
import type { FetchError } from 'ofetch'
import { defu } from 'defu'

type PickFrom<T, K extends Array<string>> = T extends Array<any> ? T : T extends Record<string, any> ? keyof T extends K[number] ? T : K[number] extends never ? T : Pick<T, K[number]> : T
type KeysOf<T> = Array<T extends T ? (keyof T extends string ? keyof T : never) : never>

// @ts-expect-error currently there is a problem with the custom $fetch, todo remove ts-expect-error
export function useAPI<
ResT = void,
ErrorT = FetchError,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/schema/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export * from './auth'
export * from './account'
export * from './auth'
export * from './project'
36 changes: 18 additions & 18 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,42 +19,42 @@
"postinstall": "nuxt prepare"
},
"dependencies": {
"@nuxt/fonts": "^0.7.2",
"@nuxt/ui": "^2.18.4",
"@nuxtjs/i18n": "^8.5.1",
"@nuxt/fonts": "^0.10.0",
"@nuxt/ui": "^2.18.6",
"@nuxtjs/i18n": "^8.5.5",
"@paralleldrive/cuid2": "^2.2.2",
"@vueuse/core": "^11.0.3",
"@vueuse/core": "^11.1.0",
"@vueuse/nuxt": "^10.11.1",
"bcrypt": "^5.1.1",
"better-sqlite3": "^11.2.1",
"drizzle-orm": "^0.33.0",
"better-sqlite3": "^11.3.0",
"drizzle-orm": "^0.34.1",
"drizzle-zod": "^0.5.1",
"lodash-es": "^4.17.21",
"matcher": "^5.0.0",
"nanoid": "^5.0.7",
"nodemailer": "^6.9.14",
"nuxt-auth-utils": "^0.3.5",
"nuxt-zod-i18n": "^1.9.0",
"nodemailer": "^6.9.15",
"nuxt-auth-utils": "^0.4.4",
"nuxt-zod-i18n": "^1.10.0",
"rollup-plugin-handlebarsjs": "^1.0.0",
"scule": "^1.3.0",
"vue": "^3.4.38",
"vue": "^3.5.11",
"zod": "^3.23.8"
},
"devDependencies": {
"@iconify-json/emojione": "^1.2.0",
"@iconify-json/heroicons": "^1.2.0",
"@iconify-json/simple-icons": "^1.2.1",
"@iconify-json/heroicons": "^1.2.1",
"@iconify-json/simple-icons": "^1.2.7",
"@shorter/email-templates": "workspace:*",
"@shorter/eslint-config": "workspace:*",
"@types/bcrypt": "^5.0.2",
"@types/better-sqlite3": "^7.6.11",
"@types/lodash-es": "^4.17.12",
"@types/nodemailer": "^6.4.15",
"drizzle-kit": "^0.24.2",
"nuxt": "^3.13.0",
"@types/nodemailer": "^6.4.16",
"drizzle-kit": "^0.25.0",
"nuxt": "^3.13.2",
"nuxt-time": "^1.0.2",
"tailwindcss": "^3.4.10",
"typescript": "^5.5.4",
"vue-tsc": "^2.1.4"
"tailwindcss": "^3.4.13",
"typescript": "^5.6.2",
"vue-tsc": "^2.1.6"
}
}
2 changes: 1 addition & 1 deletion apps/web/scripts/compare-i18n-errors.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Necessary for up-to-date translation of all errors.
*/

import { resolve } from 'node:path'
import { readFile } from 'node:fs/promises'
import { resolve } from 'node:path'
import process from 'node:process'

function parseErrorArray(errorArray) {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/api/auth/forgot.post.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ERROR_EMAIL_CREDENTIALS, ERROR_USER_INVALID_DATA, ERROR_USER_NOT_FOUND } from '#constants/errors'
import { createPasswordReset, findUserByEmail } from '#core/services/user'
import { useEmail } from '#core/email'
import { createPasswordReset, findUserByEmail } from '#core/services/user'

export default defineEventHandler(async (event) => {
try {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/api/auth/login.post.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ERROR_USER_INVALID_CREDENTIALS, ERROR_USER_INVALID_DATA } from '#constants/errors'
import { validateUserCredentials } from '#core/services/user'
import { getProjectsAvailableList } from '#core/services/project'
import { validateUserCredentials } from '#core/services/user'

export default defineEventHandler(async (event) => {
try {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/api/auth/register.post.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ERROR_REGISTRATION_DISABLED, ERROR_USER_ALL_READY_EXISTS, ERROR_USER_INVALID_DATA } from '#constants/errors'
import { createUser } from '#core/services/user'
import { getProjectsAvailableList } from '#core/services/project'
import { createUser } from '#core/services/user'

export default defineEventHandler(async (event) => {
if (!featureIsAvailable('authAllowRegistration', event)) {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/api/auth/reset.post.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ERROR_TOKEN_EXPIRED, ERROR_TOKEN_INVALID_DATA } from '#constants/errors'
import { resetPassword, validateUserPasswordResetToken } from '#core/services/user'
import { getProjectsAvailableList } from '#core/services/project'
import { resetPassword, validateUserPasswordResetToken } from '#core/services/user'

export default defineEventHandler(async (event) => {
try {
Expand Down
4 changes: 2 additions & 2 deletions apps/web/server/core/database/connection.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { dirname, resolve } from 'node:path'
import { mkdirSync } from 'node:fs'
import { type BetterSQLite3Database, drizzle } from 'drizzle-orm/better-sqlite3'
import { dirname, resolve } from 'node:path'
import BetterSqlite3 from 'better-sqlite3'
import { type BetterSQLite3Database, drizzle } from 'drizzle-orm/better-sqlite3'
import * as schema from './tables'

export interface CreateConnectionOptions {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/core/database/database.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import process from 'node:process'
import { type Database, createConnection } from './connection'
import { createConnection, type Database } from './connection'

let instance: Database | null = null
const logger = useLogger('database')
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/core/database/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export type { Database } from './connection'
export * from './database'
export * from './schema'
export * as tables from './tables'
export type { Database } from './connection'
2 changes: 1 addition & 1 deletion apps/web/server/core/database/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { integer, text } from 'drizzle-orm/sqlite-core'
import { createId } from '@paralleldrive/cuid2'
import { sql } from 'drizzle-orm'
import { integer, text } from 'drizzle-orm/sqlite-core'

export function idField(name: string) {
return text(name)
Expand Down
6 changes: 3 additions & 3 deletions apps/web/server/core/email/email.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { H3Event } from 'h3'
import type { Transporter } from 'nodemailer'
import { createTransport } from 'nodemailer'
import type { SentMessageInfo } from 'nodemailer/lib/smtp-pool'
import type { H3Event } from 'h3'
import { renderTemplate } from './template'
import type { Templates } from './types'
import { createTransport } from 'nodemailer'
import { EmailError } from './errors'
import { renderTemplate } from './template'

export type EmailSendOptions = Templates & {
to: string
Expand Down
6 changes: 3 additions & 3 deletions apps/web/server/core/services/account.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { z } from 'zod'
import type { User } from '#core/database'
import { tables, useDatabase } from '#core/database'
import bcrypt from 'bcrypt'
import { eq } from 'drizzle-orm'
import { tables, useDatabase } from '#core/database'
import type { User } from '#core/database'
import { z } from 'zod'

interface AccountChangePasswordData {
userId: User['id']
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/core/services/project.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { projectDraftSchema, projectUserDraftSchema, tables, useDatabase } from '#core/database'
import type { Project, ProjectDraft, ProjectUser, User } from '#core/database'
import { projectDraftSchema, projectUserDraftSchema, tables, useDatabase } from '#core/database'

export type ProjectAvailable = Pick<ProjectUser, 'role'> & Pick<Project, 'id' | 'name'>

Expand Down
6 changes: 3 additions & 3 deletions apps/web/server/core/services/user.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { PasswordReset, PasswordResetDraft, User, UserDraft } from '#core/database'
import crypto from 'node:crypto'
import { omit } from 'lodash-es'
import { passwordResetDraftSchema, tables, useDatabase, userDraftSchema } from '#core/database'
import bcrypt from 'bcrypt'
import { eq } from 'drizzle-orm'
import { omit } from 'lodash-es'
import { z } from 'zod'
import { passwordResetDraftSchema, tables, useDatabase, userDraftSchema } from '#core/database'
import type { PasswordReset, PasswordResetDraft, User, UserDraft } from '#core/database'

export type UserSafe = Omit<User, 'password'>

Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/middleware/01.access.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { isMatch } from 'matcher'
import { ERROR_ACCESS_ONLY_GUEST, ERROR_UNAUTHORIZED } from '#constants/errors'
import { isMatch } from 'matcher'

export default defineEventHandler(async (event) => {
const onlyGuestRoutes: string[] = [
Expand Down
4 changes: 2 additions & 2 deletions apps/web/server/plugins/02.session.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { updateUserOnlineStatus } from '#core/services/user'
import { getProjectsAvailableList } from '#core/services/project'
import { updateUserOnlineStatus } from '#core/services/user'

export default defineNitroPlugin(() => {
sessionHooks.hook('fetch', async (session) => {
/**
* Since the `updateUserOnlineStatus` method returns a user, based on it, we can take the actual data model.
*/
session.user = await updateUserOnlineStatus(session.user.id)
session.user = await updateUserOnlineStatus(session.user!.id)

/**
* We get the list of projects available to the user and add it to the session.
Expand Down
4 changes: 2 additions & 2 deletions apps/web/server/preset.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { resolve } from 'node:path'
import { cp, mkdir } from 'node:fs/promises'
import type { NitroPreset } from 'nitropack'
import { cp, mkdir } from 'node:fs/promises'
import { resolve } from 'node:path'

export default <NitroPreset>{
extends: 'node-server',
Expand Down
2 changes: 1 addition & 1 deletion apps/web/server/tasks/db/migrate.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { resolve } from 'node:path'
import process from 'node:process'
import { migrate } from 'drizzle-orm/better-sqlite3/migrator'
import { useDatabase } from '#core/database'
import { migrate } from 'drizzle-orm/better-sqlite3/migrator'

/**
* Run database migrations
Expand Down
6 changes: 3 additions & 3 deletions apps/web/server/utils/errors.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ZodError } from 'zod'
import { SqliteError } from 'better-sqlite3'
import defu from 'defu'
import { ERROR_BAD_REQUEST, ERROR_INTERNAL_ERROR } from '#constants/errors'
import { EmailError } from '#core/email'
import { SqliteError } from 'better-sqlite3'
import defu from 'defu'
import { ZodError } from 'zod'

type ErrorMapCodes = Record<string, string>

Expand Down
2 changes: 1 addition & 1 deletion docker/web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE=node:20.17.0-alpine
ARG NODE=node:20.18.0-alpine

################# Base Builder ##############

Expand Down
17 changes: 6 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "shorter",
"version": "0.3.0",
"private": true,
"packageManager": "pnpm@9.9.0",
"packageManager": "pnpm@9.12.1",
"scripts": {
"release": "pnpm lint && pnpm typecheck && pnpm build && changelogen --release --push",
"build": "turbo build",
Expand All @@ -16,13 +16,13 @@
"prepare": "husky"
},
"devDependencies": {
"@commitlint/cli": "^19.4.1",
"@commitlint/config-conventional": "^19.4.1",
"changelogen": "^0.5.5",
"@commitlint/cli": "^19.5.0",
"@commitlint/config-conventional": "^19.5.0",
"changelogen": "^0.5.7",
"dotenv-cli": "^7.4.2",
"husky": "^9.1.5",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"turbo": "^2.1.1"
"turbo": "^2.1.3"
},
"lint-staged": {
"*.ts": "pnpm run lint"
Expand All @@ -31,10 +31,5 @@
"extends": [
"@commitlint/config-conventional"
]
},
"pnpm": {
"patchedDependencies": {
"nuxt-auth-utils@0.3.5": "patches/nuxt-auth-utils@0.3.5.patch"
}
}
}
14 changes: 7 additions & 7 deletions packages/email-templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
"lint:fix": "eslint --fix ."
},
"peerDependencies": {
"eslint": "^9.9.1"
"eslint": "^9.12.0"
},
"dependencies": {
"@vue-email/components": "^0.0.19",
"@vue-email/render": "^0.0.9",
"vue": "^3.4.38"
"vue": "^3.5.11"
},
"devDependencies": {
"@rollup/plugin-typescript": "^12.1.0",
"@shorter/eslint-config": "workspace:*",
"@types/node": "^22.5.2",
"@vitejs/plugin-vue": "^5.1.3",
"@vue/compiler-sfc": "^3.4.38",
"eslint": "^9.9.1",
"vite": "^5.4.2"
"@types/node": "^22.7.5",
"@vitejs/plugin-vue": "^5.1.4",
"@vue/compiler-sfc": "^3.5.11",
"eslint": "^9.12.0",
"vite": "^5.4.8"
}
}
2 changes: 1 addition & 1 deletion packages/email-templates/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Component } from 'vue'
import { render } from '@vue-email/render'
import type { Template, TemplateRendered } from '../types'
import { render } from '@vue-email/render'
import ChangePasswordTemplate from './templates/change-password.vue'
import ProjectInviteTemplate from './templates/project-invite.vue'

Expand Down
Loading

0 comments on commit f8b4147

Please sign in to comment.