Skip to content

Commit 0b069d9

Browse files
oliviertassinarieps1lon
authored andcommitted
[DatePicker] Squash compat commits
Move picker sources into lab (#4) Update README.md [DatePicker] Refactor pickers tests to testing-library and mocha (#5) [TimePicker] Migrate tests to testing library (#8) [DateTimePicker] Migrate tests (#9) Fix all pickers linter errors (#10) Fix all circular dependencies (#11) * Fix all circular dependencies * Enable mocha eslint rules for typescript tests [test] The last step to a green CI (#15) Migrate pickers docs (#12) Downgrade to withStyles for pickers sources (#16) Add public api exports for pickers components (#17) Consolidate component namespace and theme augmentation (#18) Describe conformance for pickers sub-components (#19) Autogenerate proptypes for typescript sources (#20) Proper build output (#21) Clear migration artifacts (#23) Eslint rule for lower-case test name convention (#24) DateRangePicker (#25) yarn deduplicate Remove GridListTile [DateTimePicker] Fix migration unit tests Fix types Fix typescript types migration issues Fix yarn lerna build (#33) Fix karma tests use window.Touch for CI karma tests Remove more outdated diff noise (#34) Replace not valid formats with valid ISO strings Try to fix CI touch tests Skip tests if Touch events are not supported Fix merge conflicts Actually type-check Fix safari tests Remove lowercase test name rule The casing is up to the test author. We're not the grammar police in tests. Fix lint Format Remove overzealous eslint-disable* Debug failing tests Better debugging Timezones are fun was isoString th efix? Let's find out what's failing and then skip it Branch for safari Skip DateRangePicker in browsers review Matt's review Co-authored-by: Matt <[email protected]> format docs:i18n
1 parent e324bcc commit 0b069d9

File tree

491 files changed

+14901
-31833
lines changed

Some content is hidden

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

491 files changed

+14901
-31833
lines changed

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ module.exports = {
6464
'!@material-ui/utils/macros',
6565
'@material-ui/utils/macros/*',
6666
'!@material-ui/utils/macros/*.macro',
67-
// public API: https://next.material-ui-pickers.dev/getting-started/installation#peer-library
68-
'!@material-ui/pickers/adapter/*',
67+
'!@material-ui/lab/dateAdapter/*',
6968
],
7069
},
7170
],

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
.idea
55
.vscode
66
*.log
7+
*.tsbuildinfo
78
/.eslintcache
89
/.nyc_output
910
/benchmark/**/dist

docs/next.config.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ module.exports = {
7171

7272
config.externals = [
7373
(context, request, callback) => {
74-
const hasDependencyOnRepoPackages = ['notistack', '@material-ui/pickers'].includes(
75-
request,
76-
);
74+
const hasDependencyOnRepoPackages = ['notistack'].includes(request);
7775

7876
if (hasDependencyOnRepoPackages) {
7977
return callback(null);
@@ -108,7 +106,7 @@ module.exports = {
108106
// transpile 3rd party packages with dependencies in this repository
109107
{
110108
test: /\.(js|mjs|jsx)$/,
111-
include: /node_modules(\/|\\)(notistack|@material-ui(\/|\\)pickers)/,
109+
include: /node_modules(\/|\\)notistack/,
112110
use: {
113111
loader: 'babel-loader',
114112
options: {

docs/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"@material-ui/docs": "^5.0.0-alpha.1",
3333
"@material-ui/icons": "^5.0.0-alpha.1",
3434
"@material-ui/lab": "^5.0.0-alpha.1",
35-
"@material-ui/pickers": "^4.0.0-alpha.11",
3635
"@material-ui/styled-engine": "^5.0.0-alpha.1",
3736
"@material-ui/styled-engine-sc": "^5.0.0-alpha.1",
3837
"@material-ui/styles": "^5.0.0-alpha.1",
@@ -69,7 +68,7 @@
6968
"create-emotion-server": "^10.0.27",
7069
"cross-env": "^7.0.0",
7170
"css-mediaquery": "^0.1.2",
72-
"date-fns": "^2.15.0",
71+
"date-fns": "^2.0.0",
7372
"docsearch.js": "^2.6.3",
7473
"doctrine": "^3.0.0",
7574
"emotion-theming": "^10.0.27",
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from 'react';
2+
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
3+
import { prepareMarkdown } from 'docs/src/modules/utils/parseMarkdown';
4+
5+
const pageFilename = 'components/date-picker';
6+
const requireDemo = require.context('docs/src/pages/components/date-picker', false, /\.(js|tsx)$/);
7+
const requireRaw = require.context(
8+
'!raw-loader!../../src/pages/components/date-picker',
9+
false,
10+
/\.(js|md|tsx)$/,
11+
);
12+
13+
// Run styled-components ref logic
14+
// https://github.com/styled-components/styled-components/pull/2998
15+
requireDemo.keys().map(requireDemo);
16+
17+
export default function Page({ demos, docs }) {
18+
return <MarkdownDocs demos={demos} docs={docs} requireDemo={requireDemo} />;
19+
}
20+
21+
Page.getInitialProps = () => {
22+
const { demos, docs } = prepareMarkdown({ pageFilename, requireRaw });
23+
return { demos, docs };
24+
};
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React from 'react';
2+
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
3+
import { prepareMarkdown } from 'docs/src/modules/utils/parseMarkdown';
4+
5+
const pageFilename = 'components/date-range-picker';
6+
const requireDemo = require.context(
7+
'docs/src/pages/components/date-range-picker',
8+
false,
9+
/\.(js|tsx)$/,
10+
);
11+
const requireRaw = require.context(
12+
'!raw-loader!../../src/pages/components/date-range-picker',
13+
false,
14+
/\.(js|md|tsx)$/,
15+
);
16+
17+
// Run styled-components ref logic
18+
// https://github.com/styled-components/styled-components/pull/2998
19+
requireDemo.keys().map(requireDemo);
20+
21+
export default function Page({ demos, docs }) {
22+
return <MarkdownDocs demos={demos} docs={docs} requireDemo={requireDemo} />;
23+
}
24+
25+
Page.getInitialProps = () => {
26+
const { demos, docs } = prepareMarkdown({ pageFilename, requireRaw });
27+
return { demos, docs };
28+
};
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React from 'react';
2+
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
3+
import { prepareMarkdown } from 'docs/src/modules/utils/parseMarkdown';
4+
5+
const pageFilename = 'components/date-time-picker';
6+
const requireDemo = require.context(
7+
'docs/src/pages/components/date-time-picker',
8+
false,
9+
/\.(js|tsx)$/,
10+
);
11+
const requireRaw = require.context(
12+
'!raw-loader!../../src/pages/components/date-time-picker',
13+
false,
14+
/\.(js|md|tsx)$/,
15+
);
16+
17+
// Run styled-components ref logic
18+
// https://github.com/styled-components/styled-components/pull/2998
19+
requireDemo.keys().map(requireDemo);
20+
21+
export default function Page({ demos, docs }) {
22+
return <MarkdownDocs demos={demos} docs={docs} requireDemo={requireDemo} />;
23+
}
24+
25+
Page.getInitialProps = () => {
26+
const { demos, docs } = prepareMarkdown({ pageFilename, requireRaw });
27+
return { demos, docs };
28+
};
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from 'react';
2+
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
3+
import { prepareMarkdown } from 'docs/src/modules/utils/parseMarkdown';
4+
5+
const pageFilename = 'components/time-picker';
6+
const requireDemo = require.context('docs/src/pages/components/time-picker', false, /\.(js|tsx)$/);
7+
const requireRaw = require.context(
8+
'!raw-loader!../../src/pages/components/time-picker',
9+
false,
10+
/\.(js|md|tsx)$/,
11+
);
12+
13+
// Run styled-components ref logic
14+
// https://github.com/styled-components/styled-components/pull/2998
15+
requireDemo.keys().map(requireDemo);
16+
17+
export default function Page({ demos, docs }) {
18+
return <MarkdownDocs demos={demos} docs={docs} requireDemo={requireDemo} />;
19+
}
20+
21+
Page.getInitialProps = () => {
22+
const { demos, docs } = prepareMarkdown({ pageFilename, requireRaw });
23+
return { demos, docs };
24+
};

docs/scripts/buildApi.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,10 @@ async function buildDocs(options: {
281281
prettierConfigPath,
282282
theme,
283283
} = options;
284+
if (componentObject.filename.indexOf('internal') !== -1) {
285+
return;
286+
}
287+
284288
const src = readFileSync(componentObject.filename, 'utf8');
285289

286290
if (src.match(/@ignore - internal component\./) || src.match(/@ignore - do not document\./)) {

docs/src/modules/utils/helpers.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ function includePeerDependencies(deps, versions) {
8383

8484
if (
8585
deps['@material-ui/lab'] ||
86-
deps['@material-ui/pickers'] ||
8786
deps['@material-ui/x'] ||
8887
deps['@material-ui/x-grid'] ||
8988
deps['@material-ui/x-pickers'] ||
@@ -98,10 +97,6 @@ function includePeerDependencies(deps, versions) {
9897
deps['@material-ui/icons'] = versions['@material-ui/icons'];
9998
deps['@material-ui/lab'] = versions['@material-ui/lab'];
10099
}
101-
102-
if (deps['@material-ui/pickers']) {
103-
deps['date-fns'] = 'latest';
104-
}
105100
}
106101

107102
/**
@@ -131,8 +126,10 @@ function getDependencies(raw, options = {}) {
131126

132127
const deps = {};
133128
const versions = {
134-
'react-dom': reactVersion,
135129
react: reactVersion,
130+
'react-dom': reactVersion,
131+
'@emotion/core': 'latest',
132+
'@emotion/styled': 'latest',
136133
'@material-ui/core': getMuiPackageVersion('core', muiCommitRef),
137134
'@material-ui/icons': getMuiPackageVersion('icons', muiCommitRef),
138135
'@material-ui/lab': getMuiPackageVersion('lab', muiCommitRef),
@@ -142,9 +139,6 @@ function getDependencies(raw, options = {}) {
142139
'@material-ui/system': getMuiPackageVersion('system', muiCommitRef),
143140
'@material-ui/unstyled': getMuiPackageVersion('unstyled', muiCommitRef),
144141
'@material-ui/utils': getMuiPackageVersion('utils', muiCommitRef),
145-
'@material-ui/pickers': 'next',
146-
'@emotion/core': 'latest',
147-
'@emotion/styled': 'latest',
148142
};
149143

150144
const re = /^import\s'([^']+)'|import\s[\s\S]*?\sfrom\s+'([^']+)/gm;
@@ -164,6 +158,12 @@ function getDependencies(raw, options = {}) {
164158
if (!deps[name]) {
165159
deps[name] = versions[name] ? versions[name] : 'latest';
166160
}
161+
162+
// e.g date-fns
163+
const dateAdapter = /^@material-ui\/lab\/dateAdapter\/(.*)/;
164+
if (dateAdapter.test(m[2])) {
165+
deps[dateAdapter.exec(m[2])[1]] = 'latest';
166+
}
167167
}
168168

169169
includePeerDependencies(deps, versions);

0 commit comments

Comments
 (0)