@tarojs/rn-style-transformer 3.6.22 → 3.6.23
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/LICENSE +14 -0
- package/dist/transforms/sass.js +1 -0
- package/dist/transforms/sass.js.map +1 -1
- package/dist/utils/index.js +26 -1
- package/dist/utils/index.js.map +1 -1
- package/package.json +7 -7
- package/src/transforms/sass.ts +3 -2
- package/src/utils/index.ts +29 -1
package/LICENSE
CHANGED
|
@@ -158,3 +158,17 @@ MIT (stencil-vue2-output-target):
|
|
|
158
158
|
The following files embed [stencil-vue2-output-target](https://github.com/diondree/stencil-vue2-output-target) MIT:
|
|
159
159
|
`/packages/taro-components-library-vue2/src/vue-component-lib/utils.ts`
|
|
160
160
|
See `/LICENSE` for details of the license.
|
|
161
|
+
|
|
162
|
+
==================
|
|
163
|
+
|
|
164
|
+
MIT (weui):
|
|
165
|
+
The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
|
|
166
|
+
`/packages/taro-components/src/components/*.scss`
|
|
167
|
+
See `/LICENSE.txt` for details of the license.
|
|
168
|
+
|
|
169
|
+
==================
|
|
170
|
+
|
|
171
|
+
Apache-2.0 (intersection-observer):
|
|
172
|
+
The following files embed [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) Apache-2.0:
|
|
173
|
+
`/packages/taro-api/src/polyfill/intersection-observer.ts`
|
|
174
|
+
See `/LICENSE.txt` for details of the license.
|
package/dist/transforms/sass.js
CHANGED
|
@@ -130,6 +130,7 @@ function renderToCSS(src, filename, options, transformOptions) {
|
|
|
130
130
|
function transform(src, filename, config, transformOptions) {
|
|
131
131
|
const additionalData = combineResource(src, filename, config);
|
|
132
132
|
let data = (0, utils_1.insertBefore)(src, additionalData);
|
|
133
|
+
data = (0, utils_1.sortStyle)(data);
|
|
133
134
|
if (!data) {
|
|
134
135
|
data = `\n${data}`; // fix empty file error. reference https://github.com/sass/node-sass/blob/91c40a0bf0a3923ab9f91b82dcd479c25486235a/lib/index.js#L430
|
|
135
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sass.js","sourceRoot":"","sources":["../../src/transforms/sass.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,2CAA4B;AAG5B,
|
|
1
|
+
{"version":3,"file":"sass.js","sourceRoot":"","sources":["../../src/transforms/sass.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,2CAA4B;AAG5B,oCAAgG;AAEhG;;GAEG;AACH,SAAS,qBAAqB;IAC5B,IAAI,WAAW,GAAG,WAAW,CAAA;IAE7B,IAAI;QACF,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;KAC7B;IAAC,OAAO,KAAK,EAAE;QACd,IAAI;YACF,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACvB,WAAW,GAAG,MAAM,CAAA;SACrB;QAAC,OAAO,WAAW,EAAE;YACpB,WAAW,GAAG,MAAM,CAAA;SACrB;KACF;IAED,OAAO,OAAO,CAAC,WAAW,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,kBAAkB,GAAG,qBAAqB,EAAE,CAAA;AAElD,SAAS,OAAO,CAAE,QAAgB,EAAE,OAAe;IACjD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC3C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAA;KAC5C;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,mBAAmB,CAAE,QAAgB,EAAE,QAAgB,EAAE,OAAe;IAC/E,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IACtC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA,CAAC,wBAAwB;IAC9F,OAAO,cAAc,YAAY,GAAG,CAAA;AACtC,CAAC;AAED,SAAS,iBAAiB,CAAE,QAAgB,EAAE,MAAwB;;IACpE,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAA;IACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CAAA;IACvE,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;QACvC,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAA;KAC5E;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,SAAS,GAAG,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,KAAI,EAAE,CAAA;QAC/G,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;KACjC;IACD,iFAAiF;IACjF,OAAO,IAAA,mBAAW,EAAC,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAA;AAC5C,CAAC;AAED,SAAS,eAAe,CAAE,GAAW,EAAE,QAAgB,EAAE,MAAkB;IACzE,cAAc;IACd,MAAM,cAAc,GAAG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAA;IAErE,uBAAuB;IACvB,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,GAAG,EAAE,MAAM,CAAC,cAAc,CAAC,CAAA;IAEpE,OAAO,IAAA,mBAAW,EAAC,cAAc,EAAE,cAAc,CAAC,CAAA;AACpD,CAAC;AAED,SAAS,WAAW,CAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAkC;IAC9E,MAAM,WAAW,GAAG;QAClB,QAAQ,EAAE,UAAU,GAAG,MAAM;YAC3B,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,MAAM,CAAA;YACxB,8DAA8D;YAC9D,wCAAwC;YACxC,iFAAiF;YACjF,0FAA0F;YAC1F,IAAI,OAAO,GAAG,EAAE,CAAA;YAChB,IAAI,UAAU,GAAG,EAAE,CAAA;YACnB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBACzB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;aACvD;iBAAM;gBACL,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;aACxF;YAED,sBAAsB;YACtB,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,UAAU,EAAE;gBAC1C,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;aAC3C;YAED,IAAI;gBACF,MAAM,IAAI,GAAG,IAAA,oBAAY,EACvB,GAAG,EACH;oBACE,OAAO;oBACP,UAAU;oBACV,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,QAAQ,EAAE,gBAAgB,CAAC,QAAQ;iBACpC,CACF,CAAA;gBACD,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAC9C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;aAC1B;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,GAAG,CAAA;aACX;QACH,CAAC;KACF,CAAA;IAED,MAAM,IAAI,iDAAQ,OAAO,GAAK,WAAW,KAAE,IAAI,EAAE,GAAG,GAAE,CAAA;IAEtD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,kBAAkB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAC9C,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAA;aACZ;iBAAM;gBACL,OAAO,CAAC,MAAM,CAAC,CAAA;aAChB;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAwB,SAAS,CAC/B,GAAW,EACX,QAAgB,EAChB,MAAkB,EAClB,gBAAkC;IAElC,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC7D,IAAI,IAAI,GAAG,IAAA,oBAAY,EAAC,GAAG,EAAE,cAAc,CAAC,CAAA;IAC5C,IAAI,GAAG,IAAA,iBAAS,EAAC,IAAI,CAAC,CAAA;IAEtB,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,GAAG,KAAK,IAAI,EAAE,CAAA,CAAC,oIAAoI;KACxJ;IAED,OAAO,WAAW,CAChB,IAAI,EACJ,QAAQ;QAEN,2FAA2F;QAC3F,OAAO,EAAE,GAAG,QAAQ,MAAM,EAC1B,SAAS,EAAE,IAAI,EACf,KAAK,EAAE,MAAM,CAAC,KAAK,IAChB,MAAM,CAAC,OAAO,GAEnB,gBAAgB,CACjB,CAAC,IAAI,CAAC,CAAC,MAAoB,EAAE,EAAE;QAC9B,OAAO,gCAAK,MAAM,KAAE,cAAc,GAA4B,CAAA;IAChE,CAAC,CAAC,CAAA;AACJ,CAAC;AA5BD,4BA4BC"}
|
package/dist/utils/index.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.getAdditionalData = exports.normalizeSourceMap = exports.normalizePath = exports.resolveStyle = exports.findVariant = exports.insertAfter = exports.insertBefore = void 0;
|
|
29
|
+
exports.getAdditionalData = exports.normalizeSourceMap = exports.normalizePath = exports.resolveStyle = exports.findVariant = exports.insertAfter = exports.sortStyle = exports.insertBefore = void 0;
|
|
30
30
|
const helper_1 = require("@tarojs/helper");
|
|
31
31
|
const fs = __importStar(require("fs"));
|
|
32
32
|
const path = __importStar(require("path"));
|
|
@@ -45,6 +45,31 @@ function insertBefore(source, additional) {
|
|
|
45
45
|
return additional + ';\n' + source;
|
|
46
46
|
}
|
|
47
47
|
exports.insertBefore = insertBefore;
|
|
48
|
+
/**
|
|
49
|
+
* sort scss source by \@use
|
|
50
|
+
* @param source scss source
|
|
51
|
+
* @returns sorted scss source
|
|
52
|
+
*/
|
|
53
|
+
function sortStyle(source) {
|
|
54
|
+
if (!source) {
|
|
55
|
+
return '';
|
|
56
|
+
}
|
|
57
|
+
if (source.indexOf('@use') === -1 && source.indexOf('@import') === -1) {
|
|
58
|
+
return source;
|
|
59
|
+
}
|
|
60
|
+
// @use highest priority
|
|
61
|
+
const useReg = /@use\s+['"](.*)['"];/g;
|
|
62
|
+
const useList = [];
|
|
63
|
+
let match = null;
|
|
64
|
+
while ((match = useReg.exec(source))) {
|
|
65
|
+
useList.push(match[0]);
|
|
66
|
+
source = source.replace(match[0], '');
|
|
67
|
+
}
|
|
68
|
+
// css last
|
|
69
|
+
const css = source.trim();
|
|
70
|
+
return [...useList, css].join('\n');
|
|
71
|
+
}
|
|
72
|
+
exports.sortStyle = sortStyle;
|
|
48
73
|
function insertAfter(source, additional) {
|
|
49
74
|
if (!source && !additional) {
|
|
50
75
|
return '';
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/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.6.
|
|
3
|
+
"version": "3.6.23",
|
|
4
4
|
"description": "提供Taro RN 统一处理样式文件能力",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -27,11 +27,11 @@
|
|
|
27
27
|
"sass": "1.37.5",
|
|
28
28
|
"stylelint": "^14.9.1",
|
|
29
29
|
"stylus": "^0.55.0",
|
|
30
|
-
"@tarojs/helper": "3.6.
|
|
31
|
-
"postcss-pxtransform": "3.6.
|
|
32
|
-
"stylelint-config-taro-rn": "3.6.
|
|
33
|
-
"stylelint-taro-rn": "3.6.
|
|
34
|
-
"taro-css-to-react-native": "3.6.
|
|
30
|
+
"@tarojs/helper": "3.6.23",
|
|
31
|
+
"postcss-pxtransform": "3.6.23",
|
|
32
|
+
"stylelint-config-taro-rn": "3.6.23",
|
|
33
|
+
"stylelint-taro-rn": "3.6.23",
|
|
34
|
+
"taro-css-to-react-native": "3.6.23"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"babel-jest": "^29.5.0",
|
|
@@ -49,6 +49,6 @@
|
|
|
49
49
|
"dev": "tsc -w",
|
|
50
50
|
"lint": "eslint .",
|
|
51
51
|
"test": "jest",
|
|
52
|
-
"test:ci": "jest --ci
|
|
52
|
+
"test:ci": "jest --ci -i --coverage --silent"
|
|
53
53
|
}
|
|
54
54
|
}
|
package/src/transforms/sass.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as fs from 'fs'
|
|
2
2
|
import * as path from 'path'
|
|
3
3
|
|
|
4
|
-
import { RenderAdditionalResult, RenderResult, SassConfig, SassGlobalConfig,TransformOptions } from '../types'
|
|
5
|
-
import { getAdditionalData, insertAfter, insertBefore, resolveStyle } from '../utils'
|
|
4
|
+
import { RenderAdditionalResult, RenderResult, SassConfig, SassGlobalConfig, TransformOptions } from '../types'
|
|
5
|
+
import { getAdditionalData, insertAfter, insertBefore, resolveStyle, sortStyle } from '../utils'
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
8
|
* 用过用户手动安装了 node-sass，启用node-sass，默认使用 sass
|
|
@@ -125,6 +125,7 @@ export default function transform (
|
|
|
125
125
|
) {
|
|
126
126
|
const additionalData = combineResource(src, filename, config)
|
|
127
127
|
let data = insertBefore(src, additionalData)
|
|
128
|
+
data = sortStyle(data)
|
|
128
129
|
|
|
129
130
|
if (!data) {
|
|
130
131
|
data = `\n${data}` // fix empty file error. reference https://github.com/sass/node-sass/blob/91c40a0bf0a3923ab9f91b82dcd479c25486235a/lib/index.js#L430
|
package/src/utils/index.ts
CHANGED
|
@@ -19,6 +19,34 @@ export function insertBefore (source?: string, additional?: string) {
|
|
|
19
19
|
return additional + ';\n' + source
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
+
/**
|
|
23
|
+
* sort scss source by \@use
|
|
24
|
+
* @param source scss source
|
|
25
|
+
* @returns sorted scss source
|
|
26
|
+
*/
|
|
27
|
+
export function sortStyle (source) {
|
|
28
|
+
if (!source) {
|
|
29
|
+
return ''
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
if (source.indexOf('@use') === -1 && source.indexOf('@import') === -1) {
|
|
33
|
+
return source
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
// @use highest priority
|
|
37
|
+
const useReg = /@use\s+['"](.*)['"];/g
|
|
38
|
+
const useList: string[] = []
|
|
39
|
+
let match: RegExpExecArray | null = null
|
|
40
|
+
while ((match = useReg.exec(source))) {
|
|
41
|
+
useList.push(match[0])
|
|
42
|
+
source = source.replace(match[0], '')
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// css last
|
|
46
|
+
const css = source.trim()
|
|
47
|
+
return [...useList, css].join('\n')
|
|
48
|
+
}
|
|
49
|
+
|
|
22
50
|
export function insertAfter (source?: string, additional?: string) {
|
|
23
51
|
if (!source && !additional) {
|
|
24
52
|
return ''
|
|
@@ -94,7 +122,7 @@ export function resolveStyle (id: string, opts: ResolveStyleOptions) {
|
|
|
94
122
|
// like `@import 'taro-ui/dist/base.css';` or `@import '~taro-ui/dist/base.css';`
|
|
95
123
|
file = resolve.sync(path.join(dir, name).replace(/^~/, ''), { basedir, extensions })
|
|
96
124
|
}
|
|
97
|
-
} catch (error) {} // eslint-disable-line no-empty
|
|
125
|
+
} catch (error) { } // eslint-disable-line no-empty
|
|
98
126
|
|
|
99
127
|
if (!file) {
|
|
100
128
|
let includePaths = incPaths
|