From d5f5dbccdbeeef999b27e1acb8843832c45917f3 Mon Sep 17 00:00:00 2001 From: Nicolas Gallagher Date: Mon, 31 Dec 2018 17:22:05 -0800 Subject: [PATCH] [fix] inline-style-prefixer API update Fix #1217 --- package.json | 1 + .../src/modules/prefixStyles/index.js | 2 +- .../src/modules/prefixStyles/static.js | 27 ++++++++++--------- scripts/inline-style-prefixer/create.js | 7 ++--- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index e2aa4f71..387c9293 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "flow-bin": "^0.63.1", "glob": "^7.1.2", "husky": "^0.14.3", + "inline-style-prefixer": "^5.0.3", "jest": "^22.4.3", "jest-canvas-mock": "^1.0.2", "lint-staged": "^7.1.0", diff --git a/packages/react-native-web/src/modules/prefixStyles/index.js b/packages/react-native-web/src/modules/prefixStyles/index.js index 5d3096e0..b03823e8 100644 --- a/packages/react-native-web/src/modules/prefixStyles/index.js +++ b/packages/react-native-web/src/modules/prefixStyles/index.js @@ -7,7 +7,7 @@ * @flow */ -import createPrefixer from 'inline-style-prefixer/static/createPrefixer'; +import createPrefixer from 'inline-style-prefixer/lib/createPrefixer'; import staticData from './static'; const prefixAll = createPrefixer(staticData); diff --git a/packages/react-native-web/src/modules/prefixStyles/static.js b/packages/react-native-web/src/modules/prefixStyles/static.js index b0855d2a..e65e5bac 100644 --- a/packages/react-native-web/src/modules/prefixStyles/static.js +++ b/packages/react-native-web/src/modules/prefixStyles/static.js @@ -1,14 +1,15 @@ -import crossFade from 'inline-style-prefixer/static/plugins/crossFade'; -import cursor from 'inline-style-prefixer/static/plugins/cursor'; -import filter from 'inline-style-prefixer/static/plugins/filter'; -import flex from 'inline-style-prefixer/static/plugins/flex'; -import flexboxIE from 'inline-style-prefixer/static/plugins/flexboxIE'; -import flexboxOld from 'inline-style-prefixer/static/plugins/flexboxOld'; -import gradient from 'inline-style-prefixer/static/plugins/gradient'; -import imageSet from 'inline-style-prefixer/static/plugins/imageSet'; -import position from 'inline-style-prefixer/static/plugins/position'; -import sizing from 'inline-style-prefixer/static/plugins/sizing'; -import transition from 'inline-style-prefixer/static/plugins/transition'; +import backgroundClip from 'inline-style-prefixer/lib/plugins/backgroundClip'; +import crossFade from 'inline-style-prefixer/lib/plugins/crossFade'; +import cursor from 'inline-style-prefixer/lib/plugins/cursor'; +import filter from 'inline-style-prefixer/lib/plugins/filter'; +import flex from 'inline-style-prefixer/lib/plugins/flex'; +import flexboxIE from 'inline-style-prefixer/lib/plugins/flexboxIE'; +import flexboxOld from 'inline-style-prefixer/lib/plugins/flexboxOld'; +import gradient from 'inline-style-prefixer/lib/plugins/gradient'; +import imageSet from 'inline-style-prefixer/lib/plugins/imageSet'; +import position from 'inline-style-prefixer/lib/plugins/position'; +import sizing from 'inline-style-prefixer/lib/plugins/sizing'; +import transition from 'inline-style-prefixer/lib/plugins/transition'; const w = ['Webkit']; const m = ['Moz']; const ms = ['ms']; @@ -18,6 +19,7 @@ const wmms = ['Webkit', 'Moz', 'ms']; export default { plugins: [ + backgroundClip, crossFade, cursor, filter, @@ -120,6 +122,7 @@ export default { flowInto: wms, flowFrom: wms, regionFragment: wms, + textOrientation: w, textAlignLast: m, tabSize: m, wrapFlow: ms, @@ -144,7 +147,7 @@ export default { gridRowGap: ms, gridArea: ms, gridGap: ms, - textSizeAdjust: wms, + textSizeAdjust: ['ms', 'Webkit'], borderImage: w, borderImageOutset: w, borderImageRepeat: w, diff --git a/scripts/inline-style-prefixer/create.js b/scripts/inline-style-prefixer/create.js index 2e7f1415..b832ee05 100644 --- a/scripts/inline-style-prefixer/create.js +++ b/scripts/inline-style-prefixer/create.js @@ -1,6 +1,6 @@ 'use strict'; -const generator = require('inline-style-prefixer/generator'); +const generator = require('inline-style-prefixer/lib/generator').default; const path = require('path'); const browserList = { @@ -19,8 +19,5 @@ const browserList = { }; generator(browserList, { - staticPath: path.join( - __dirname, - '../../packages/react-native-web/src/modules/prefixStyles/static.js' - ) + path: path.join(__dirname, '../../packages/react-native-web/src/modules/prefixStyles/static.js') });