@tarojs/rn-style-transformer 3.5.0-beta.6 → 3.5.0-beta.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/__tests__/index.spec.js
CHANGED
|
@@ -41,6 +41,20 @@ describe('style transform', () => {
|
|
|
41
41
|
}`))
|
|
42
42
|
})
|
|
43
43
|
|
|
44
|
+
it('.css transform viewport unit', async () => {
|
|
45
|
+
const css = await run(`
|
|
46
|
+
.test {
|
|
47
|
+
height: 10vh;
|
|
48
|
+
}
|
|
49
|
+
`)
|
|
50
|
+
expect(css).toEqual(getWrapedCSS(`{
|
|
51
|
+
"test": {
|
|
52
|
+
"height": scaleVu2dp(10, 'vh')
|
|
53
|
+
},
|
|
54
|
+
"__viewportUnits": true
|
|
55
|
+
}`))
|
|
56
|
+
})
|
|
57
|
+
|
|
44
58
|
it('.css transform @import', async () => {
|
|
45
59
|
const css = await run(`
|
|
46
60
|
@import './b.css';
|
package/dist/transforms/index.js
CHANGED
|
@@ -38,15 +38,8 @@ const StyleSheet_1 = require("./StyleSheet");
|
|
|
38
38
|
const stylus_1 = __importStar(require("./stylus"));
|
|
39
39
|
function getWrapedCSS(css) {
|
|
40
40
|
return `
|
|
41
|
-
import { StyleSheet
|
|
42
|
-
|
|
43
|
-
// 一般app 只有竖屏模式，所以可以只获取一次 width
|
|
44
|
-
const deviceWidthDp = Dimensions.get('window').width
|
|
45
|
-
const uiWidthPx = 375
|
|
46
|
-
|
|
47
|
-
function scalePx2dp (uiElementPx) {
|
|
48
|
-
return uiElementPx * deviceWidthDp / uiWidthPx
|
|
49
|
-
}
|
|
41
|
+
import { StyleSheet } from 'react-native'
|
|
42
|
+
import { scalePx2dp, scaleVu2dp } from '@tarojs/runtime-rn'
|
|
50
43
|
|
|
51
44
|
// 用来标识 rn-runner transformer 是否读写缓存
|
|
52
45
|
function ignoreStyleFileCache() {}
|
|
@@ -202,7 +195,8 @@ class StyleTransform {
|
|
|
202
195
|
// stylelint，转换成对象，对对象进行校验
|
|
203
196
|
validateStyle({ styleObject, filename });
|
|
204
197
|
const css = JSON.stringify(styleObject, null, 2)
|
|
205
|
-
.replace(/"(scalePx2dp\(.*?\))"/g, '$1')
|
|
198
|
+
.replace(/"(scalePx2dp\(.*?\))"/g, '$1')
|
|
199
|
+
.replace(/"(scaleVu2dp\(.*?\))"/g, '$1');
|
|
206
200
|
// 注入自适应方法 scalePx2dp
|
|
207
201
|
return getWrapedCSS(css);
|
|
208
202
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transforms/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA0E;AAC1E,2CAA4B;AAC5B,wFAAmD;AAGnD,oCAA6C;AAC7C,kDAA4D;AAC5D,qDAAyF;AACzF,kDAA8E;AAC9E,6CAAmD;AACnD,mDAA0G;AAE1G,SAAgB,YAAY,CAAE,GAAG;IAC/B,OAAO
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transforms/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/rn-style-transformer",
|
|
3
|
-
"version": "3.5.0-beta.
|
|
3
|
+
"version": "3.5.0-beta.7",
|
|
4
4
|
"description": "提供Taro RN 统一处理样式文件能力",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -16,21 +16,21 @@
|
|
|
16
16
|
"npm": ">=6.0.0"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@tarojs/helper": "3.5.0-beta.
|
|
19
|
+
"@tarojs/helper": "3.5.0-beta.7",
|
|
20
20
|
"fbjs": "^2.0.0",
|
|
21
21
|
"less": "^3.12.2",
|
|
22
22
|
"postcss": "^8.4.12",
|
|
23
23
|
"postcss-import": "^12.0.1",
|
|
24
|
-
"postcss-pxtransform": "3.5.0-beta.
|
|
24
|
+
"postcss-pxtransform": "3.5.0-beta.7",
|
|
25
25
|
"postcss-reporter": "^6.0.1",
|
|
26
26
|
"prop-types": "^15.7.2",
|
|
27
27
|
"resolve": "^1.22.0",
|
|
28
28
|
"sass": "1.50.0",
|
|
29
29
|
"stylelint": "^14.9.1",
|
|
30
|
-
"stylelint-config-taro-rn": "3.5.0-beta.
|
|
31
|
-
"stylelint-taro-rn": "3.5.0-beta.
|
|
30
|
+
"stylelint-config-taro-rn": "3.5.0-beta.7",
|
|
31
|
+
"stylelint-taro-rn": "3.5.0-beta.7",
|
|
32
32
|
"stylus": "^0.55.0",
|
|
33
|
-
"taro-css-to-react-native": "3.5.0-beta.
|
|
33
|
+
"taro-css-to-react-native": "3.5.0-beta.7"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|
|
36
36
|
"test": "jest",
|
package/src/transforms/index.ts
CHANGED
|
@@ -12,15 +12,8 @@ import stylusTransform, { Config as StylusConfig, defaultOptions as stylusDefaul
|
|
|
12
12
|
|
|
13
13
|
export function getWrapedCSS (css) {
|
|
14
14
|
return `
|
|
15
|
-
import { StyleSheet
|
|
16
|
-
|
|
17
|
-
// 一般app 只有竖屏模式，所以可以只获取一次 width
|
|
18
|
-
const deviceWidthDp = Dimensions.get('window').width
|
|
19
|
-
const uiWidthPx = 375
|
|
20
|
-
|
|
21
|
-
function scalePx2dp (uiElementPx) {
|
|
22
|
-
return uiElementPx * deviceWidthDp / uiWidthPx
|
|
23
|
-
}
|
|
15
|
+
import { StyleSheet } from 'react-native'
|
|
16
|
+
import { scalePx2dp, scaleVu2dp } from '@tarojs/runtime-rn'
|
|
24
17
|
|
|
25
18
|
// 用来标识 rn-runner transformer 是否读写缓存
|
|
26
19
|
function ignoreStyleFileCache() {}
|
|
@@ -243,6 +236,7 @@ export default class StyleTransform {
|
|
|
243
236
|
validateStyle({ styleObject, filename })
|
|
244
237
|
const css = JSON.stringify(styleObject, null, 2)
|
|
245
238
|
.replace(/"(scalePx2dp\(.*?\))"/g, '$1')
|
|
239
|
+
.replace(/"(scaleVu2dp\(.*?\))"/g, '$1')
|
|
246
240
|
|
|
247
241
|
// 注入自适应方法 scalePx2dp
|
|
248
242
|
return getWrapedCSS(css)
|