Skip to content

Commit

Permalink
fix: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
soomin9106 committed Jun 3, 2024
2 parents 5dec618 + 9e40204 commit 6290362
Show file tree
Hide file tree
Showing 44 changed files with 9,076 additions and 4,303 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cache-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: cache-install

on:
pull_request:
branches: ['main']
branches: ["main"]

jobs:
cache:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: lint-check

on:
pull_request:
branches: ['main']
branches: ["main"]

jobs:
lint-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
pull_request:
branches: ['main']
branches: ["main"]
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"plugins": ["prettier-plugin-tailwindcss"],
"singleQuote": true,
"singleQuote": false,
"semi": true,
"tabWidth": 2,
"trailingComma": "all",
Expand Down
20 changes: 10 additions & 10 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import type { StorybookConfig } from '@storybook/nextjs';
import type { StorybookConfig } from "@storybook/nextjs";

const config: StorybookConfig = {
stories: [
'../src/stories/**/*.mdx',
'../src/stories/**/*.stories.@(js|jsx|mjs|ts|tsx)',
"../src/stories/**/*.mdx",
"../src/stories/**/*.stories.@(js|jsx|mjs|ts|tsx)",
],
addons: [
'@storybook/addon-onboarding',
'@storybook/addon-links',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
"@storybook/addon-onboarding",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@chromatic-com/storybook",
"@storybook/addon-interactions",
],
framework: {
name: '@storybook/nextjs',
name: "@storybook/nextjs",
options: {},
},
staticDirs: ['../public'],
staticDirs: ["../public"],
};
export default config;
4 changes: 2 additions & 2 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Preview } from '@storybook/react';
import "../app/globals.css";
import type { Preview } from "@storybook/react";
import "../src/app/globals.css";

const preview: Preview = {
parameters: {
Expand Down
76 changes: 0 additions & 76 deletions app/globals.css

This file was deleted.

23 changes: 0 additions & 23 deletions app/layout.tsx

This file was deleted.

113 changes: 0 additions & 113 deletions app/page.tsx

This file was deleted.

8 changes: 0 additions & 8 deletions app/test/index.spec.ts

This file was deleted.

57 changes: 0 additions & 57 deletions components/ui/button.tsx

This file was deleted.

17 changes: 17 additions & 0 deletions create-component.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const { execSync } = require('child_process');
const componentName = process.argv[2];

if (!componentName) {
console.error('컴포넌트 이름을 입력해주세요.');
process.exit(1);
}

try {
execSync(`pnpm dlx shadcn-ui@latest add ${componentName}`, {
stdio: 'inherit',
});
} catch (error) {
console.error(`컴포넌트 생성 중 오류가 발생했습니다: ${error}`);
process.exit(1);
}
6 changes: 0 additions & 6 deletions lib/utils.ts

This file was deleted.

11 changes: 10 additions & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
output: "export"
output: "export",
reactStrictMode: true,
webpack: (config) => {
config.module.rules.push({
test: /\.svg$/,
use: ["@svgr/webpack"],
});

return config;
},
};

export default nextConfig;
Loading

0 comments on commit 6290362

Please sign in to comment.