Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Slider] Replace core Slider with SliderStyled #23308

Merged
merged 130 commits into from
Nov 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
c2d31cc
add emotion peer dependencies
mnajdova Sep 25, 2020
5ae933f
fixed types & tests
mnajdova Sep 25, 2020
18b0668
prettier
mnajdova Sep 25, 2020
f0ef95c
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 28, 2020
c7bebb8
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 28, 2020
92b2d6e
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 28, 2020
13da531
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 29, 2020
cf5d9a5
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 29, 2020
b8d1291
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 30, 2020
a9d8690
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Oct 2, 2020
497830a
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Oct 5, 2020
cedbe3b
extract components
mnajdova Oct 5, 2020
d50ea1e
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Oct 5, 2020
0f6a4cd
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Oct 7, 2020
c8bde3f
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Oct 8, 2020
f3ba419
init
mnajdova Oct 29, 2020
d9b1475
imports fixes
mnajdova Oct 29, 2020
18ce348
imports order
mnajdova Oct 29, 2020
fc94e1d
testing umd build
mnajdova Oct 29, 2020
8573dfe
prettier
mnajdova Oct 29, 2020
22f4581
changed imports
mnajdova Oct 29, 2020
f1eb139
fixes
mnajdova Oct 29, 2020
49f0799
fixes
mnajdova Oct 29, 2020
c11de66
wip
mnajdova Oct 29, 2020
25a0da4
proptypes fixed
mnajdova Oct 29, 2020
65b91c5
framer
mnajdova Oct 29, 2020
b1b38bf
build fix test
mnajdova Oct 29, 2020
cf9f1c8
framer & build test
mnajdova Oct 29, 2020
f663465
prettier
mnajdova Oct 29, 2020
d0fa6cc
test imports
mnajdova Oct 29, 2020
d0781f0
type fixes & prettier
mnajdova Oct 29, 2020
9a0aec4
various fixes
mnajdova Oct 29, 2020
3dfeb34
getClasses fix
mnajdova Oct 29, 2020
f97f831
Fixed CustomizedSlider example
mnajdova Oct 29, 2020
d209c18
quick review
oliviertassinari Oct 29, 2020
4371130
increase CSS specificity :/
oliviertassinari Oct 29, 2020
102163f
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Oct 30, 2020
e529e83
renamed ValueLabel* to SliderValueLabel*
mnajdova Oct 30, 2020
cb7bbf2
Removed SliderValueLabel component and keep specificity of 2
mnajdova Oct 30, 2020
da59a5d
prettier & proptypes
mnajdova Oct 30, 2020
81910b4
buildApi CSS changes wip
mnajdova Nov 2, 2020
8b0fd67
fixed css generation
mnajdova Nov 2, 2020
2d70b7c
improved unstyled example
mnajdova Nov 2, 2020
fc40e0e
init
mnajdova Nov 2, 2020
6e5325b
types :\
mnajdova Nov 2, 2020
c6df4f7
test ci
mnajdova Nov 2, 2020
7a866bc
fixed componentName
mnajdova Nov 2, 2020
3710638
componentName
mnajdova Nov 2, 2020
623569e
Merge branch 'feat/update-buildAPI-to-support-ComponentClassKey' into…
mnajdova Nov 2, 2020
094fa7d
fixes on the global classes
mnajdova Nov 2, 2020
773888e
updates on comments and fixes
mnajdova Nov 2, 2020
f447fd8
Update docs/scripts/buildApi.ts
mnajdova Nov 2, 2020
f310f0d
revert some changes
mnajdova Nov 2, 2020
582c59a
lint fixes
mnajdova Nov 2, 2020
3703322
refactored traversing of the AST tree
mnajdova Nov 2, 2020
2e56a22
trigger build
mnajdova Nov 2, 2020
0653705
Update packages/material-ui-lab/src/SliderStyled/SliderStyled.d.ts
mnajdova Nov 3, 2020
07f0078
docs:api
mnajdova Nov 3, 2020
e8b2879
comments
mnajdova Nov 3, 2020
f13f266
Merge branch 'feat/update-buildAPI-to-support-ComponentClassKey' into…
mnajdova Nov 3, 2020
94d3ec3
docs:api
mnajdova Nov 3, 2020
14a4699
some migration instructions
mnajdova Nov 6, 2020
c83de93
improved migration guide
mnajdova Nov 6, 2020
93709c1
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 11, 2020
f8bd219
fixes
mnajdova Nov 11, 2020
7b5e33a
fixes
mnajdova Nov 11, 2020
2a5315f
docs:api + removed comments
mnajdova Nov 11, 2020
08acd35
Update docs/scripts/buildApi.ts
mnajdova Nov 11, 2020
c6648b1
Update docs/scripts/buildApi.ts
mnajdova Nov 11, 2020
89a77d1
reverted some changes
mnajdova Nov 11, 2020
5c08447
prettier
mnajdova Nov 11, 2020
f7399ec
docs:api
mnajdova Nov 11, 2020
5f601d7
fixed buildAPI Demo generation for unstyled components
mnajdova Nov 11, 2020
481ea36
reverted some changes
mnajdova Nov 11, 2020
714a8e0
removed unstyled as dependency of lab
mnajdova Nov 11, 2020
dcc11d3
add missing demo link
oliviertassinari Nov 11, 2020
fdba4dd
indentation
oliviertassinari Nov 11, 2020
4a6f762
default config
oliviertassinari Nov 11, 2020
c677b25
proposed fix
oliviertassinari Nov 11, 2020
c0e9844
Merge branch 'next' into feat/slider-experiment-multiple-components
mnajdova Nov 12, 2020
f9eb4da
updates classes
mnajdova Nov 12, 2020
95ec2bc
names
mnajdova Nov 12, 2020
ab090ff
names as classes
mnajdova Nov 12, 2020
b185f33
lint
mnajdova Nov 12, 2020
170e2f0
style lint
mnajdova Nov 12, 2020
541eac5
small fixes
mnajdova Nov 12, 2020
2486fa3
Update docs/src/pages/components/slider-styled/UnstyledSlider.js
mnajdova Nov 12, 2020
9c8a3fe
Update docs/src/pages/components/slider-styled/UnstyledSlider.tsx
mnajdova Nov 12, 2020
afadb89
prettier & docs:typescript:formatted
mnajdova Nov 12, 2020
53a1d61
fix broken CSS
oliviertassinari Nov 12, 2020
ae1f99d
fixed vertical problem
mnajdova Nov 12, 2020
1037747
Merge branch 'feat/slider-experiment-multiple-components' of https://…
mnajdova Nov 12, 2020
55ef286
fixed disabled vertical slider
mnajdova Nov 12, 2020
cd61a81
Merge branch 'feat/slider-experiment-multiple-components' into feat/m…
mnajdova Nov 13, 2020
6e76e8c
fixes
mnajdova Nov 13, 2020
c843f77
docs:api
mnajdova Nov 13, 2020
5c3036a
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 13, 2020
2e0b610
Merge branch 'feat/move-slider-styled-to-core' into feat/move-slider-…
mnajdova Nov 13, 2020
814b2ec
docs:api fixes
mnajdova Nov 13, 2020
5ce5b30
removed migration guide around classes & prettier
mnajdova Nov 13, 2020
9badae1
Merge pull request #17 from mnajdova/feat/move-slider-styled-to-core-…
mnajdova Nov 14, 2020
4f44a04
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 14, 2020
1a69bcd
prettier
mnajdova Nov 14, 2020
8b88f29
cleanup
mnajdova Nov 14, 2020
418afb1
Removed duplicated code
mnajdova Nov 14, 2020
18590bd
fixed imports
mnajdova Nov 14, 2020
7cf858c
overrides
mnajdova Nov 14, 2020
b5e8dc2
Removed wrong specificity increasion
mnajdova Nov 14, 2020
2b2cdeb
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 16, 2020
4a2942c
updated version
mnajdova Nov 16, 2020
80f5769
Update test/regressions/index.js
mnajdova Nov 16, 2020
89b3ed8
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 17, 2020
c436db7
merge conflicts
mnajdova Nov 17, 2020
717a1f5
docs
mnajdova Nov 17, 2020
74a8d85
merge conflicts
mnajdova Nov 17, 2020
fa3258f
reverted some changes
mnajdova Nov 17, 2020
db20a1c
exported slideClasses
mnajdova Nov 17, 2020
b5e2840
prettier
mnajdova Nov 17, 2020
bdf9a0f
lint
mnajdova Nov 17, 2020
081852a
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 17, 2020
28336f1
docs:api
mnajdova Nov 17, 2020
6bad28d
trigger build
mnajdova Nov 17, 2020
663df7b
converted sliderClasses to ts
mnajdova Nov 18, 2020
654419e
broke circular dep
mnajdova Nov 18, 2020
ac5e3c3
reverted slider classes changes
mnajdova Nov 18, 2020
c042f82
prettier
mnajdova Nov 18, 2020
f7af03f
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Nov 18, 2020
d67bb6f
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 18, 2020
19f7742
prettier
mnajdova Nov 18, 2020
641be42
Merge branch 'next' into feat/move-slider-styled-to-core
mnajdova Nov 19, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ const errorCodesPath = path.resolve(__dirname, './docs/public/static/error-codes
const missingError = process.env.MUI_EXTRACT_ERROR_CODES === 'true' ? 'write' : 'annotate';

const defaultAlias = {
'@material-ui/core': './packages/material-ui/src',
'@material-ui/docs': './packages/material-ui-docs/src',
'@material-ui/icons': './packages/material-ui-icons/src',
'@material-ui/lab': './packages/material-ui-lab/src',
'@material-ui/styled-engine': './packages/material-ui-styled-engine/src',
'@material-ui/styled-engine-sc': './packages/material-ui-styled-engine-sc/src',
'@material-ui/styles': './packages/material-ui-styles/src',
'@material-ui/system': './packages/material-ui-system/src',
'@material-ui/unstyled': './packages/material-ui-unstyled/src',
'@material-ui/utils': './packages/material-ui-utils/src',
'typescript-to-proptypes': './packages/typescript-to-proptypes/src',
'@material-ui/core': path.resolve(__dirname, './packages/material-ui/src'),
'@material-ui/docs': path.resolve(__dirname, './packages/material-ui-docs/src'),
'@material-ui/icons': path.resolve(__dirname, './packages/material-ui-icons/src'),
'@material-ui/lab': path.resolve(__dirname, './packages/material-ui-lab/src'),
'@material-ui/styled-engine': path.resolve(__dirname, './packages/material-ui-styled-engine/src'),
'@material-ui/styled-engine-sc': path.resolve(
__dirname,
'./packages/material-ui-styled-engine-sc/src',
),
'@material-ui/styles': path.resolve(__dirname, './packages/material-ui-styles/src'),
'@material-ui/system': path.resolve(__dirname, './packages/material-ui-system/src'),
'@material-ui/unstyled': path.resolve(__dirname, './packages/material-ui-unstyled/src'),
'@material-ui/utils': path.resolve(__dirname, './packages/material-ui-utils/src'),
'typescript-to-proptypes': path.resolve(__dirname, './packages/typescript-to-proptypes/src'),
};

const productionPlugins = [
Expand All @@ -29,7 +32,7 @@ const productionPlugins = [
];

module.exports = function getBabelConfig(api) {
const useESModules = api.env(['legacy', 'modern', 'stable']);
const useESModules = api.env(['legacy', 'modern', 'stable', 'rollup']);

const presets = [
[
Expand Down Expand Up @@ -114,6 +117,18 @@ module.exports = function getBabelConfig(api) {
],
],
},
rollup: {
plugins: [
[
'babel-plugin-module-resolver',
{
alias: {
'@material-ui/unstyled': defaultAlias['@material-ui/unstyled'],
},
},
],
],
},
legacy: {
plugins: [
// IE11 support
Expand Down
15 changes: 0 additions & 15 deletions docs/pages/api-docs/slider-styled.js

This file was deleted.

95 changes: 0 additions & 95 deletions docs/pages/api-docs/slider-styled.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/pages/api-docs/slider-unstyled.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,5 @@ You can override the style of the component thanks to one of these customization

## Demos

- [Slider Styled](/components/slider-styled/)
- [Slider](/components/slider/)

Loading