Skip to content

Commit 225f43c

Browse files
BrianzchenBrianzchen
authored
Fix the build: Upgrade inline-style-prefixer and typescript versions (#396)
This dependency has to be updated before future changes can be made. Without this change, the build is broken and doesn't work because `caniuse-api` removed the `ie_mob` browser. Related docs https://github.com/robinweser/inline-style-prefixer/blob/master/CHANGELOG.md#600 --- typescript tests breaking as a result of `typescript` version being too low. Updated to 3.2.0 as per recommendations Related issue DefinitelyTyped/DefinitelyTyped#47250
1 parent 223017e commit 225f43c

File tree

6 files changed

+258
-152
lines changed

6 files changed

+258
-152
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ sudo: false
22
language: node_js
33

44
node_js:
5-
- 6
65
- 8
7-
- node
6+
- 10
7+
- 12
8+
- 14
89

910
notifications:
1011
webhooks:

‎dist/aphrodite.js‎

Lines changed: 126 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
Object.defineProperty(exports, '__esModule', { value: true });
44

55
function _typeof(obj) {
6+
"@babel/helpers - typeof";
7+
68
if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
79
_typeof = function (obj) {
810
return typeof obj;
@@ -31,43 +33,71 @@ function _defineProperty(obj, key, value) {
3133
return obj;
3234
}
3335

34-
function _objectSpread(target) {
36+
function ownKeys(object, enumerableOnly) {
37+
var keys = Object.keys(object);
38+
39+
if (Object.getOwnPropertySymbols) {
40+
var symbols = Object.getOwnPropertySymbols(object);
41+
if (enumerableOnly) symbols = symbols.filter(function (sym) {
42+
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
43+
});
44+
keys.push.apply(keys, symbols);
45+
}
46+
47+
return keys;
48+
}
49+
50+
function _objectSpread2(target) {
3551
for (var i = 1; i < arguments.length; i++) {
3652
var source = arguments[i] != null ? arguments[i] : {};
37-
var ownKeys = Object.keys(source);
3853

39-
if (typeof Object.getOwnPropertySymbols === 'function') {
40-
ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
41-
return Object.getOwnPropertyDescriptor(source, sym).enumerable;
42-
}));
54+
if (i % 2) {
55+
ownKeys(Object(source), true).forEach(function (key) {
56+
_defineProperty(target, key, source[key]);
57+
});
58+
} else if (Object.getOwnPropertyDescriptors) {
59+
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
60+
} else {
61+
ownKeys(Object(source)).forEach(function (key) {
62+
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
63+
});
4364
}
44-
45-
ownKeys.forEach(function (key) {
46-
_defineProperty(target, key, source[key]);
47-
});
4865
}
4966

5067
return target;
5168
}
5269

5370
function _toConsumableArray(arr) {
54-
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread();
71+
return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
5572
}
5673

5774
function _arrayWithoutHoles(arr) {
58-
if (Array.isArray(arr)) {
59-
for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
60-
61-
return arr2;
62-
}
75+
if (Array.isArray(arr)) return _arrayLikeToArray(arr);
6376
}
6477

6578
function _iterableToArray(iter) {
66-
if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter);
79+
if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter);
80+
}
81+
82+
function _unsupportedIterableToArray(o, minLen) {
83+
if (!o) return;
84+
if (typeof o === "string") return _arrayLikeToArray(o, minLen);
85+
var n = Object.prototype.toString.call(o).slice(8, -1);
86+
if (n === "Object" && o.constructor) n = o.constructor.name;
87+
if (n === "Map" || n === "Set") return Array.from(o);
88+
if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
89+
}
90+
91+
function _arrayLikeToArray(arr, len) {
92+
if (len == null || len > arr.length) len = arr.length;
93+
94+
for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
95+
96+
return arr2;
6797
}
6898

6999
function _nonIterableSpread() {
70-
throw new TypeError("Invalid attempt to spread non-iterable instance");
100+
throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
71101
}
72102

73103
function hash(str) {
@@ -256,18 +286,18 @@ var importantify = function importantify(string
256286
);
257287
};
258288

259-
var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
289+
var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
260290

261291
function unwrapExports (x) {
262-
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x.default : x;
292+
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
263293
}
264294

265295
function createCommonjsModule(fn, module) {
266296
return module = { exports: {} }, fn(module, module.exports), module.exports;
267297
}
268298

269299
function getCjsExportFromNamespace (n) {
270-
return n && n.default || n;
300+
return n && n['default'] || n;
271301
}
272302

273303
// Use the fastest means possible to execute a task in its own turn, with
@@ -548,9 +578,7 @@ RawTask.prototype.call = function () {
548578
/* @flow */
549579
var MAP_EXISTS = typeof Map !== 'undefined';
550580

551-
var OrderedElements =
552-
/*#__PURE__*/
553-
function () {
581+
var OrderedElements = /*#__PURE__*/function () {
554582
/* ::
555583
elements: {[string]: any};
556584
keyOrder: string[];
@@ -1156,6 +1184,10 @@ function isSimplePositionValue(value) {
11561184
return typeof value === 'number' && !isNaN(value);
11571185
}
11581186

1187+
function isComplexSpanValue(value) {
1188+
return typeof value === 'string' && value.includes('/');
1189+
}
1190+
11591191
var alignmentValues = ['center', 'end', 'start', 'stretch'];
11601192

11611193
var displayValues = {
@@ -1173,16 +1205,26 @@ var propertyConverters = {
11731205
gridColumn: function gridColumn(value, style) {
11741206
if (isSimplePositionValue(value)) {
11751207
style.msGridColumn = value;
1208+
} else if (isComplexSpanValue(value)) {
1209+
var _value$split = value.split('/'),
1210+
_value$split2 = _slicedToArray(_value$split, 2),
1211+
start = _value$split2[0],
1212+
end = _value$split2[1];
1213+
1214+
propertyConverters.gridColumnStart(+start, style);
1215+
1216+
var _end$split = end.split(/ ?span /),
1217+
_end$split2 = _slicedToArray(_end$split, 2),
1218+
maybeSpan = _end$split2[0],
1219+
maybeNumber = _end$split2[1];
1220+
1221+
if (maybeSpan === '') {
1222+
propertyConverters.gridColumnEnd(+start + +maybeNumber, style);
1223+
} else {
1224+
propertyConverters.gridColumnEnd(+end, style);
1225+
}
11761226
} else {
1177-
var _value$split$map = value.split('/').map(function (position) {
1178-
return +position;
1179-
}),
1180-
_value$split$map2 = _slicedToArray(_value$split$map, 2),
1181-
start = _value$split$map2[0],
1182-
end = _value$split$map2[1];
1183-
1184-
propertyConverters.gridColumnStart(start, style);
1185-
propertyConverters.gridColumnEnd(end, style);
1227+
propertyConverters.gridColumnStart(value, style);
11861228
}
11871229
},
11881230

@@ -1203,16 +1245,26 @@ var propertyConverters = {
12031245
gridRow: function gridRow(value, style) {
12041246
if (isSimplePositionValue(value)) {
12051247
style.msGridRow = value;
1248+
} else if (isComplexSpanValue(value)) {
1249+
var _value$split3 = value.split('/'),
1250+
_value$split4 = _slicedToArray(_value$split3, 2),
1251+
start = _value$split4[0],
1252+
end = _value$split4[1];
1253+
1254+
propertyConverters.gridRowStart(+start, style);
1255+
1256+
var _end$split3 = end.split(/ ?span /),
1257+
_end$split4 = _slicedToArray(_end$split3, 2),
1258+
maybeSpan = _end$split4[0],
1259+
maybeNumber = _end$split4[1];
1260+
1261+
if (maybeSpan === '') {
1262+
propertyConverters.gridRowEnd(+start + +maybeNumber, style);
1263+
} else {
1264+
propertyConverters.gridRowEnd(+end, style);
1265+
}
12061266
} else {
1207-
var _value$split$map3 = value.split('/').map(function (position) {
1208-
return +position;
1209-
}),
1210-
_value$split$map4 = _slicedToArray(_value$split$map3, 2),
1211-
start = _value$split$map4[0],
1212-
end = _value$split$map4[1];
1213-
1214-
propertyConverters.gridRowStart(start, style);
1215-
propertyConverters.gridRowEnd(end, style);
1267+
propertyConverters.gridRowStart(value, style);
12161268
}
12171269
},
12181270

@@ -1400,7 +1452,8 @@ function hyphenateStyleName(name) {
14001452
}
14011453

14021454
var hyphenateStyleName$1 = /*#__PURE__*/Object.freeze({
1403-
default: hyphenateStyleName
1455+
__proto__: null,
1456+
'default': hyphenateStyleName
14041457
});
14051458

14061459
var _hyphenateStyleName = getCjsExportFromNamespace(hyphenateStyleName$1);
@@ -1549,32 +1602,32 @@ var staticData = {
15491602
"animationName": w,
15501603
"animationPlayState": w,
15511604
"animationTimingFunction": w,
1552-
"appearance": wm,
1605+
"appearance": wmms,
15531606
"userSelect": wmms,
15541607
"fontKerning": w,
1555-
"textEmphasisPosition": w,
1556-
"textEmphasis": w,
1557-
"textEmphasisStyle": w,
1558-
"textEmphasisColor": w,
1559-
"boxDecorationBreak": w,
1608+
"textEmphasisPosition": wms,
1609+
"textEmphasis": wms,
1610+
"textEmphasisStyle": wms,
1611+
"textEmphasisColor": wms,
1612+
"boxDecorationBreak": wms,
15601613
"clipPath": w,
1561-
"maskImage": w,
1562-
"maskMode": w,
1563-
"maskRepeat": w,
1564-
"maskPosition": w,
1565-
"maskClip": w,
1566-
"maskOrigin": w,
1567-
"maskSize": w,
1568-
"maskComposite": w,
1569-
"mask": w,
1570-
"maskBorderSource": w,
1571-
"maskBorderMode": w,
1572-
"maskBorderSlice": w,
1573-
"maskBorderWidth": w,
1574-
"maskBorderOutset": w,
1575-
"maskBorderRepeat": w,
1576-
"maskBorder": w,
1577-
"maskType": w,
1614+
"maskImage": wms,
1615+
"maskMode": wms,
1616+
"maskRepeat": wms,
1617+
"maskPosition": wms,
1618+
"maskClip": wms,
1619+
"maskOrigin": wms,
1620+
"maskSize": wms,
1621+
"maskComposite": wms,
1622+
"mask": wms,
1623+
"maskBorderSource": wms,
1624+
"maskBorderMode": wms,
1625+
"maskBorderSlice": wms,
1626+
"maskBorderWidth": wms,
1627+
"maskBorderOutset": wms,
1628+
"maskBorderRepeat": wms,
1629+
"maskBorder": wms,
1630+
"maskType": wms,
15781631
"textDecorationStyle": wm,
15791632
"textDecorationSkip": wm,
15801633
"textDecorationLine": wm,
@@ -1594,7 +1647,7 @@ var staticData = {
15941647
"columns": wm,
15951648
"columnSpan": wm,
15961649
"columnWidth": wm,
1597-
"writingMode": wms,
1650+
"writingMode": w,
15981651
"flex": wms,
15991652
"flexBasis": w,
16001653
"flexDirection": wms,
@@ -1632,7 +1685,7 @@ var staticData = {
16321685
"wrapThrough": ms,
16331686
"wrapMargin": ms,
16341687
"touchAction": ms,
1635-
"textSizeAdjust": wms,
1688+
"textSizeAdjust": ["ms", "Webkit"],
16361689
"borderImage": w,
16371690
"borderImageOutset": w,
16381691
"borderImageRepeat": w,
@@ -2349,7 +2402,7 @@ var unminifiedHashFn = function unminifiedHashFn(str
23492402

23502403

23512404
var initialHashFn = function initialHashFn() {
2352-
return hashString;
2405+
return hashString ;
23532406
};
23542407
var hashFn = initialHashFn();
23552408
var StyleSheet = {
@@ -2415,7 +2468,7 @@ var StyleSheetServer = typeof window !== 'undefined' ? null : {
24152468
* Not meant to be used in production.
24162469
*/
24172470

2418-
var StyleSheetTestUtils = null;
2471+
var StyleSheetTestUtils = null ;
24192472
/**
24202473
* Generate the Aphrodite API exports, with given `selectorHandlers` and
24212474
* `useImportant` state.
@@ -2428,7 +2481,7 @@ function makeExports(useImportant
24282481
/* : SelectorHandler[] */
24292482
= arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultSelectorHandlers;
24302483
return {
2431-
StyleSheet: _objectSpread({}, StyleSheet, {
2484+
StyleSheet: _objectSpread2(_objectSpread2({}, StyleSheet), {}, {
24322485
/**
24332486
* Returns a version of the exports of Aphrodite (i.e. an object
24342487
* with `css` and `StyleSheet` properties) which have some
@@ -2500,9 +2553,9 @@ exports.StyleSheet = StyleSheet$1;
25002553
exports.StyleSheetServer = StyleSheetServer$1;
25012554
exports.StyleSheetTestUtils = StyleSheetTestUtils$1;
25022555
exports.css = css;
2503-
exports.minify = minify;
2556+
exports.defaultSelectorHandlers = defaultSelectorHandlers$1;
25042557
exports.flushToStyleTag = flushToStyleTag$1;
25052558
exports.injectAndGetClassName = injectAndGetClassName$1;
2506-
exports.defaultSelectorHandlers = defaultSelectorHandlers$1;
2559+
exports.minify = minify;
25072560
exports.reset = reset$1;
25082561
exports.resetInjectedStyle = resetInjectedStyle$1;

0 commit comments

Comments
 (0)