Skip to content

Commit d2921fe

Browse files
authored
Merge pull request #29 from SOPT-36-NINEDOT/init/#28/router
2 parents 4565dec + cdb1be4 commit d2921fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3203
-1790
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ permissions:
1212

1313
jobs:
1414
build:
15-
if: github.event_name == 'pull_request' ||
16-
(github.event_name == 'push' && !contains(github.event.head_commit.message, '[skip ci]'))
15+
if: github.event_name == 'pull_request' ||
16+
(github.event_name == 'push' && !contains(github.event.head_commit.message, '[skip ci]'))
1717
runs-on: ubuntu-latest
1818

1919
steps:
@@ -28,13 +28,13 @@ jobs:
2828
- name: Set up Node.js
2929
uses: actions/setup-node@v4
3030
with:
31-
node-version: '22'
31+
node-version: '20'
3232
cache: 'pnpm'
3333
cache-dependency-path: 'pnpm-lock.yaml'
34-
34+
3535
- name: Install dependencies
3636
run: pnpm install --frozen-lockfile
37-
37+
3838
- name: Run Lint
3939
run: pnpm lint
4040

@@ -79,4 +79,4 @@ jobs:
7979

8080
- name: Fail job if build failed
8181
if: steps.build.outcome == 'failure'
82-
run: exit 1
82+
run: exit 1

.storybook/vitest.setup.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import '@storybook/addon-a11y/preview';
22

33
import { setProjectAnnotations } from '@storybook/react-vite';
4+
45
import * as globalStorybookConfig from './preview';
56

67
// This is an important step to apply the right configuration when testing your stories.

buildspec.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ version: 0.2
33
phases:
44
pre_build:
55
commands:
6-
- npm install
6+
- npm install -g pnpm
7+
- pnpm install --frozen-lockfile
78
build:
89
commands:
9-
- npm run build
10+
- pnpm build
1011

1112
artifacts:
1213
files:
1314
- '**/*'
14-
base-directory: build
15+
base-directory: dist
File renamed without changes.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"dev": "vite",
8-
"build": "tsc -b && vite build",
8+
"build": "pnpm lint && tsc -b && vite build",
99
"lint": "eslint .",
1010
"preview": "vite preview",
1111
"svgr": "npx @svgr/cli -d src/assets/svg --ignore-existing --typescript --no-dimensions public/svg",
@@ -18,7 +18,8 @@
1818
"axios": "^1.10.0",
1919
"react": "^19.1.0",
2020
"react-dom": "^19.1.0",
21-
"react-redux": "^9.2.0"
21+
"react-redux": "^9.2.0",
22+
"react-router-dom": "^7.6.3"
2223
},
2324
"devDependencies": {
2425
"@chromatic-com/storybook": "^4.0.1",

0 commit comments

Comments
 (0)