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

[refactor] 의존성 업데이트 및 마이그레이션 #347

Merged
merged 15 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 8 additions & 8 deletions .github/workflows/aws-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.10"
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- uses: aws-actions/setup-sam@v2
- uses: aws-actions/configure-aws-credentials@v1
- uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ap-northeast-2
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
version: 9
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- name: Setup pnpm cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/lint-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,42 @@ jobs:
check:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Install pnpm
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
version: 9
run_install: false
- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- name: Setup pnpm cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- name: Build client
run: pnpm -r --filter=client build
- name: Run prettier check
run: pnpm -r prettier
- name: Run eslint in server and types
run: pnpm -r --filter=!client lint
- name: Run eslint on changed files in client
uses: tj-actions/eslint-changed-files@v13.3
uses: tj-actions/eslint-changed-files@v25
with:
path: "./packages/client"
file_extensions: |
**/*.ts
**/*.svelte
**/*.js
**/*.json
- name: Build client
run: pnpm -r --filter=client build
- name: Run svelte-check
run: pnpm -r check
4 changes: 2 additions & 2 deletions .github/workflows/openapi-gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
permissions: write-all
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Generate Swagger UI
uses: Legion2/swagger-ui-action@v1
with:
output: swagger-ui
spec-file: "packages/server/api.yaml"
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: swagger-ui
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"homepage": "https://github.com/EATSTEAK/lockerweb",
"devDependencies": {
"concurrently": "^8.2.1",
"lint-staged": "^14.0.1"
"concurrently": "^8.2.2",
"lint-staged": "^15.2.7"
}
}
13 changes: 0 additions & 13 deletions packages/client/.eslintignore

This file was deleted.

64 changes: 0 additions & 64 deletions packages/client/.eslintrc.cjs

This file was deleted.

117 changes: 117 additions & 0 deletions packages/client/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
import { fixupConfigRules, fixupPluginRules } from '@eslint/compat';
import typescriptEslint from '@typescript-eslint/eslint-plugin';
import tailwindcss from 'eslint-plugin-tailwindcss';
import globals from 'globals';
import parser from 'svelte-eslint-parser';
import tsParser from '@typescript-eslint/parser';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [
{
ignores: [
'**/*.cjs',
'**/.DS_Store',
'**/node_modules',
'build',
'.svelte-kit',
'package',
'**/.env',
'**/.env.*',
'!**/.env.example',
'**/pnpm-lock.yaml',
'**/package-lock.json',
'**/yarn.lock',
'eslint.config.mjs',
],
},
...fixupConfigRules(compat.extends('eslint:recommended', 'plugin:svelte/recommended')),
{
plugins: {
'@typescript-eslint': fixupPluginRules(typescriptEslint),
tailwindcss: fixupPluginRules(tailwindcss),
},

languageOptions: {
globals: {
...globals.browser,
...globals.node,
},

ecmaVersion: 2020,
sourceType: 'module',

parserOptions: {
project: 'tsconfig.json',
extraFileExtensions: ['.svelte'],
},
},

settings: {
svelte: {
kit: {
files: {
routes: 'src/routes',
},
},
},
},
},
...fixupConfigRules(
compat.extends(
'plugin:tailwindcss/recommended',
'plugin:@typescript-eslint/recommended',
'prettier',
),
).map((config) => ({
...config,
files: ['**/*.svelte'],
})),
{
files: ['**/*.svelte'],

languageOptions: {
parser: parser,
ecmaVersion: 5,
sourceType: 'script',

parserOptions: {
parser: '@typescript-eslint/parser',
},
},

rules: {
'@typescript-eslint/indent': 'off',
'@typescript-eslint/no-throw-literal': 'off',
'no-undef': 'off',
},
},
...fixupConfigRules(compat.extends('plugin:@typescript-eslint/recommended', 'prettier')).map(
(config) => ({
...config,
files: ['**/*.ts'],
}),
),
{
files: ['**/*.ts'],

languageOptions: {
parser: tsParser,
},

rules: {
'@typescript-eslint/indent': 'off',
'@typescript-eslint/no-throw-literal': 'off',
},
},
];
56 changes: 30 additions & 26 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{

Check warning on line 1 in packages/client/package.json

View workflow job for this annotation

GitHub Actions / check

[eslint] reported by reviewdog 🐶 File ignored because of a matching ignore pattern. Use "--no-ignore" to disable file ignore settings or use "--no-warn-ignored" to suppress this warning. Raw Output: {"ruleId":null,"fatal":false,"severity":1,"message":"File ignored because of a matching ignore pattern. Use \"--no-ignore\" to disable file ignore settings or use \"--no-warn-ignored\" to suppress this warning.","nodeType":null}
"name": "client",
"version": "1.0.2",
"scripts": {
Expand All @@ -15,33 +15,37 @@
"deploy": "node ./scripts/deploy.js"
},
"devDependencies": {
"@sveltejs/adapter-auto": "2.1.0",
"@sveltejs/adapter-static": "2.0.3",
"@sveltejs/kit": "^1.24.1",
"@tailwindcss/forms": "^0.5.6",
"@types/lodash.isequal": "^4.5.6",
"@typescript-eslint/eslint-plugin": "^6.6.0",
"@typescript-eslint/parser": "^6.6.0",
"autoprefixer": "^10.4.15",
"@eslint/compat": "^1.1.1",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.7.0",
"@sveltejs/adapter-auto": "3.2.2",
"@sveltejs/adapter-static": "3.0.2",
"@sveltejs/kit": "^2.5.18",
"@sveltejs/vite-plugin-svelte": "^3.1.1",
"@tailwindcss/forms": "^0.5.7",
"@types/lodash.isequal": "^4.5.8",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^7.16.1",
"autoprefixer": "^10.4.19",
"cross-env": "^7.0.3",
"eslint": "^8.49.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-svelte": "^2.33.0",
"eslint-plugin-tailwindcss": "^3.13.0",
"postcss": "^8.4.29",
"postcss-load-config": "^4.0.1",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.4",
"svelte": "^4.2.0",
"svelte-check": "^3.5.1",
"svelte-preprocess": "^5.0.4",
"tailwindcss": "^3.3.3",
"tslib": "^2.6.2",
"typescript": "^5.2.2",
"vite": "^4.4.9",
"zod": "^3.22.2"
"eslint": "^9.7.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.42.0",
"eslint-plugin-tailwindcss": "^3.17.4",
"globals": "^15.8.0",
"postcss": "^8.4.39",
"postcss-load-config": "^6.0.1",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.5",
"svelte": "^4.2.18",
"svelte-check": "^3.8.4",
"svelte-preprocess": "^6.0.2",
"tailwindcss": "^3.4.5",
"tslib": "^2.6.3",
"typescript": "^5.5.3",
"vite": "^5.3.3",
"zod": "^3.23.8"
},
"type": "module",
"dependencies": {
Expand Down
3 changes: 0 additions & 3 deletions packages/client/prettier.config.cjs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
let clazz = '';
export { clazz as class };

let { collapsed, set } = getContext<{
const { collapsed, set } = getContext<{
collapsed: Writable<boolean>;
set: (isCollapsed: boolean) => void;
}>('Sidebar');
Expand Down
Loading
Loading