Skip to content

Commit 2fb2ae5

Browse files
authored
Merge pull request #82 from solved-ac/release/v0.9.0
Release/v0.9.0
2 parents 45c5766 + 248eec6 commit 2fb2ae5

74 files changed

Lines changed: 5090 additions & 21685 deletions

Some content is hidden

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

.babelrc

Lines changed: 0 additions & 21 deletions
This file was deleted.

.eslintrc.js

Lines changed: 0 additions & 39 deletions
This file was deleted.

eslint.config.mjs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import react from '@eslint-react/eslint-plugin'
2+
import js from '@eslint/js'
3+
import eslintConfigPrettier from 'eslint-config-prettier'
4+
import reactHooks from 'eslint-plugin-react-hooks'
5+
import { defineConfig } from 'eslint/config'
6+
import tseslint from 'typescript-eslint'
7+
8+
export default defineConfig({
9+
files: ['**/*.{ts,tsx}'],
10+
languageOptions: {
11+
parser: tseslint.parser,
12+
parserOptions: {
13+
projectService: true,
14+
tsconfigRootDir: import.meta.dirname,
15+
},
16+
},
17+
extends: [
18+
js.configs.recommended,
19+
...tseslint.configs.recommended,
20+
eslintConfigPrettier,
21+
reactHooks.configs.flat.recommended,
22+
react.configs['recommended-type-checked'],
23+
],
24+
rules: {
25+
// Too strict for our codebase
26+
'@eslint-react/no-array-index-key': 'off',
27+
'@eslint-react/hooks-extra/no-direct-set-state-in-use-effect': 'off',
28+
},
29+
ignores: ['dist', 'build/'],
30+
})

example/.babelrc.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

example/.storybook/main.js

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
1-
const path = require('path')
2-
const toPath = (_path) => path.join(process.cwd(), _path)
3-
module.exports = {
1+
/** @type {import('@storybook/react-vite').StorybookConfig} */
2+
const config = {
43
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
5-
addons: [
6-
'@storybook/addon-links',
7-
'@storybook/addon-essentials',
8-
'@storybook/addon-interactions',
9-
// '@storybook/preset-create-react-app',
10-
],
11-
webpackFinal: async (config) => ({
12-
...config,
13-
resolve: {
14-
...config.resolve,
15-
alias: {
16-
...config.resolve.alias,
17-
'@emotion/core': toPath('node_modules/@emotion/react'),
18-
'@emotion/styled': toPath('node_modules/@emotion/styled'),
19-
'emotion-theming': toPath('node_modules/@emotion/react'),
20-
},
21-
},
22-
}),
4+
addons: ['@storybook/addon-links'],
235
framework: {
24-
name: '@storybook/react-webpack5',
6+
name: '@storybook/react-vite',
257
options: {},
268
},
279
docs: {
2810
autodocs: true,
2911
},
12+
viteFinal: (config) => {
13+
config.build = config.build ?? {}
14+
config.build.rollupOptions = config.build.rollupOptions ?? {}
15+
config.build.rollupOptions.onwarn = (warning, warn) => {
16+
if (warning.code === 'MODULE_LEVEL_DIRECTIVE') return
17+
warn(warning)
18+
}
19+
return config
20+
},
3021
}
22+
23+
export default config

example/package.json

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,29 @@
11
{
22
"name": "@solved-ac/ui-react-example",
3-
"homepage": ".",
43
"version": "0.0.0",
54
"private": true,
5+
"type": "module",
66
"scripts": {
7-
"start": "node ../node_modules/react-scripts/bin/react-scripts.js start",
8-
"build": "node ../node_modules/react-scripts/bin/react-scripts.js build",
9-
"test": "node ../node_modules/react-scripts/bin/react-scripts.js test",
10-
"eject": "node ../node_modules/react-scripts/bin/react-scripts.js eject",
11-
"storybook": "storybook dev -p 6006 -s public",
12-
"build-storybook": "storybook build -s public"
7+
"storybook": "storybook dev -p 6006",
8+
"build-storybook": "storybook build"
139
},
1410
"dependencies": {
1511
"@emotion/react": "link:../node_modules/@emotion/react",
1612
"@emotion/styled": "link:../node_modules/@emotion/styled",
1713
"@floating-ui/react": "link:../node_modules/@floating-ui/react",
1814
"@solved-ac/ui-react": "link:..",
19-
"@testing-library/jest-dom": "link:../node_modules/@testing-library/jest-dom",
20-
"@testing-library/react": "link:../node_modules/@testing-library/react",
21-
"@testing-library/user-event": "link:../node_modules/@testing-library/user-event",
22-
"@types/jest": "link:../node_modules/@types/jest",
23-
"@types/node": "link:../node_modules/@types/node",
2415
"@types/react": "link:../node_modules/@types/react",
2516
"@types/react-dom": "link:../node_modules/@types/react-dom",
2617
"framer-motion": "link:../node_modules/framer-motion",
2718
"react": "link:../node_modules/react",
2819
"react-dom": "link:../node_modules/react-dom",
29-
"react-scripts": "link:../node_modules/react-scripts",
3020
"typescript": "link:../node_modules/typescript"
3121
},
3222
"devDependencies": {
33-
"@babel/core": "^7.0.0",
34-
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
35-
"@babel/preset-env": "^7.22.5",
36-
"@babel/preset-react": "^7.22.5",
37-
"@babel/preset-typescript": "^7.22.5",
38-
"@storybook/addon-actions": "^7.0.21",
39-
"@storybook/addon-essentials": "^7.0.21",
40-
"@storybook/addon-interactions": "^7.0.21",
41-
"@storybook/addon-links": "^7.0.21",
42-
"@storybook/node-logger": "^7.0.21",
43-
"@storybook/preset-create-react-app": "^7.0.21",
44-
"@storybook/react": "^7.0.21",
45-
"@storybook/react-webpack5": "^7.0.21",
46-
"@storybook/testing-library": "^0.1.0",
47-
"babel-plugin-dynamic-import-node": "^2.3.3",
48-
"storybook": "^7.0.21",
49-
"webpack": "5"
50-
},
51-
"eslintConfig": {
52-
"extends": "react-app",
53-
"overrides": [
54-
{
55-
"files": [
56-
"**/*.stories.*"
57-
],
58-
"rules": {
59-
"import/no-anonymous-default-export": "off"
60-
}
61-
}
62-
]
63-
},
64-
"browserslist": {
65-
"production": [
66-
">0.2%",
67-
"not dead",
68-
"not op_mini all"
69-
],
70-
"development": [
71-
"last 1 chrome version",
72-
"last 1 firefox version",
73-
"last 1 safari version"
74-
]
23+
"@storybook/addon-links": "^10.2.12",
24+
"@storybook/react": "^10.2.12",
25+
"@storybook/react-vite": "^10.2.12",
26+
"storybook": "^10.2.12",
27+
"vite": "^6.0.0"
7528
}
7629
}

example/src/App.test.tsx

Lines changed: 0 additions & 9 deletions
This file was deleted.

example/src/App.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import '@solved-ac/ui-react/dist/index.css'
21
import React from 'react'
32

43
const App = () => {

example/src/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
2-
import ReactDOM from 'react-dom'
2+
import { createRoot } from 'react-dom/client'
33
import App from './App'
4-
import './index.css'
54

6-
7-
ReactDOM.render(<App />, document.getElementById('root'))
5+
const container = document.getElementById('root')!
6+
const root = createRoot(container)
7+
root.render(<App />)

0 commit comments

Comments
 (0)