Skip to content

Commit

Permalink
Merge branch 'dev' into origin/fix/#789-change-illustrations
Browse files Browse the repository at this point in the history
  • Loading branch information
quothraven1122 authored Jan 22, 2025
2 parents f0750f8 + 7f7dc8a commit 4d8d90c
Show file tree
Hide file tree
Showing 61 changed files with 4,430 additions and 907 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ yarn.lock
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
!.yarn/versions
*storybook.log
26 changes: 26 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/** @type { import('@storybook/react-webpack5').StorybookConfig } */

const path = require('path');

const config = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/preset-create-react-app',
'@storybook/addon-onboarding',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/react-webpack5',
options: {},
},
staticDirs: ['../public'],
webpackFinal: async (config) => {
config.resolve.alias = {
'@': path.resolve(__dirname, '../src'),
};
return config;
},
};
export default config;
14 changes: 14 additions & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/** @type { import('@storybook/react').Preview } */
const preview = {
parameters: {
controls: {
sort: 'requiredFirst',
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};

export default preview;
15 changes: 5 additions & 10 deletions craco.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
const { CracoAliasPlugin } = require('react-app-alias');
const path = require('path');

module.exports = {
plugins: [
{
plugin: CracoAliasPlugin,
options: {
source: 'jsconfig',
baseUrl: '.',
jsConfigPath: './jsconfig.json',
},
webpack: {
alias: {
'@': path.resolve(__dirname, 'src'),
},
],
},
};
9 changes: 0 additions & 9 deletions jsconfig.json

This file was deleted.

Loading

0 comments on commit 4d8d90c

Please sign in to comment.