Skip to content

Commit b896fab

Browse files
authored
Merge branch 'main' into develop
2 parents 4f1ab67 + 6ddd08a commit b896fab

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

eslint.config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@ import js from '@eslint/js';
22
import globals from 'globals';
33
import reactHooks from 'eslint-plugin-react-hooks';
44
import reactRefresh from 'eslint-plugin-react-refresh';
5+
56
import prettier from 'eslint-plugin-prettier';
67
import importPlugin from 'eslint-plugin-import';
78

89
const config = [
910
{ ignores: ['dist', 'eslint.config.js'] },
11+
1012
{
1113
files: ['**/*.{js,jsx}'],
1214
languageOptions: {
1315
ecmaVersion: 2020,
16+
1417
globals: {
1518
...globals.browser,
1619
...globals.node,
1720
},
21+
1822
parserOptions: {
1923
ecmaVersion: 'latest',
2024
ecmaFeatures: { jsx: true },
@@ -24,21 +28,26 @@ const config = [
2428
plugins: {
2529
'react-hooks': reactHooks,
2630
'react-refresh': reactRefresh,
31+
2732
prettier: prettier,
2833
import: importPlugin,
34+
2935
},
3036
rules: {
3137
...js.configs.recommended.rules,
3238
...reactHooks.configs.recommended.rules,
3339

40+
3441
'no-unused-vars': ['warn', { varsIgnorePattern: '^[A-Z_]' }],
3542
'no-console': 'warn',
3643
'prefer-const': 'warn',
3744

45+
3846
'react-refresh/only-export-components': [
3947
'warn',
4048
{ allowConstantExport: true },
4149
],
50+
4251
'react-hooks/rules-of-hooks': 'warn',
4352

4453
'prettier/prettier': ['warn', {}, { usePrettierrc: true }],

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
/>
3636
<meta property="og:url" content="https://rolling-gamma.vercel.app/" />
3737
<meta property="og:type" content="website" />
38-
3938
<meta name="twitter:card" content="summary_large_image" />
4039
<meta name="twitter:title" content="Rolling – 마음을 실은 종이비행기" />
4140
<meta
@@ -50,6 +49,7 @@
5049
<body>
5150
<div id="root"></div>
5251
<div id="modal-root"></div>
52+
5353
<script type="module" src="/src/main.jsx"></script>
5454
</body>
5555
</html>

package-lock.json

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ export default function App() {
3131
</Suspense>
3232
</>
3333
);
34-
}
34+
}

vite.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ import react from '@vitejs/plugin-react';
44
// https://vite.dev/config/
55
export default defineConfig({
66
plugins: [react()],
7-
});
7+
});

0 commit comments

Comments
 (0)