Skip to content

Commit de6110f

Browse files
committed
Merge branch 'next' into next-cli
# Conflicts: # defaultConfig.stub.js
2 parents 6c46170 + 377c925 commit de6110f

File tree

5 files changed

+29
-19
lines changed

5 files changed

+29
-19
lines changed

defaultConfig.stub.js

Whitespace-only changes.

src/corePlugins.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ import userSelect from './plugins/userSelect'
6161
import verticalAlign from './plugins/verticalAlign'
6262
import visibility from './plugins/visibility'
6363
import whitespace from './plugins/whitespace'
64+
import wordBreak from './plugins/wordBreak'
6465
import width from './plugins/width'
6566
import zIndex from './plugins/zIndex'
6667

@@ -131,6 +132,7 @@ export default function({ corePlugins: corePluginConfig }) {
131132
verticalAlign,
132133
visibility,
133134
whitespace,
135+
wordBreak,
134136
width,
135137
zIndex,
136138
})

src/plugins/whitespace.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@ export default function() {
77
'.whitespace-pre': { 'white-space': 'pre' },
88
'.whitespace-pre-line': { 'white-space': 'pre-line' },
99
'.whitespace-pre-wrap': { 'white-space': 'pre-wrap' },
10-
11-
'.break-normal': {
12-
'overflow-wrap': 'normal',
13-
'word-break': 'normal',
14-
},
15-
'.break-words': { 'overflow-wrap': 'break-word' },
16-
'.break-all': { 'word-break': 'break-all' },
17-
18-
'.truncate': {
19-
overflow: 'hidden',
20-
'text-overflow': 'ellipsis',
21-
'white-space': 'nowrap',
22-
},
2310
},
2411
config('variants.whitespace')
2512
)

src/plugins/wordBreak.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
export default function() {
2+
return function({ addUtilities, config }) {
3+
addUtilities(
4+
{
5+
'.break-normal': {
6+
'overflow-wrap': 'normal',
7+
'word-break': 'normal',
8+
},
9+
'.break-words': { 'overflow-wrap': 'break-word' },
10+
'.break-all': { 'word-break': 'break-all' },
11+
12+
'.truncate': {
13+
overflow: 'hidden',
14+
'text-overflow': 'ellipsis',
15+
'white-space': 'nowrap',
16+
},
17+
},
18+
config('variants.wordBreak')
19+
)
20+
}
21+
}

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -927,11 +927,11 @@ atob@^2.1.1:
927927
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
928928

929929
autoprefixer@^9.4.5:
930-
version "9.4.10"
931-
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.10.tgz#e1be61fc728bacac8f4252ed242711ec0dcc6a7b"
930+
version "9.5.0"
931+
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.0.tgz#7e51d0355c11596e6cf9a0afc9a44e86d1596c70"
932932
dependencies:
933933
browserslist "^4.4.2"
934-
caniuse-lite "^1.0.30000940"
934+
caniuse-lite "^1.0.30000947"
935935
normalize-range "^0.1.2"
936936
num2fraction "^1.2.2"
937937
postcss "^7.0.14"
@@ -1116,9 +1116,9 @@ camelcase@^5.0.0:
11161116
version "5.2.0"
11171117
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
11181118

1119-
caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000940:
1120-
version "1.0.30000941"
1121-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000941.tgz#f0810802b2ab8d27f4b625d4769a610e24d5a42c"
1119+
caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000947:
1120+
version "1.0.30000947"
1121+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000947.tgz#c30305e9701449c22e97f4e9837cea3d76aa3273"
11221122

11231123
capture-exit@^1.2.0:
11241124
version "1.2.0"

0 commit comments

Comments
 (0)