Skip to content
This repository was archived by the owner on Mar 26, 2022. It is now read-only.

Commit 36d5730

Browse files
UnsungHero97UnsungHero97
authored
Merge pull request #1062 from openlattice/develop
Release 2021-02-08
2 parents 9da37ef + 09bd453 commit 36d5730

File tree

183 files changed

+29207
-44635
lines changed

Some content is hidden

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

183 files changed

+29207
-44635
lines changed

‎.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
"react/no-did-update-set-state": "warn",
147147
"react/prefer-stateless-function": "warn",
148148
"react/prop-types": "warn",
149+
"react/react-in-jsx-scope": "off",
149150
"react/require-default-props": [
150151
"error",
151152
{

‎.flowconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323

2424
[options]
2525
esproposal.optional_chaining=enable
26+
react.runtime=automatic

‎config/babel/babel.config.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ module.exports = {
33
'@babel/plugin-proposal-class-properties',
44
'@babel/plugin-proposal-object-rest-spread',
55
'@babel/plugin-transform-runtime',
6-
'babel-plugin-styled-components',
6+
[
7+
'babel-plugin-styled-components',
8+
{ ssr: false, displayName: false, namespace: 'sc' },
9+
],
710
['babel-plugin-transform-imports', {
811
'@fortawesome/pro-duotone-svg-icons': {
912
transform: (importName) => `@fortawesome/pro-duotone-svg-icons/${importName}`,
@@ -30,6 +33,8 @@ module.exports = {
3033
presets: [
3134
'@babel/preset-env',
3235
'@babel/preset-flow',
33-
'@babel/preset-react',
36+
['@babel/preset-react', {
37+
runtime: 'automatic'
38+
}]
3439
],
3540
};

‎config/storybook/preview.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState } from 'react';
1+
import { useState } from 'react';
22

33
import styled from 'styled-components';
44
import { ThemeProvider } from '@material-ui/core';

‎package-lock.json‎

Lines changed: 4391 additions & 1434 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,47 +25,47 @@
2525
"main": "build/index.js",
2626
"dependencies": {
2727
"@date-io/luxon": "~1.3.13",
28-
"@fortawesome/fontawesome-svg-core": "~1.2.0",
29-
"@fortawesome/pro-duotone-svg-icons": "~5.15.1",
30-
"@fortawesome/pro-light-svg-icons": "~5.15.1",
31-
"@fortawesome/pro-regular-svg-icons": "~5.15.1",
32-
"@fortawesome/pro-solid-svg-icons": "~5.15.1",
28+
"@fortawesome/fontawesome-svg-core": "~1.2.34",
29+
"@fortawesome/pro-duotone-svg-icons": "~5.15.2",
30+
"@fortawesome/pro-light-svg-icons": "~5.15.2",
31+
"@fortawesome/pro-regular-svg-icons": "~5.15.2",
32+
"@fortawesome/pro-solid-svg-icons": "~5.15.2",
3333
"@fortawesome/react-fontawesome": "~0.1.0",
34-
"@material-ui/core": "~4.11.2",
34+
"@material-ui/core": "~4.11.3",
3535
"@material-ui/lab": "~4.0.0-alpha.57",
3636
"@material-ui/pickers": "~3.2.10",
37-
"@material-ui/styles": "~4.11.2",
37+
"@material-ui/styles": "~4.11.3",
3838
"clsx": "~1.1.1",
3939
"immutable": "4.0.0-rc.9",
4040
"lodash": "~4.17.20",
4141
"luxon": "~1.25.0",
42-
"polished": "~4.0.3",
42+
"polished": "~4.1.0",
4343
"prop-types": "~15.7.2",
4444
"react-scrolllock": "~5.0.1",
45-
"react-select": "~3.1.0",
45+
"react-select": "~4.0.2",
4646
"react-transition-group": "~4.4.1",
4747
"redux-reqseq": "0.5.0"
4848
},
4949
"devDependencies": {
50-
"@babel/cli": "~7.12.10",
51-
"@babel/core": "~7.12.10",
52-
"@babel/plugin-proposal-class-properties": "~7.12.1",
53-
"@babel/plugin-proposal-object-rest-spread": "~7.12.1",
54-
"@babel/plugin-transform-runtime": "~7.12.10",
50+
"@babel/cli": "~7.12.13",
51+
"@babel/core": "~7.12.13",
52+
"@babel/plugin-proposal-class-properties": "~7.12.13",
53+
"@babel/plugin-proposal-object-rest-spread": "~7.12.13",
54+
"@babel/plugin-transform-runtime": "~7.12.15",
5555
"@babel/polyfill": "~7.12.1",
56-
"@babel/preset-env": "~7.12.10",
57-
"@babel/preset-flow": "~7.12.1",
58-
"@babel/preset-react": "~7.12.10",
59-
"@babel/register": "~7.12.10",
60-
"@babel/runtime": "~7.12.5",
61-
"@storybook/addon-actions": "~6.1.11",
62-
"@storybook/addon-docs": "~6.1.11",
63-
"@storybook/addon-storysource": "~6.1.11",
64-
"@storybook/addons": "~6.1.11",
65-
"@storybook/react": "~6.1.11",
66-
"@storybook/source-loader": "~6.1.11",
56+
"@babel/preset-env": "~7.12.13",
57+
"@babel/preset-flow": "~7.12.13",
58+
"@babel/preset-react": "~7.12.13",
59+
"@babel/register": "~7.12.13",
60+
"@babel/runtime": "~7.12.13",
61+
"@storybook/addon-actions": "~6.1.17",
62+
"@storybook/addon-docs": "~6.1.17",
63+
"@storybook/addon-storysource": "~6.1.17",
64+
"@storybook/addons": "~6.1.17",
65+
"@storybook/react": "~6.1.17",
66+
"@storybook/source-loader": "~6.1.17",
6767
"@storybook/storybook-deployer": "~2.8.7",
68-
"@storybook/theming": "~6.1.11",
68+
"@storybook/theming": "~6.1.17",
6969
"babel-eslint": "~10.1.0",
7070
"babel-jest": "~26.6.3",
7171
"babel-loader": "~8.2.2",
@@ -75,7 +75,7 @@
7575
"enzyme": "~3.11.0",
7676
"enzyme-adapter-react-16": "~1.15.5",
7777
"enzyme-to-json": "~3.6.1",
78-
"eslint": "~7.16.0",
78+
"eslint": "~7.19.0",
7979
"eslint-config-airbnb": "~18.2.1",
8080
"eslint-import-resolver-webpack": "~0.13.0",
8181
"eslint-loader": "~4.0.2",
@@ -89,23 +89,23 @@
8989
"flow-bin": "~0.131.0",
9090
"import-sort-style-openlattice": "~0.1.0",
9191
"jest": "~26.6.3",
92-
"jest-styled-components": "~6.3.0",
92+
"jest-styled-components": "~7.0.3",
9393
"npm-run-all": "~4.1.5",
9494
"raw-loader": "~4.0.2",
95-
"react": "~16.13.0",
96-
"react-dom": "~16.13.0",
95+
"react": "~16.14.0",
96+
"react-dom": "~16.14.0",
9797
"react-router": "~5.2.0",
9898
"react-router-dom": "~5.2.0",
9999
"rimraf": "~3.0.2",
100100
"style-loader": "~2.0.0",
101-
"styled-components": "~4.4.0",
101+
"styled-components": "~5.2.1",
102102
"stylelint": "~13.9.0",
103103
"stylelint-config-standard": "~20.0.0",
104104
"stylelint-config-styled-components": "~0.1.1",
105105
"stylelint-processor-styled-components": "~1.10.0",
106106
"webpack": "~4.44.0",
107107
"webpack-cli": "~3.3.0",
108-
"webpack-dev-server": "~3.11.0",
108+
"webpack-dev-server": "~3.11.2",
109109
"webpack-hot-middleware": "~2.25.0"
110110
},
111111
"scripts": {

‎src/badge/src/components/Badge.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
// @flow
2-
import React from 'react';
3-
42
import styled from 'styled-components';
53

64
import * as Colors from '../../../colors';

‎src/badge/src/components/Badge.test.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import React from 'react';
2-
31
import toJson from 'enzyme-to-json';
42
import { mount } from 'enzyme';
53

‎src/badge/src/components/__snapshots__/Badge.test.js.snap‎

Lines changed: 24 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,16 @@ exports[`Badge snapshots default max value should be displayed 1`] = `
1616
max={999}
1717
mode="default"
1818
>
19-
<Badge__BadgeWrapper
19+
<styled.span
2020
mode="default"
2121
>
22-
<StyledComponent
23-
forwardedComponent={
24-
Object {
25-
"$$typeof": Symbol(react.forward_ref),
26-
"attrs": Array [],
27-
"componentStyle": ComponentStyle {
28-
"componentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
29-
"isStatic": false,
30-
"lastClassName": "c0",
31-
"rules": Array [
32-
"background-color:",
33-
[Function],
34-
";border-radius:2em;color:",
35-
[Function],
36-
";font-size:12px;font-weight:600;padding:0.1875em 0.5em;text-align:center;",
37-
],
38-
},
39-
"displayName": "Badge__BadgeWrapper",
40-
"foldedComponentIds": Array [],
41-
"render": [Function],
42-
"styledComponentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
43-
"target": "span",
44-
"toString": [Function],
45-
"warnTooManyClasses": [Function],
46-
"withComponent": [Function],
47-
}
48-
}
49-
forwardedRef={null}
22+
<span
23+
className="c0"
5024
mode="default"
5125
>
52-
<span
53-
className="c0"
54-
mode="default"
55-
>
56-
999+
57-
</span>
58-
</StyledComponent>
59-
</Badge__BadgeWrapper>
26+
999+
27+
</span>
28+
</styled.span>
6029
</Badge>
6130
`;
6231

@@ -76,47 +45,16 @@ exports[`Badge snapshots should match snapshot 1`] = `
7645
max={999}
7746
mode="default"
7847
>
79-
<Badge__BadgeWrapper
48+
<styled.span
8049
mode="default"
8150
>
82-
<StyledComponent
83-
forwardedComponent={
84-
Object {
85-
"$$typeof": Symbol(react.forward_ref),
86-
"attrs": Array [],
87-
"componentStyle": ComponentStyle {
88-
"componentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
89-
"isStatic": false,
90-
"lastClassName": "c0",
91-
"rules": Array [
92-
"background-color:",
93-
[Function],
94-
";border-radius:2em;color:",
95-
[Function],
96-
";font-size:12px;font-weight:600;padding:0.1875em 0.5em;text-align:center;",
97-
],
98-
},
99-
"displayName": "Badge__BadgeWrapper",
100-
"foldedComponentIds": Array [],
101-
"render": [Function],
102-
"styledComponentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
103-
"target": "span",
104-
"toString": [Function],
105-
"warnTooManyClasses": [Function],
106-
"withComponent": [Function],
107-
}
108-
}
109-
forwardedRef={null}
51+
<span
52+
className="c0"
11053
mode="default"
11154
>
112-
<span
113-
className="c0"
114-
mode="default"
115-
>
116-
10
117-
</span>
118-
</StyledComponent>
119-
</Badge__BadgeWrapper>
55+
10
56+
</span>
57+
</styled.span>
12058
</Badge>
12159
`;
12260

@@ -136,47 +74,16 @@ exports[`Badge snapshots text should show count and not max 1`] = `
13674
max="99"
13775
mode="default"
13876
>
139-
<Badge__BadgeWrapper
77+
<styled.span
14078
mode="default"
14179
>
142-
<StyledComponent
143-
forwardedComponent={
144-
Object {
145-
"$$typeof": Symbol(react.forward_ref),
146-
"attrs": Array [],
147-
"componentStyle": ComponentStyle {
148-
"componentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
149-
"isStatic": false,
150-
"lastClassName": "c0",
151-
"rules": Array [
152-
"background-color:",
153-
[Function],
154-
";border-radius:2em;color:",
155-
[Function],
156-
";font-size:12px;font-weight:600;padding:0.1875em 0.5em;text-align:center;",
157-
],
158-
},
159-
"displayName": "Badge__BadgeWrapper",
160-
"foldedComponentIds": Array [],
161-
"render": [Function],
162-
"styledComponentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
163-
"target": "span",
164-
"toString": [Function],
165-
"warnTooManyClasses": [Function],
166-
"withComponent": [Function],
167-
}
168-
}
169-
forwardedRef={null}
80+
<span
81+
className="c0"
17082
mode="default"
17183
>
172-
<span
173-
className="c0"
174-
mode="default"
175-
>
176-
82
177-
</span>
178-
</StyledComponent>
179-
</Badge__BadgeWrapper>
84+
82
85+
</span>
86+
</styled.span>
18087
</Badge>
18188
`;
18289

@@ -196,46 +103,15 @@ exports[`Badge snapshots text should show max and not count 1`] = `
196103
max="99"
197104
mode="default"
198105
>
199-
<Badge__BadgeWrapper
106+
<styled.span
200107
mode="default"
201108
>
202-
<StyledComponent
203-
forwardedComponent={
204-
Object {
205-
"$$typeof": Symbol(react.forward_ref),
206-
"attrs": Array [],
207-
"componentStyle": ComponentStyle {
208-
"componentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
209-
"isStatic": false,
210-
"lastClassName": "c0",
211-
"rules": Array [
212-
"background-color:",
213-
[Function],
214-
";border-radius:2em;color:",
215-
[Function],
216-
";font-size:12px;font-weight:600;padding:0.1875em 0.5em;text-align:center;",
217-
],
218-
},
219-
"displayName": "Badge__BadgeWrapper",
220-
"foldedComponentIds": Array [],
221-
"render": [Function],
222-
"styledComponentId": "Badge__BadgeWrapper-sc-1kfg7sp-0",
223-
"target": "span",
224-
"toString": [Function],
225-
"warnTooManyClasses": [Function],
226-
"withComponent": [Function],
227-
}
228-
}
229-
forwardedRef={null}
109+
<span
110+
className="c0"
230111
mode="default"
231112
>
232-
<span
233-
className="c0"
234-
mode="default"
235-
>
236-
100
237-
</span>
238-
</StyledComponent>
239-
</Badge__BadgeWrapper>
113+
100
114+
</span>
115+
</styled.span>
240116
</Badge>
241117
`;

‎src/badge/stories/badge.stories.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import React from 'react';
2-
31
import Badge from '..';
42
import { Card, CardSegment } from '../../layout';
53

0 commit comments

Comments
 (0)