@tarojs/rn-supporter 3.5.5 → 3.5.6
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/Support.js +4 -2
- package/dist/Support.js.map +1 -1
- package/dist/taroResolver.js +9 -53
- package/dist/taroResolver.js.map +1 -1
- package/package.json +5 -5
package/dist/Support.js
CHANGED
|
@@ -25,6 +25,8 @@ class Supporter {
|
|
|
25
25
|
getTransformer() {
|
|
26
26
|
const transformerPath = this.fromRunner ? './taroTransformer' : './transformer';
|
|
27
27
|
return {
|
|
28
|
+
allowOptionalDependencies: true,
|
|
29
|
+
asyncRequireModulePath: require.resolve('metro-runtime/src/modules/asyncRequire'),
|
|
28
30
|
dynamicDepsInPackages: 'reject',
|
|
29
31
|
babelTransformerPath: require.resolve(transformerPath),
|
|
30
32
|
assetRegistryPath: require.resolve('react-native/Libraries/Image/AssetRegistry', {
|
|
@@ -56,8 +58,8 @@ class Supporter {
|
|
|
56
58
|
// 兼容0.60
|
|
57
59
|
const rnVersion = (0, taroResolver_1.getReactNativeVersion)();
|
|
58
60
|
if (rnVersion && (rnVersion.major === 0) && (rnVersion.minor === 60)) {
|
|
59
|
-
resolver.resolveRequest = (context,
|
|
60
|
-
const res = handleEntryFile(context,
|
|
61
|
+
resolver.resolveRequest = (context, moduleName, platform) => {
|
|
62
|
+
const res = handleEntryFile(context, moduleName, platform);
|
|
61
63
|
if (res) {
|
|
62
64
|
return res;
|
|
63
65
|
}
|
package/dist/Support.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Support.js","sourceRoot":"","sources":["../src/Support.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAuD;AACvD,iDAA2G;AAC3G,mCAAuD;AAKvD,MAAa,SAAS;IAGpB,YAAa,GAAa;QAF1B,eAAU,GAAG,KAAK,CAAA;QAGhB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAA;QAC3B,IAAA,wBAAgB,GAAE,CAAA;QAClB,IAAI,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,UAAU,EAAE;YACnB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;SACvB;IACH,CAAC;IAED,cAAc;QACZ,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,eAAe,CAAA;QAC/E,OAAO;YACL,qBAAqB,EAAE,QAAQ;YAC/B,oBAAoB,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;YACtD,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAC,4CAA4C,EAAE;gBAC/E,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;aACvB,CAAC;YACF,mBAAmB,EAAE,GAAS,EAAE;gBAAC,OAAA,CAAC;oBAChC,SAAS,EAAE;wBACT,yBAAyB,EAAE,KAAK;wBAChC,cAAc,EAAE,KAAK;qBACtB;iBACF,CAAC,CAAA;cAAA;SACH,CAAA;IACH,CAAC;IAED,WAAW;QACT,MAAM,QAAQ,GAAG,IAAA,mBAAW,GAAE,CAAA;QAC9B,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,6BAAc,CAAC,CAAC,CAAC,yBAAU,CAAA;QACrE,MAAM,QAAQ,GAAQ;YACpB,UAAU,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;YAC5G,cAAc,EAAE,eAAe;YAC/B,kBAAkB,EAAE,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,CAAC;YACvD,eAAe,EAAf,0BAAe;SAChB,CAAA;QACD,IAAI,QAAQ,CAAC,kBAAkB,EAAE;YAC/B,QAAQ,CAAC,SAAS,GAAG,oBAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,KAAK,CAAC,CAAA;YAC3D,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SAChC;QACD,SAAS;QACT,MAAM,SAAS,GAAG,IAAA,oCAAqB,GAAE,CAAA;QACzC,IAAI,SAAS,IAAI,CAAC,SAAS,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,KAAK,EAAE,CAAC,EAAE;YACpE,QAAQ,CAAC,cAAc,GAAG,CAAC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Support.js","sourceRoot":"","sources":["../src/Support.ts"],"names":[],"mappings":"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"}
|
package/dist/taroResolver.js
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.searchReactNativeModule = exports.handleTaroFile = exports.handleFile = exports.getReactNativeVersion = void 0;
|
|
4
4
|
const fs = require("fs");
|
|
5
|
-
const MetroResolver = require("metro-resolver");
|
|
6
5
|
const path = require("path");
|
|
7
6
|
const defaults_1 = require("./defaults");
|
|
8
7
|
const utils_1 = require("./utils");
|
|
@@ -57,72 +56,29 @@ function searchReactNativeModule(moduleName, platform) {
|
|
|
57
56
|
exports.searchReactNativeModule = searchReactNativeModule;
|
|
58
57
|
/**
|
|
59
58
|
* resolveRequest 文件处理，alias，文件后缀加载等
|
|
59
|
+
* metro 0.70 type ResolveRequestFunc = (context, moduleName, platform) => any
|
|
60
60
|
*/
|
|
61
|
-
function handleFile(context,
|
|
62
|
-
const savedOriginModulePath = context.originModulePath;
|
|
63
|
-
const savedAllowHaste = context.allowHaste;
|
|
64
|
-
if (moduleName.startsWith('@tarojs/')) {
|
|
65
|
-
// 通过Haste去查找软链接模块
|
|
66
|
-
context.allowHaste = true;
|
|
67
|
-
}
|
|
61
|
+
function handleFile(context, moduleName, platform) {
|
|
68
62
|
// 处理 alias
|
|
69
63
|
moduleName = (0, utils_1.resolvePathFromAlias)(moduleName);
|
|
70
64
|
// 处理后缀 .rn.ts
|
|
71
65
|
moduleName = (0, utils_1.resolveExtFile)(context, moduleName, platform);
|
|
72
|
-
|
|
73
|
-
const savedResolveRequest = context.resolveRequest;
|
|
74
|
-
context.resolveRequest = null;
|
|
75
|
-
try {
|
|
76
|
-
res = MetroResolver.resolve(context, moduleName, platform);
|
|
77
|
-
}
|
|
78
|
-
catch (ex) {
|
|
79
|
-
// console.log(ex)
|
|
80
|
-
// nothing to do
|
|
81
|
-
}
|
|
82
|
-
finally {
|
|
83
|
-
context.originModulePath = savedOriginModulePath;
|
|
84
|
-
context.allowHaste = savedAllowHaste;
|
|
85
|
-
context.resolveRequest = savedResolveRequest;
|
|
86
|
-
}
|
|
87
|
-
return res;
|
|
66
|
+
return context.resolveRequest(context, moduleName, platform);
|
|
88
67
|
}
|
|
89
68
|
exports.handleFile = handleFile;
|
|
90
69
|
// rn runner调用
|
|
91
|
-
function handleTaroFile(context,
|
|
70
|
+
function handleTaroFile(context, moduleName, platform) {
|
|
92
71
|
if (moduleName === './index') {
|
|
93
72
|
return {
|
|
94
|
-
filePath:
|
|
73
|
+
filePath: moduleName,
|
|
95
74
|
type: 'empty'
|
|
96
75
|
};
|
|
97
76
|
}
|
|
98
|
-
const
|
|
99
|
-
if (
|
|
100
|
-
|
|
101
|
-
}
|
|
102
|
-
const savedAllowHaste = context.allowHaste;
|
|
103
|
-
if (moduleName.startsWith('@tarojs/')) {
|
|
104
|
-
// 通过Haste去查找软链接模块
|
|
105
|
-
context.allowHaste = true;
|
|
106
|
-
}
|
|
107
|
-
// 处理 alias
|
|
108
|
-
moduleName = (0, utils_1.resolvePathFromAlias)(moduleName);
|
|
109
|
-
// 处理后缀 .rn.ts
|
|
110
|
-
moduleName = (0, utils_1.resolveExtFile)(context, moduleName, platform);
|
|
111
|
-
let res = null;
|
|
112
|
-
const savedResolveRequest = context.resolveRequest;
|
|
113
|
-
context.resolveRequest = null;
|
|
114
|
-
try {
|
|
115
|
-
res = MetroResolver.resolve(context, moduleName, platform);
|
|
116
|
-
}
|
|
117
|
-
catch (ex) {
|
|
118
|
-
// nothing to do
|
|
119
|
-
}
|
|
120
|
-
finally {
|
|
121
|
-
context.originModulePath = savedOriginModulePath;
|
|
122
|
-
context.allowHaste = savedAllowHaste;
|
|
123
|
-
context.resolveRequest = savedResolveRequest;
|
|
77
|
+
const newContext = Object.assign({}, context);
|
|
78
|
+
if (context.originModulePath === require.resolve(defaults_1.emptyModulePath)) {
|
|
79
|
+
newContext.originModulePath = path.join(context.projectRoot, './index.js');
|
|
124
80
|
}
|
|
125
|
-
return
|
|
81
|
+
return handleFile(newContext, moduleName, platform);
|
|
126
82
|
}
|
|
127
83
|
exports.handleTaroFile = handleTaroFile;
|
|
128
84
|
//# sourceMappingURL=taroResolver.js.map
|
package/dist/taroResolver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taroResolver.js","sourceRoot":"","sources":["../src/taroResolver.ts"],"names":[],"mappings":";;;AAAA,yBAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"taroResolver.js","sourceRoot":"","sources":["../src/taroResolver.ts"],"names":[],"mappings":";;;AAAA,yBAAwB;AACxB,6BAA4B;AAE5B,yCAA4C;AAC5C,mCAA8D;AAU9D,SAAS,sBAAsB;IAC7B,MAAM,qBAAqB,GAAG,cAAc,CAAA;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;IACzD,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAA;IAC3D,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACtD,CAAC;AAED,SAAS,qBAAqB;IAC5B,MAAM,UAAU,GAAG,sBAAsB,EAAE,CAAA;IAC3C,IAAI;QACF,MAAM,WAAW,GAAQ,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;QACnG,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACjD,MAAM,GAAG,GAAgB;YACvB,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAClC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAClC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;SACnC,CAAA;QACD,OAAO,GAAG,CAAA;KACX;IAAC,OAAO,EAAE,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,MAAM,EAAE,CAAA;KACT;AACH,CAAC;AAsDC,sDAAqB;AApDvB,SAAS,uBAAuB,CAAE,UAAkB,EAAE,QAAgB;IACpE,MAAM,UAAU,GAAG,sBAAsB,EAAE,CAAA;IAC3C,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;IAC1E,MAAM,KAAK,GAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAA;IAC5D,OAAO,KAAK,CAAC,MAAM,EAAE;QACnB,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAA;QAC/B,MAAM,EAAE,GAAgB,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;YAC1C,QAAQ,EAAE,MAAM;YAChB,aAAa,EAAE,IAAI;SACpB,CAAC,CAAA;QACF,KAAK,MAAM,OAAO,IAAI,EAAE,EAAE;YACxB,IAAI,OAAO,CAAC,WAAW,EAAE,EAAE;gBACzB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;aACzC;iBAAM,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE;gBAC3B,IAAI,CAAC,cAAc,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE;oBAC3H,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;iBACpC;aACF;SACF;KACF;IACD,OAAO,EAAE,CAAA;AACX,CAAC;AAkCC,0DAAuB;AAhCzB;;;GAGG;AACH,SAAS,UAAU,CAAE,OAA0B,EAAE,UAAU,EAAE,QAAQ;IACnE,WAAW;IACX,UAAU,GAAG,IAAA,4BAAoB,EAAC,UAAU,CAAC,CAAA;IAE7C,cAAc;IACd,UAAU,GAAG,IAAA,sBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;IAC1D,OAAO,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;AAC9D,CAAC;AAmBC,gCAAU;AAjBZ,cAAc;AACd,SAAS,cAAc,CAAE,OAA0B,EAAE,UAAU,EAAE,QAAQ;IACvE,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,OAAO;YACL,QAAQ,EAAE,UAAU;YACpB,IAAI,EAAE,OAAO;SACd,CAAA;KACF;IACD,MAAM,UAAU,qBAAO,OAAO,CAAC,CAAA;IAC/B,IAAG,OAAO,CAAC,gBAAgB,KAAK,OAAO,CAAC,OAAO,CAAC,0BAAe,CAAC,EAAE;QAChE,UAAU,CAAC,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAA;KAC3E;IACD,OAAO,UAAU,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAA;AACrD,CAAC;AAKC,wCAAc"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/rn-supporter",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.6",
|
|
4
4
|
"description": "Taro rn supporter",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"author": "yechunxi",
|
|
@@ -24,11 +24,11 @@
|
|
|
24
24
|
"npm": ">=6.0.0"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@tarojs/helper": "3.5.
|
|
28
|
-
"@tarojs/rn-style-transformer": "3.5.
|
|
27
|
+
"@tarojs/helper": "3.5.6",
|
|
28
|
+
"@tarojs/rn-style-transformer": "3.5.6",
|
|
29
29
|
"lodash": "^4.17.21",
|
|
30
|
-
"metro-react-native-babel-transformer": "^0.
|
|
31
|
-
"metro-resolver": "^0.
|
|
30
|
+
"metro-react-native-babel-transformer": "^0.70.3",
|
|
31
|
+
"metro-resolver": "^0.70.3",
|
|
32
32
|
"react-native-svg-transformer": "^0.14.3"
|
|
33
33
|
},
|
|
34
34
|
"scripts": {
|