@tarojs/rn-style-transformer 3.5.7-alpha.9 → 3.5.8
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/dist/transforms/postcss.js +1 -3
- package/dist/transforms/postcss.js.map +1 -1
- package/dist/utils/reporterSkip.js +14 -17
- package/dist/utils/reporterSkip.js.map +1 -1
- package/package.json +9 -16
- package/src/transforms/postcss.ts +0 -1
- package/src/utils/reporterSkip.ts +13 -16
- package/tsconfig.json +1 -1
|
@@ -62,9 +62,7 @@ function makePostcssPlugins({ filename, designWidth, deviceRatio, postcssConfig,
|
|
|
62
62
|
plugins.push((0, postcss_pxtransform_1.default)(pxtransformOption.config));
|
|
63
63
|
}
|
|
64
64
|
const skipRows = additionalData ? additionalData.split('\n').length : 0;
|
|
65
|
-
plugins.push(require('stylelint')(rn_stylelint_json_1.default),
|
|
66
|
-
// @ts-ignore
|
|
67
|
-
(0, reporterSkip_1.default)({ skipRows, filename }), require('postcss-reporter')({ clearReportedMessages: true }));
|
|
65
|
+
plugins.push(require('stylelint')(rn_stylelint_json_1.default), (0, reporterSkip_1.default)({ skipRows, filename }), require('postcss-reporter')({ clearReportedMessages: true }));
|
|
68
66
|
Object.entries(postcssConfig).forEach(([pluginName, pluginOption]) => {
|
|
69
67
|
if (optionsWithDefaults.indexOf(pluginName) > -1)
|
|
70
68
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postcss.js","sourceRoot":"","sources":["../../src/transforms/postcss.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAoF;AACpF,2CAA4B;AAC5B,sDAA6B;AAC7B,oEAA0C;AAC1C,8EAA6C;AAC7C,qCAA6C;AAE7C,oFAAyD;AACzD,oCAAuC;AACvC,yEAAgD;AAEhD,MAAM,wBAAwB,GAE1B;IACF,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE;QACN,QAAQ,EAAE,IAAI;KACf;CACF,CAAA;AAED,SAAgB,kBAAkB,CAAE,EAClC,QAAQ,EACR,WAAW,EACX,WAAW,EACX,aAAa,EACb,gBAAgB,EAChB,cAAc,EACf;IACC,MAAM,mBAAmB,GAAG,CAAC,aAAa,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAA;IAE5G,IAAI,WAAW,EAAE;QACf,wBAAwB,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAA;KAC1D;IAED,IAAI,WAAW,EAAE;QACf,wBAAwB,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAA;KAC1D;IACD,MAAM,iBAAiB,GAAG,IAAA,uBAAc,EAAC,EAAE,EAAE,wBAAwB,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;IAEjG,MAAM,OAAO,GAAG;QACd,IAAA,wBAAa,EAAC;YACZ,OAAO,EAAE,SAAS,OAAO,CAAE,EAAU,EAAE,OAAe,EAAE,OAAsC;gBAC5F,OAAO,IAAA,oBAAY,EACjB,EAAE,kCAEG,OAAO,KACV,OAAO,EACP,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,aAAa,CAAC,KAAK,EAC1B,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,IAEtC,CAAA;YACH,CAAC;SACF,CAAC;KACH,CAAA;IAED,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,OAAO,CAAC,IAAI,CAAC,IAAA,6BAAW,EAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;KACpD;IAED,MAAM,QAAQ,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAEvE,OAAO,CAAC,IAAI,CACV,OAAO,CAAC,WAAW,CAAC,CAAC,2BAAe,CAAC
|
|
1
|
+
{"version":3,"file":"postcss.js","sourceRoot":"","sources":["../../src/transforms/postcss.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
function reporterSkip({ skipRows, filename }) {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
// @ts-ignore
|
|
5
|
+
return (css, result) => {
|
|
6
|
+
var _a;
|
|
7
|
+
(_a = result.messages) === null || _a === void 0 ? void 0 : _a.forEach((message) => {
|
|
8
8
|
var _a;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
//
|
|
16
|
-
|
|
17
|
-
// force modify line，then source map cannot read origin column, value is 0.
|
|
18
|
-
message.line -= skipRows;
|
|
19
|
-
}
|
|
9
|
+
const { line, column, node } = message;
|
|
10
|
+
const messageInput = (_a = node === null || node === void 0 ? void 0 : node.source) === null || _a === void 0 ? void 0 : _a.input;
|
|
11
|
+
if (messageInput) {
|
|
12
|
+
const originLocation = messageInput.origin(line, column);
|
|
13
|
+
// 如果是原始引入的样式文件，则对拼接的代码（addionalData）函数做减法
|
|
14
|
+
if (originLocation && originLocation.file.includes(filename)) {
|
|
15
|
+
// force modify line，then source map cannot read origin column, value is 0.
|
|
16
|
+
message.line -= skipRows;
|
|
20
17
|
}
|
|
21
|
-
}
|
|
22
|
-
}
|
|
18
|
+
}
|
|
19
|
+
});
|
|
23
20
|
};
|
|
24
21
|
}
|
|
25
22
|
exports.default = reporterSkip;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reporterSkip.js","sourceRoot":"","sources":["../../src/utils/reporterSkip.ts"],"names":[],"mappings":";;AAMA,SAAwB,YAAY,CAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAC1D,
|
|
1
|
+
{"version":3,"file":"reporterSkip.js","sourceRoot":"","sources":["../../src/utils/reporterSkip.ts"],"names":[],"mappings":";;AAMA,SAAwB,YAAY,CAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAC1D,aAAa;IACb,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;;QACrB,MAAA,MAAM,CAAC,QAAQ,0CAAE,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;;YACxC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;YAEtC,MAAM,YAAY,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,CAAA;YACxC,IAAI,YAAY,EAAE;gBAChB,MAAM,cAAc,GAAa,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAClE,0CAA0C;gBAC1C,IAAI,cAAc,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBAC5D,2EAA2E;oBAC3E,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAA;iBACzB;aACF;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAjBD,+BAiBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/rn-style-transformer",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.8",
|
|
4
4
|
"description": "提供Taro RN 统一处理样式文件能力",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -16,28 +16,21 @@
|
|
|
16
16
|
"npm": ">=6.0.0"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@babel/core": "^7.14.5",
|
|
20
|
-
"@tarojs/helper": "3.5.7-alpha.9",
|
|
21
19
|
"fbjs": "^2.0.0",
|
|
22
20
|
"less": "^3.12.2",
|
|
23
|
-
"
|
|
24
|
-
"postcss-import": "^
|
|
25
|
-
"postcss-
|
|
26
|
-
"postcss-reporter": "^7.0.5",
|
|
21
|
+
"postcss": "^8.4.12",
|
|
22
|
+
"postcss-import": "^12.0.1",
|
|
23
|
+
"postcss-reporter": "^6.0.1",
|
|
27
24
|
"prop-types": "^15.7.2",
|
|
28
25
|
"resolve": "^1.22.0",
|
|
29
26
|
"sass": "1.37.5",
|
|
30
27
|
"stylelint": "^14.9.1",
|
|
31
|
-
"stylelint-config-taro-rn": "3.5.7-alpha.9",
|
|
32
|
-
"stylelint-taro-rn": "3.5.7-alpha.9",
|
|
33
28
|
"stylus": "^0.55.0",
|
|
34
|
-
"
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
"
|
|
38
|
-
|
|
39
|
-
"peerDependencies": {
|
|
40
|
-
"postcss": "^8.4.18"
|
|
29
|
+
"@tarojs/helper": "3.5.8",
|
|
30
|
+
"postcss-pxtransform": "3.5.8",
|
|
31
|
+
"stylelint-config-taro-rn": "3.5.8",
|
|
32
|
+
"stylelint-taro-rn": "3.5.8",
|
|
33
|
+
"taro-css-to-react-native": "3.5.8"
|
|
41
34
|
},
|
|
42
35
|
"scripts": {
|
|
43
36
|
"test": "jest",
|
|
@@ -5,23 +5,20 @@ interface Location {
|
|
|
5
5
|
}
|
|
6
6
|
|
|
7
7
|
export default function reporterSkip ({ skipRows, filename }) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
result.messages?.forEach((message: any) => {
|
|
13
|
-
const { line, column, node } = message
|
|
8
|
+
// @ts-ignore
|
|
9
|
+
return (css, result) => {
|
|
10
|
+
result.messages?.forEach((message: any) => {
|
|
11
|
+
const { line, column, node } = message
|
|
14
12
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
13
|
+
const messageInput = node?.source?.input
|
|
14
|
+
if (messageInput) {
|
|
15
|
+
const originLocation: Location = messageInput.origin(line, column)
|
|
16
|
+
// 如果是原始引入的样式文件，则对拼接的代码（addionalData）函数做减法
|
|
17
|
+
if (originLocation && originLocation.file.includes(filename)) {
|
|
18
|
+
// force modify line，then source map cannot read origin column, value is 0.
|
|
19
|
+
message.line -= skipRows
|
|
23
20
|
}
|
|
24
|
-
}
|
|
25
|
-
}
|
|
21
|
+
}
|
|
22
|
+
})
|
|
26
23
|
}
|
|
27
24
|
}
|
package/tsconfig.json
CHANGED