Skip to content

Commit

Permalink
fix: resolve merge
Browse files Browse the repository at this point in the history
  • Loading branch information
a-honey committed Jan 13, 2024
2 parents e860bc8 + 11ccbd8 commit c7d425c
Show file tree
Hide file tree
Showing 110 changed files with 1,672 additions and 451 deletions.
24 changes: 12 additions & 12 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module.exports = {
"env": {
"browser": true,
"es2021": true
},
"extends": ["standard-with-typescript", "prettier"],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
}
}
env: {
browser: true,
es2021: true,
},
extends: ['standard-with-typescript', 'prettier'],
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
},
ignorePatterns: ['/src/assets/**'],
rules: {},
};
19 changes: 17 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
}
webpack: (config) => {
return {
...config,
module: {
...config.module,
rules: [
...(config.module.rules || []),
{
test: /\.svg$/,
use: ['@svgr/webpack'],
},
],
},
};
},
};

module.exports = nextConfig
module.exports = nextConfig;
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"@storybook/nextjs": "7.6.3",
"@storybook/react": "7.6.3",
"@storybook/test": "7.6.3",
"@svgr/webpack": "^8.1.0",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
Expand Down
7 changes: 7 additions & 0 deletions src/assets/icons/COMPONENT/BUTTON/TOGGLE.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/assets/icons/COMPONENT/CARD/ALERT.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c7d425c

Please sign in to comment.