Skip to content

Commit 181bddd

Browse files
committed
Updates brave-ui to 0.20.x
1 parent 1b5629c commit 181bddd

File tree

14 files changed

+879
-1100
lines changed

14 files changed

+879
-1100
lines changed

components/brave_new_tab_ui/components/app.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { DragDropContext } from 'react-dnd'
77
import { bindActionCreators, Dispatch } from 'redux'
88
import { connect } from 'react-redux'
99
import HTML5Backend from 'react-dnd-html5-backend'
10-
import { Grid, Column, Clock } from 'brave-ui'
10+
import { Grid, Column } from 'brave-ui/components'
11+
import { Clock } from 'brave-ui/old'
1112

1213
// Components
1314
import Stats from './stats'

components/brave_new_tab_ui/components/newPrivateTab.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44

55
import * as React from 'react'
66
import { getLocale } from '../../common/locale'
7+
import { Grid, Column } from 'brave-ui/components'
78
import {
89
Page,
9-
Grid,
10-
Column,
1110
MediaContent,
1211
BoxedContent,
1312
Heading,
1413
Paragraph,
1514
SwitchButton,
1615
Clock
17-
} from 'brave-ui'
16+
} from 'brave-ui/old'
1817

1918
// Components
2019
import Stats from './stats'

components/brave_new_tab_ui/components/stats.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
import * as React from 'react'
6-
import { DataBlock, DataItem } from 'brave-ui/dataBlock'
6+
import { DataBlock, DataItem } from 'brave-ui/old'
77

88
// Constants
99
import { theme } from '../constants/theme'

components/brave_welcome_ui/components/app.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import * as React from 'react'
66
import { bindActionCreators, Dispatch } from 'redux'
77
import { connect } from 'react-redux'
8-
import { UnstyledButton } from 'brave-ui'
9-
import Panel from 'brave-ui/v1/panel'
8+
import { UnstyledButton } from 'brave-ui/old'
9+
import Panel from 'brave-ui/old/v1/panel'
1010

1111
// Components
1212
import BraveScreen from './braveScreen'

components/brave_welcome_ui/components/braveScreen.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
import * as React from 'react'
6-
import Image from 'brave-ui/v1/image'
7-
import { PushButton } from 'brave-ui/v1/pushButton'
8-
import { Heading, Paragraph } from 'brave-ui'
6+
import Image from 'brave-ui/old/v1/image'
7+
import { PushButton } from 'brave-ui/old/v1/pushButton'
8+
import { Heading, Paragraph } from 'brave-ui/old'
99

1010
// Constants
1111
import { theme } from '../constants/theme'

components/brave_welcome_ui/components/featuresScreen.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
import * as React from 'react'
6-
import Image from 'brave-ui/v1/image'
7-
import { PushButtonLink } from 'brave-ui/v1/pushButton'
8-
import { Heading, Paragraph } from 'brave-ui'
6+
import Image from 'brave-ui/old/v1/image'
7+
import { PushButtonLink } from 'brave-ui/old/v1/pushButton'
8+
import { Heading, Paragraph } from 'brave-ui/old'
99

1010
// Constants
1111
import { theme } from '../constants/theme'

components/brave_welcome_ui/components/footer.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
import * as React from 'react'
6-
import { PushButton, PushButtonLink } from 'brave-ui/v1/pushButton'
7-
import ArrowRight from 'brave-ui/v1/icons/arrowRight'
8-
import { Grid, Column, Anchor } from 'brave-ui'
6+
import { PushButton, PushButtonLink } from 'brave-ui/old/v1/pushButton'
7+
import ArrowRight from 'brave-ui/old/v1/icons/arrowRight'
8+
import { Grid, Column } from 'brave-ui/components'
9+
import { Anchor } from 'brave-ui/old'
910

1011
// Constants
1112
import { theme } from '../constants/theme'

components/brave_welcome_ui/components/importScreen.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
import * as React from 'react'
6-
import Image from 'brave-ui/v1/image'
7-
import { PushButton } from 'brave-ui/v1/pushButton'
8-
import { Heading, Paragraph } from 'brave-ui'
6+
import Image from 'brave-ui/old/v1/image'
7+
import { PushButton } from 'brave-ui/old/v1/pushButton'
8+
import { Heading, Paragraph } from 'brave-ui/old'
99

1010
// Constants
1111
import { theme } from '../constants/theme'

components/brave_welcome_ui/components/rewardsScreen.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
import * as React from 'react'
6-
import { Heading, Paragraph } from 'brave-ui'
7-
import Image from 'brave-ui/v1/image'
8-
import { PushButtonLink } from 'brave-ui/v1/pushButton'
6+
import { Heading, Paragraph } from 'brave-ui/old'
7+
import Image from 'brave-ui/old/v1/image'
8+
import { PushButtonLink } from 'brave-ui/old/v1/pushButton'
99

1010
// Constants
1111
import { theme } from '../constants/theme'

components/brave_welcome_ui/components/shieldsScreen.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
import * as React from 'react'
6-
import Image from 'brave-ui/v1/image'
7-
import { Heading, Paragraph } from 'brave-ui'
6+
import Image from 'brave-ui/old/v1/image'
7+
import { Heading, Paragraph } from 'brave-ui/old'
88

99
// Constants
1010
import { theme } from '../constants/theme'

components/webpack/dev.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = {
2020
new webpack.IgnorePlugin(/[^/]+\/[\S]+.dev$/)
2121
],
2222
resolve: {
23-
extensions: ['.ts', '.tsx', '.js']
23+
extensions: ['.js', '.tsx', '.ts']
2424
},
2525
module: {
2626
rules: [

components/webpack/prod.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
})
3232
],
3333
resolve: {
34-
extensions: ['.ts', '.tsx', '.js']
34+
extensions: ['.js', '.tsx', '.ts']
3535
},
3636
module: {
3737
rules: [

0 commit comments

Comments
 (0)