Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade dependencies #539

Merged
merged 11 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 16 additions & 24 deletions apps/discord-bot-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@auth/core": "^0.15.2",
"@auth/sveltekit": "^0.3.6",
"@aws-crypto/sha256-js": "^2.0.1",
"@carbon/styles": "^1.11.0",
"@carbon/styles": "^1.48.1",
"@discordjs/builders": "^1.1.0",
"@discordjs/rest": "^1.0.1",
"@faker-js/faker": "^7.4.0",
Expand All @@ -41,44 +41,36 @@
"zod": "^3.19.1"
},
"devDependencies": {
"@carbon/charts": "^1.5.2",
"@carbon/charts-svelte": "^1.5.2",
"@commitlint/cli": "^17.0.3",
"@commitlint/config-conventional": "^17.0.3",
"@faker-js/faker": "^7.3.0",
"@aws-amplify/discord-bot-scripts": "workspace:*",
"@aws-amplify/discord-bot-support": "workspace:*",
"@aws-amplify/discord-bot-tsconfig": "workspace:*",
"@carbon/charts": "^1.5.2",
"@carbon/charts-svelte": "^1.13.25",
"@faker-js/faker": "^7.3.0",
"@playwright/test": "^1.37.1",
"@sveltejs/adapter-node": "^1.3.1",
"@sveltejs/kit": "^1.23.0",
"@sveltejs/adapter-node": "^4.0.1",
"@sveltejs/kit": "^2.5.0",
"@sveltejs/vite-plugin-svelte": "^3.0.2",
"@types/cookie": "^0.5.1",
"@types/express": "^4.17.13",
"@types/node": "^18.7.13",
"@types/prettier": "^2.7.0",
"@types/supertest": "^2.0.12",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"@vitest/ui": "^0.22.1",
"carbon-components-svelte": "^0.70.1",
"carbon-icons-svelte": "^11.2.0",
"carbon-preprocess-svelte": "^0.9.1",
"d3": "^7.6.1",
"carbon-components-svelte": "^0.82.8",
"carbon-icons-svelte": "^12.4.2",
"carbon-preprocess-svelte": "^0.10.0",
"d3": "^7.8.5",
"d3-cloud": "^1.2.7",
"d3-sankey": "^0.12.3",
"esbuild": "^0.19.2",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-svelte3": "^4.0.0",
"jsdom": "^20.0.0",
"lint-staged": "^13.0.3",
"prettier": "^2.7.1",
"prettier-plugin-svelte": "^2.7.0",
"supertest": "^6.2.4",
"svelte-check": "^3.5.0",
"tasuku": "^2.0.1",
"tslib": "^2.6.2",
"typescript": "^5.2.2",
"vite": "^4.4.9",
"vite-node": "^0.34.3",
"typescript": "^5.3.3",
"vite": "^5.0.12",
"vite-node": "^1.2.2",
"vitest": "^0.22.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SlashCommandBuilder } from '@discordjs/builders'
import { faker } from '@faker-js/faker'
import { EmbedBuilder, PermissionFlagsBits } from 'discord.js'
import { getUserAccess } from '$discord/get-user-access'
import { getUserAccess } from '$lib/discord/get-user-access'
import { prisma } from '$lib/db'
import {
postDiscussion,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { api } from '$discord/api'
import { api } from '$lib/discord/api'
import { Routes } from 'discord-api-types/v10'

/** applies a role to a given user */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { api } from '$discord/api'
import { api } from '$lib/discord/api'
import { Routes } from 'discord-api-types/v10'

/** removes a role from a given user */
Expand Down
4 changes: 2 additions & 2 deletions apps/discord-bot-frontend/src/lib/github/apply-roles.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createAppAuth } from '@octokit/auth-app'
import { Octokit } from '@octokit/rest'
import { addRole } from '$discord/roles/addRole'
import { removeRole } from '$discord/roles/removeRole'
import { addRole } from '$lib/discord/roles/addRole'
import { removeRole } from '$lib/discord/roles/removeRole'
import { ACCESS_LEVELS } from '$lib/constants'
import { prisma } from '$lib/db'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { env } from '$env/dynamic/private'
import {
commands as bank,
type Command as CommandType,
} from '$discord/commands'
} from '$lib/discord/commands'
import { prisma } from '$lib/db'
import { FEATURE_TYPES } from '$lib/constants'
import { type PageServerLoad } from './$types'
Expand Down
2 changes: 1 addition & 1 deletion apps/discord-bot-frontend/src/routes/api/_discord.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { createDiscordApi } from '$discord/api'
import { createDiscordApi } from '$lib/discord/api'

export const api = createDiscordApi(process.env.DISCORD_BOT_TOKEN)
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
registerCommands,
unregisterCommand,
commands,
} from '$discord/commands'
} from '$lib/discord/commands'

export const POST: RequestHandler = async ({ locals }) => {
const list = await registerCommands(undefined, locals.guildId)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Routes } from 'discord-api-types/v10'
import { api } from '$discord/api'
import { api } from '$lib/discord/api'
import type { RequestHandler } from '@sveltejs/kit'
import type { APIGuildMember } from 'discord-api-types/v10'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { json } from '@sveltejs/kit'
import { addRole } from '$discord/roles/addRole'
import { addRole } from '$lib/discord/roles/addRole'
import { ACCESS_LEVELS } from '$lib/constants'
import { prisma } from '$lib/db'
import { removeRole } from '$discord/roles/removeRole'
import { removeRole } from '$lib/discord/roles/removeRole'
import { verifyGithubWebhookEvent } from '../_verifyWebhook'
import type { RequestHandler } from '@sveltejs/kit'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { error } from '@sveltejs/kit'
import { Routes } from 'discord-api-types/v10'
import { api } from '$discord/api'
import { api } from '$lib/discord/api'
import { prisma } from '$lib/db'
import { getGitHubMembers } from '$lib/github/get-github-members'
import { getStaffContributors } from './helpers/get-staff-contributors'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Routes } from 'discord-api-types/v10'
import { api } from '$discord/api'
import { api } from '$lib/discord/api'
import { isHelpChannel } from '$lib/discord/support'
import type { APIPartialChannel } from 'discord-api-types/v10'
import type { ForumChannel, TextChannel } from 'discord.js'
Expand Down
2 changes: 1 addition & 1 deletion apps/discord-bot-frontend/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createBot } from '$discord/client'
import { createBot } from '$lib/discord/client'
import { init } from '$lib/db'
import express from 'express'

Expand Down
4 changes: 1 addition & 3 deletions apps/discord-bot-frontend/svelte.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { resolve } from 'node:path'
import adapter from '@sveltejs/adapter-node'
import { vitePreprocess } from '@sveltejs/kit/vite'
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
import { optimizeCarbonImports } from 'carbon-preprocess-svelte'

/** @type {import('@sveltejs/kit').Config} */
Expand All @@ -14,11 +14,9 @@ const config = {
// You can create optimized builds for different platforms by
// specifying a different adapter
adapter: adapter(),

files: {
assets: resolve('public'),
},

csp: {
mode: 'auto',
directives: {
Expand Down
7 changes: 0 additions & 7 deletions apps/discord-bot-frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,10 @@
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"allowJs": true,
"baseUrl": ".",
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"importsNotUsedAsValues": "remove",
"paths": {
"$lib": ["./src/lib"],
"$lib/*": ["./src/lib/*"],
"$discord": ["./src/lib/discord"],
"$discord/*": ["./src/lib/discord/*"]
},
"skipLibCheck": true,
"sourceMap": true,
"strict": true
Expand Down
2 changes: 0 additions & 2 deletions apps/discord-bot-frontend/tsconfig.server.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"paths": {
"$lib": ["./src/lib"],
"$lib/*": ["./src/lib/*"],
"$discord": ["./src/lib/discord"],
"$discord/*": ["./src/lib/discord/*"]
},
"skipLibCheck": true,
"sourceMap": true,
Expand Down
13 changes: 1 addition & 12 deletions apps/discord-bot-frontend/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,8 @@ export default defineConfig({
define: {
'import.meta.vitest': 'undefined',
},
optimizeDeps: {
esbuildOptions: {
target: 'esnext',
},
include: ['@carbon/charts'],
},
plugins: [sveltekit()],
resolve: {
alias: {
$discord: relative('./src/lib/discord'),
},
},
ssr: {
noExternal: ['@carbon/charts', 'carbon-components'],
noExternal: process.env.NODE_ENV === 'production' ? ['@carbon/charts'] : []
},
})
22 changes: 11 additions & 11 deletions cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
"devDependencies": {
"@aws-amplify/discord-bot-support": "workspace:*",
"@aws-amplify/discord-bot-tsconfig": "workspace:*",
"@types/node": "18.7.16",
"aws-cdk": "2.77.0",
"aws-cdk-lib": "2.77.0",
"constructs": "10.1.97",
"esbuild": "^0.17.19",
"@types/node": "20.11.10",
"aws-cdk": "2.124.0",
"aws-cdk-lib": "2.124.0",
"constructs": "10.3.0",
"esbuild": "^0.20.0",
"source-map-support": "^0.5.21",
"typescript": "^4.8.3",
"uuid": "^9.0.0",
"vite": "^3.1.0",
"vite-node": "^0.23.1"
"typescript": "^5.3.3",
"uuid": "^9.0.1",
"vite": "^5.0.12",
"vite-node": "^1.2.2"
},
"dependencies": {
"@aws-sdk/client-ssm": "^3.142.0",
"@discordjs/builders": "^1.1.0"
"@aws-sdk/client-ssm": "^3.502.0",
"@discordjs/builders": "^1.7.0"
}
}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
},
"devDependencies": {
"@aws-amplify/discord-bot-scripts": "workspace:*",
"@typescript-eslint/eslint-plugin": "^6.4.1",
"@typescript-eslint/parser": "^6.4.1",
"eslint": "^8.48.0",
"eslint-config-prettier": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^6.20.0",
"@typescript-eslint/parser": "^6.20.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte3": "^4.0.0",
"lint-staged": "^13.0.3",
"prettier": "^2.7.1",
"prettier-plugin-svelte": "^2.7.0",
"typescript": "^5.2.2"
"lint-staged": "^15.2.0",
"prettier": "^3.2.4",
"prettier-plugin-svelte": "^3.1.2",
"typescript": "^5.3.3"
},
"prettier": {
"tabWidth": 2,
Expand Down
Loading
Loading