@tarojs/taro-loader 4.2.1 → 4.2.2-alpha.1
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/lib/app.js +17 -1
- package/lib/app.js.map +1 -1
- package/lib/native-component.js +11 -0
- package/lib/native-component.js.map +1 -1
- package/lib/page.js +19 -0
- package/lib/page.js.map +1 -1
- package/package.json +4 -4
package/lib/app.js
CHANGED
|
@@ -45,6 +45,22 @@ exports.taroApp = app
|
|
|
45
45
|
if (typeof modifyInstantiate === 'function') {
|
|
46
46
|
instantiateApp = modifyInstantiate(instantiateApp, 'app');
|
|
47
47
|
}
|
|
48
|
+
// 共享运行时（split 模式）多包 App 隔离：createReactApp 前把本包 pkgId 记进共享全局
|
|
49
|
+
// __currentPkgId，供 createReactApp 把 realApp 存进 shared.__pkgApps[pkgId]，page loader
|
|
50
|
+
// onLoad 前据此查回本包 App。
|
|
51
|
+
//
|
|
52
|
+
// 同时给 config.appId 注入 pkgId:renderReactRoot 用 config.appId 作 container 元素 id，
|
|
53
|
+
// 两包都用默认 'app' 会 mount 到同一 container、React root 互相覆盖（A→B→A 后 A 白屏）。
|
|
54
|
+
// pkgId 业务包间唯一（chunkLoadingGlobal 派生），用作 appId 天然隔离 container。
|
|
55
|
+
// 仅 sharedRuntime 场景注入，非共享模式产物字面零变化。
|
|
56
|
+
const sharedRuntimePkgIdInject = options.sharedRuntime
|
|
57
|
+
? `
|
|
58
|
+
if (typeof ${globalObject}[${JSON.stringify(options.sharedRuntimeGlobalKey)}] !== 'undefined') {
|
|
59
|
+
${globalObject}[${JSON.stringify(options.sharedRuntimeGlobalKey)}].__currentPkgId = ${JSON.stringify(options.sharedRuntimePkgId)}
|
|
60
|
+
}
|
|
61
|
+
config.appId = ${JSON.stringify(options.sharedRuntimePkgId)}
|
|
62
|
+
`
|
|
63
|
+
: '';
|
|
48
64
|
return `${setReconciler}
|
|
49
65
|
import { window } from '@tarojs/runtime'
|
|
50
66
|
import { ${creator} } from '${creatorLocation}'
|
|
@@ -54,7 +70,7 @@ import component from ${stringify(['!', entryCacheLoader, this.resourcePath].joi
|
|
|
54
70
|
${importFrameworkStatement}
|
|
55
71
|
var config = ${config};
|
|
56
72
|
window.__taroAppConfig = config
|
|
57
|
-
${instantiateApp}
|
|
73
|
+
${sharedRuntimePkgIdInject}${instantiateApp}
|
|
58
74
|
${options.prerender ? prerender : ''}
|
|
59
75
|
initPxTransform({
|
|
60
76
|
designWidth: ${pxTransformConfig.designWidth},
|
package/lib/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;AAAA,kCAAiC;AAEjC,2CAAsC;AACtC,+CAA0C;AAC1C,iCAAyC;AAIzC,mBAA2D,MAAc,EAAE,GAAS;;IAClF,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;IACjC,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IACnH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC7C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC/B,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;IACrC,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IACnD,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IACnF,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAAG,WAAW,CAAA;IAC7E,wBAAU,CAAC,GAAG,CAAC,KAAK,EAAE;QACpB,MAAM;QACN,GAAG;KACJ,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IAEA,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IACpG,IAAI,iBAAiB,GAAG,EAAE,CAAA;IAC1B,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,oBAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,iBAAiB,IAAI,WAAW,IAAI,CAAC,OAAO,CAAC,oBAAQ,EAAE,EAAE,CAAC,KAAK,CAAA;YAC/D,OAAO,GAAG,CAAA;QACZ,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;QACnC,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,MAAM,SAAS,GAAG,GAAG,OAAO,eAAe,aAAa,GAAG,CAAA;IAE3D,IAAI,cAAc,GAAG,OAAO,IAAI,UAAU;QACxC,CAAC,CAAC;YACM,SAAS;;;CAGpB;QACG,CAAC,CAAC,kBAAkB,SAAS,GAAG,CAAA;IAElC,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE,CAAC;QAC5C,cAAc,GAAG,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;IAC3D,CAAC;IAED,OAAO,GAAG,aAAa;;WAEd,OAAO,YAAY,eAAe;;EAE3C,iBAAiB;wBACK,SAAS,CAAC,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;EACrF,wBAAwB;eACX,MAAM;;EAEnB,cAAc;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/lib/native-component.js
CHANGED
|
@@ -11,6 +11,17 @@ function default_1(source, map) {
|
|
|
11
11
|
const { importFrameworkStatement, frameworkArgs, isNeedRawLoader, creatorLocation } = loaderMeta;
|
|
12
12
|
const config = (0, page_1.getPageConfig)(loaderConfig, this.resourcePath);
|
|
13
13
|
config.isNewBlended = isNewBlended;
|
|
14
|
+
// 共享运行时 native-components 场景：注入 pkgId + 全局键名 + isNativeShared 三字段，
|
|
15
|
+
// connect-native.ts createNativeComponentConfig 据此走第三分支——按 pkgId 存/查
|
|
16
|
+
// shared.__nativeComponentApps，不共用 Current.app 与单例 nativeComponentApp。
|
|
17
|
+
// 仅 sharedRuntime 注入，非共享场景 config 结构不变。
|
|
18
|
+
if (options.sharedRuntime) {
|
|
19
|
+
config.isNativeShared = true;
|
|
20
|
+
config.pkgId = options.sharedRuntimePkgId;
|
|
21
|
+
config.globalKey = options.sharedRuntimeGlobalKey;
|
|
22
|
+
// container 隔离：与 pages 同源，避免 initNativeComponentEntry 硬编码 #app 导致多包冲突
|
|
23
|
+
config.appId = options.sharedRuntimePkgId;
|
|
24
|
+
}
|
|
14
25
|
const configString = JSON.stringify(config);
|
|
15
26
|
const stringify = (s) => (0, util_1.stringifyRequest)(this, s);
|
|
16
27
|
const pageName = options.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":";;AAAA,kCAAiC;AAEjC,+CAA0C;AAC1C,iCAAsC;AACtC,iCAAyC;AAIzC,mBAA2D,MAAc,EAAE,GAAS;;IAClF,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;IACjC,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,KAAK,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IAC5F,MAAM,EAAE,wBAAwB,EAAE,aAAa,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,UAAU,CAAA;IAChG,MAAM,MAAM,GAAG,IAAA,oBAAa,EAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAC7D,MAAM,CAAC,YAAY,GAAG,YAAY,CAAA;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAA;IAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC3C,8DAA8D;IAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAAG,SAAS,QAAQ,EAAE,CAAA;IACrF,wBAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;QACvB,MAAM;QACN,GAAG;KACJ,CAAC,CAAA;IACF,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1C,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3D,CAAC,CAAC,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxD,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAA;IACrF,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAC9D,IAAI,uCAAuC,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,GAAG,CAAA;QAClE,OAAO,GAAG,GAAG,WAAW,IAAI,KAAK,CAAA;IACnC,CAAC,EAAE,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IAEnF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IAEA,OAAO,GAAG,aAAa;+CACsB,eAAe;EAC5D,wBAAwB;0BACA,SAAS,CAAC,aAAa,CAAC;eACnC,YAAY;0DAC+B,aAAa;;eAExD,aAAa,kBAAkB,aAAa;;;EAGzD,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;;CAEnC,CAAA;AACD,CAAC;
|
|
1
|
+
{"version":3,"file":"native-component.js","sourceRoot":"","sources":["../src/native-component.ts"],"names":[],"mappings":"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"}
|
package/lib/page.js
CHANGED
|
@@ -47,6 +47,25 @@ var taroOption = createPageConfig(component, '${pageName}', {root:{cn:[]}}, conf
|
|
|
47
47
|
if (component && component.behaviors) {
|
|
48
48
|
taroOption.${behaviorsName} = (taroOption.${behaviorsName} || []).concat(component.behaviors)
|
|
49
49
|
}
|
|
50
|
+
${options.sharedRuntime ? `
|
|
51
|
+
// 共享运行时（split 模式）多包 App 隔离：onLoad 前把 Current.app 切回本包 realApp，
|
|
52
|
+
// 防 A→B→A 跨包切换后 A 页面 mount 到 B 的 App。realApp 从 shared.__pkgApps[pkgId] 查
|
|
53
|
+
// （由 app-shim/async-provider 存）；未激活/表空则不切，fallback 到 last-writer。
|
|
54
|
+
if (typeof ${globalObject}[${JSON.stringify(options.sharedRuntimeGlobalKey)}] !== 'undefined') {
|
|
55
|
+
var __TARO_SHARED_FOR_PAGE__ = ${globalObject}[${JSON.stringify(options.sharedRuntimeGlobalKey)}]
|
|
56
|
+
var __TARO_PKG_ID_FOR_PAGE__ = ${JSON.stringify(options.sharedRuntimePkgId)}
|
|
57
|
+
var __TARO_ORIGINAL_ONLOAD__ = taroOption.onLoad
|
|
58
|
+
taroOption.onLoad = function () {
|
|
59
|
+
var __pkgApps = __TARO_SHARED_FOR_PAGE__.__pkgApps || {}
|
|
60
|
+
var __runtime = __TARO_SHARED_FOR_PAGE__['@tarojs/runtime']
|
|
61
|
+
var __myApp = __pkgApps[__TARO_PKG_ID_FOR_PAGE__]
|
|
62
|
+
if (__myApp && __runtime && __runtime.Current) {
|
|
63
|
+
__runtime.Current.app = __myApp
|
|
64
|
+
}
|
|
65
|
+
return __TARO_ORIGINAL_ONLOAD__.apply(this, arguments)
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
` : ''}
|
|
50
69
|
var inst = Page(taroOption)
|
|
51
70
|
`;
|
|
52
71
|
}
|
package/lib/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":";;;AAAA,kCAAiC;AAEjC,2CAA8C;AAE9C,+CAA0C;AAC1C,iCAAyC;AASzC,mBAA2D,MAAc,EAAE,GAAS;;IAClF,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;IACjC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAA;IACxC,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;IAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,SAAS,GAAG,CAAC,CAAS,EAAU,EAAE,CAAC,IAAA,uBAAgB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAA;IAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC3C,MAAM,EAAE,eAAe,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,UAAU,CAAA;IACjE,8DAA8D;IAC9D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,GAAG,SAAS,QAAQ,EAAE,CAAA;IACrF,wBAAU,CAAC,GAAG,CAAC,QAAQ,EAAE;QACvB,MAAM;QACN,GAAG;KACJ,CAAC,CAAA;IACF,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC1C,MAAM,aAAa,GAAG,eAAe;QACnC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC3D,CAAC,CAAC,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxD,MAAM,EAAE,YAAY,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,aAAa,KAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IAEnF,MAAM,SAAS,GAAG;;IAEhB,YAAY;EACd,CAAA;IAEA,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;;;wBAGV,QAAQ;;EAE9B,CAAA;IAEA,IAAI,OAAO,OAAO,CAAC,UAAU,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;QAC1D,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,IAAI,eAAe,GAAG,gDAAgD,QAAQ,mCAAmC,CAAA;IAEjH,oDAAoD;IACpD,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,KAAK,sBAAa,CAAC,IAAI,EAAE,CAAC;QACrD,eAAe,GAAG;gDAC0B,QAAQ;;eAEzC,aAAa,kBAAkB,aAAa
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-loader",
|
|
3
|
-
"version": "4.2.1",
|
|
3
|
+
"version": "4.2.2-alpha.1",
|
|
4
4
|
"description": "Taro runner use webpack loader",
|
|
5
5
|
"author": "O2Team",
|
|
6
6
|
"license": "MIT",
|
|
@@ -23,12 +23,12 @@
|
|
|
23
23
|
"node": ">= 18"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@tarojs/helper": "4.2.1",
|
|
27
|
-
"@tarojs/shared": "4.2.1"
|
|
26
|
+
"@tarojs/helper": "4.2.2-alpha.1",
|
|
27
|
+
"@tarojs/shared": "4.2.2-alpha.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"webpack": "5.91.0",
|
|
31
|
-
"@tarojs/taro": "4.2.1"
|
|
31
|
+
"@tarojs/taro": "4.2.2-alpha.1"
|
|
32
32
|
},
|
|
33
33
|
"peerDependencies": {
|
|
34
34
|
"webpack": "5.91.0"
|