@mpxjs/webpack-plugin 2.10.7-beta.9 → 2.10.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.
Files changed (42) hide show
  1. package/LICENSE +433 -0
  2. package/lib/dependencies/RequireExternalDependency.js +61 -0
  3. package/lib/file-loader.js +3 -2
  4. package/lib/index.js +60 -15
  5. package/lib/json-compiler/index.js +1 -0
  6. package/lib/parser.js +1 -1
  7. package/lib/platform/json/wx/index.js +43 -25
  8. package/lib/platform/template/wx/component-config/fix-component-name.js +2 -2
  9. package/lib/platform/template/wx/component-config/movable-view.js +10 -1
  10. package/lib/platform/template/wx/index.js +2 -1
  11. package/lib/react/LoadAsyncChunkModule.js +74 -0
  12. package/lib/react/index.js +3 -1
  13. package/lib/react/processJSON.js +74 -13
  14. package/lib/react/processScript.js +6 -6
  15. package/lib/react/script-helper.js +100 -41
  16. package/lib/runtime/components/react/context.ts +2 -12
  17. package/lib/runtime/components/react/dist/context.js +1 -1
  18. package/lib/runtime/components/react/dist/getInnerListeners.js +1 -1
  19. package/lib/runtime/components/react/dist/mpx-async-suspense.jsx +135 -0
  20. package/lib/runtime/components/react/dist/mpx-movable-area.jsx +9 -63
  21. package/lib/runtime/components/react/dist/mpx-movable-view.jsx +58 -301
  22. package/lib/runtime/components/react/dist/mpx-swiper.jsx +27 -53
  23. package/lib/runtime/components/react/dist/mpx-web-view.jsx +14 -28
  24. package/lib/runtime/components/react/dist/useAnimationHooks.js +2 -87
  25. package/lib/runtime/components/react/getInnerListeners.ts +1 -1
  26. package/lib/runtime/components/react/mpx-async-suspense.tsx +180 -0
  27. package/lib/runtime/components/react/mpx-movable-area.tsx +11 -98
  28. package/lib/runtime/components/react/mpx-movable-view.tsx +60 -350
  29. package/lib/runtime/components/react/mpx-swiper.tsx +25 -53
  30. package/lib/runtime/components/react/mpx-web-view.tsx +13 -33
  31. package/lib/runtime/components/react/types/global.d.ts +15 -0
  32. package/lib/runtime/components/react/useAnimationHooks.ts +2 -85
  33. package/lib/runtime/optionProcessorReact.d.ts +18 -0
  34. package/lib/runtime/optionProcessorReact.js +30 -0
  35. package/lib/script-setup-compiler/index.js +27 -5
  36. package/lib/template-compiler/compiler.js +4 -3
  37. package/lib/utils/dom-tag-config.js +17 -3
  38. package/lib/utils/trans-async-sub-rules.js +19 -0
  39. package/lib/web/script-helper.js +1 -1
  40. package/package.json +4 -4
  41. package/lib/runtime/components/react/AsyncContainer.tsx +0 -189
  42. package/lib/runtime/components/react/dist/AsyncContainer.jsx +0 -141
package/LICENSE ADDED
@@ -0,0 +1,433 @@
1
+ Apache License
2
+
3
+ Version 2.0, January 2004
4
+
5
+ http://www.apache.org/licenses/
6
+
7
+
8
+
9
+
10
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
11
+
12
+
13
+
14
+
15
+ 1. Definitions.
16
+
17
+
18
+
19
+
20
+ "License" shall mean the terms and conditions for use, reproduction,
21
+
22
+ and distribution as defined by Sections 1 through 9 of this document.
23
+
24
+
25
+
26
+
27
+ "Licensor" shall mean the copyright owner or entity authorized by
28
+
29
+ the copyright owner that is granting the License.
30
+
31
+
32
+
33
+
34
+ "Legal Entity" shall mean the union of the acting entity and all
35
+
36
+ other entities that control, are controlled by, or are under common
37
+
38
+ control with that entity. For the purposes of this definition,
39
+
40
+ "control" means (i) the power, direct or indirect, to cause the
41
+
42
+ direction or management of such entity, whether by contract or
43
+
44
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
45
+
46
+ outstanding shares, or (iii) beneficial ownership of such entity.
47
+
48
+
49
+
50
+
51
+ "You" (or "Your") shall mean an individual or Legal Entity
52
+
53
+ exercising permissions granted by this License.
54
+
55
+
56
+
57
+
58
+ "Source" form shall mean the preferred form for making modifications,
59
+
60
+ including but not limited to software source code, documentation
61
+
62
+ source, and configuration files.
63
+
64
+
65
+
66
+
67
+ "Object" form shall mean any form resulting from mechanical
68
+
69
+ transformation or translation of a Source form, including but
70
+
71
+ not limited to compiled object code, generated documentation,
72
+
73
+ and conversions to other media types.
74
+
75
+
76
+
77
+
78
+ "Work" shall mean the work of authorship, whether in Source or
79
+
80
+ Object form, made available under the License, as indicated by a
81
+
82
+ copyright notice that is included in or attached to the work
83
+
84
+ (an example is provided in the Appendix below).
85
+
86
+
87
+
88
+
89
+ "Derivative Works" shall mean any work, whether in Source or Object
90
+
91
+ form, that is based on (or derived from) the Work and for which the
92
+
93
+ editorial revisions, annotations, elaborations, or other modifications
94
+
95
+ represent, as a whole, an original work of authorship. For the purposes
96
+
97
+ of this License, Derivative Works shall not include works that remain
98
+
99
+ separable from, or merely link (or bind by name) to the interfaces of,
100
+
101
+ the Work and Derivative Works thereof.
102
+
103
+
104
+
105
+
106
+ "Contribution" shall mean any work of authorship, including
107
+
108
+ the original version of the Work and any modifications or additions
109
+
110
+ to that Work or Derivative Works thereof, that is intentionally
111
+
112
+ submitted to Licensor for inclusion in the Work by the copyright owner
113
+
114
+ or by an individual or Legal Entity authorized to submit on behalf of
115
+
116
+ the copyright owner. For the purposes of this definition, "submitted"
117
+
118
+ means any form of electronic, verbal, or written communication sent
119
+
120
+ to the Licensor or its representatives, including but not limited to
121
+
122
+ communication on electronic mailing lists, source code control systems,
123
+
124
+ and issue tracking systems that are managed by, or on behalf of, the
125
+
126
+ Licensor for the purpose of discussing and improving the Work, but
127
+
128
+ excluding communication that is conspicuously marked or otherwise
129
+
130
+ designated in writing by the copyright owner as "Not a Contribution."
131
+
132
+
133
+
134
+
135
+ "Contributor" shall mean Licensor and any individual or Legal Entity
136
+
137
+ on behalf of whom a Contribution has been received by Licensor and
138
+
139
+ subsequently incorporated within the Work.
140
+
141
+
142
+
143
+
144
+ 2. Grant of Copyright License. Subject to the terms and conditions of
145
+
146
+ this License, each Contributor hereby grants to You a perpetual,
147
+
148
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
149
+
150
+ copyright license to reproduce, prepare Derivative Works of,
151
+
152
+ publicly display, publicly perform, sublicense, and distribute the
153
+
154
+ Work and such Derivative Works in Source or Object form.
155
+
156
+
157
+
158
+
159
+ 3. Grant of Patent License. Subject to the terms and conditions of
160
+
161
+ this License, each Contributor hereby grants to You a perpetual,
162
+
163
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
164
+
165
+ (except as stated in this section) patent license to make, have made,
166
+
167
+ use, offer to sell, sell, import, and otherwise transfer the Work,
168
+
169
+ where such license applies only to those patent claims licensable
170
+
171
+ by such Contributor that are necessarily infringed by their
172
+
173
+ Contribution(s) alone or by combination of their Contribution(s)
174
+
175
+ with the Work to which such Contribution(s) was submitted. If You
176
+
177
+ institute patent litigation against any entity (including a
178
+
179
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
180
+
181
+ or a Contribution incorporated within the Work constitutes direct
182
+
183
+ or contributory patent infringement, then any patent licenses
184
+
185
+ granted to You under this License for that Work shall terminate
186
+
187
+ as of the date such litigation is filed.
188
+
189
+
190
+
191
+
192
+ 4. Redistribution. You may reproduce and distribute copies of the
193
+
194
+ Work or Derivative Works thereof in any medium, with or without
195
+
196
+ modifications, and in Source or Object form, provided that You
197
+
198
+ meet the following conditions:
199
+
200
+
201
+
202
+
203
+ (a) You must give any other recipients of the Work or
204
+
205
+ Derivative Works a copy of this License; and
206
+
207
+
208
+
209
+
210
+ (b) You must cause any modified files to carry prominent notices
211
+
212
+ stating that You changed the files; and
213
+
214
+
215
+
216
+
217
+ (c) You must retain, in the Source form of any Derivative Works
218
+
219
+ that You distribute, all copyright, patent, trademark, and
220
+
221
+ attribution notices from the Source form of the Work,
222
+
223
+ excluding those notices that do not pertain to any part of
224
+
225
+ the Derivative Works; and
226
+
227
+
228
+
229
+
230
+ (d) If the Work includes a "NOTICE" text file as part of its
231
+
232
+ distribution, then any Derivative Works that You distribute must
233
+
234
+ include a readable copy of the attribution notices contained
235
+
236
+ within such NOTICE file, excluding those notices that do not
237
+
238
+ pertain to any part of the Derivative Works, in at least one
239
+
240
+ of the following places: within a NOTICE text file distributed
241
+
242
+ as part of the Derivative Works; within the Source form or
243
+
244
+ documentation, if provided along with the Derivative Works; or,
245
+
246
+ within a display generated by the Derivative Works, if and
247
+
248
+ wherever such third-party notices normally appear. The contents
249
+
250
+ of the NOTICE file are for informational purposes only and
251
+
252
+ do not modify the License. You may add Your own attribution
253
+
254
+ notices within Derivative Works that You distribute, alongside
255
+
256
+ or as an addendum to the NOTICE text from the Work, provided
257
+
258
+ that such additional attribution notices cannot be construed
259
+
260
+ as modifying the License.
261
+
262
+
263
+
264
+
265
+ You may add Your own copyright statement to Your modifications and
266
+
267
+ may provide additional or different license terms and conditions
268
+
269
+ for use, reproduction, or distribution of Your modifications, or
270
+
271
+ for any such Derivative Works as a whole, provided Your use,
272
+
273
+ reproduction, and distribution of the Work otherwise complies with
274
+
275
+ the conditions stated in this License.
276
+
277
+
278
+
279
+
280
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
281
+
282
+ any Contribution intentionally submitted for inclusion in the Work
283
+
284
+ by You to the Licensor shall be under the terms and conditions of
285
+
286
+ this License, without any additional terms or conditions.
287
+
288
+ Notwithstanding the above, nothing herein shall supersede or modify
289
+
290
+ the terms of any separate license agreement you may have executed
291
+
292
+ with Licensor regarding such Contributions.
293
+
294
+
295
+
296
+
297
+ 6. Trademarks. This License does not grant permission to use the trade
298
+
299
+ names, trademarks, service marks, or product names of the Licensor,
300
+
301
+ except as required for reasonable and customary use in describing the
302
+
303
+ origin of the Work and reproducing the content of the NOTICE file.
304
+
305
+
306
+
307
+
308
+ 7. Disclaimer of Warranty. Unless required by applicable law or
309
+
310
+ agreed to in writing, Licensor provides the Work (and each
311
+
312
+ Contributor provides its Contributions) on an "AS IS" BASIS,
313
+
314
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
315
+
316
+ implied, including, without limitation, any warranties or conditions
317
+
318
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
319
+
320
+ PARTICULAR PURPOSE. You are solely responsible for determining the
321
+
322
+ appropriateness of using or redistributing the Work and assume any
323
+
324
+ risks associated with Your exercise of permissions under this License.
325
+
326
+
327
+
328
+
329
+ 8. Limitation of Liability. In no event and under no legal theory,
330
+
331
+ whether in tort (including negligence), contract, or otherwise,
332
+
333
+ unless required by applicable law (such as deliberate and grossly
334
+
335
+ negligent acts) or agreed to in writing, shall any Contributor be
336
+
337
+ liable to You for damages, including any direct, indirect, special,
338
+
339
+ incidental, or consequential damages of any character arising as a
340
+
341
+ result of this License or out of the use or inability to use the
342
+
343
+ Work (including but not limited to damages for loss of goodwill,
344
+
345
+ work stoppage, computer failure or malfunction, or any and all
346
+
347
+ other commercial damages or losses), even if such Contributor
348
+
349
+ has been advised of the possibility of such damages.
350
+
351
+
352
+
353
+
354
+ 9. Accepting Warranty or Additional Liability. While redistributing
355
+
356
+ the Work or Derivative Works thereof, You may choose to offer,
357
+
358
+ and charge a fee for, acceptance of support, warranty, indemnity,
359
+
360
+ or other liability obligations and/or rights consistent with this
361
+
362
+ License. However, in accepting such obligations, You may act only
363
+
364
+ on Your own behalf and on Your sole responsibility, not on behalf
365
+
366
+ of any other Contributor, and only if You agree to indemnify,
367
+
368
+ defend, and hold each Contributor harmless for any liability
369
+
370
+ incurred by, or claims asserted against, such Contributor by reason
371
+
372
+ of your accepting any such warranty or additional liability.
373
+
374
+
375
+
376
+
377
+ END OF TERMS AND CONDITIONS
378
+
379
+
380
+
381
+
382
+ APPENDIX: How to apply the Apache License to your work.
383
+
384
+
385
+
386
+
387
+ To apply the Apache License to your work, attach the following
388
+
389
+ boilerplate notice, with the fields enclosed by brackets "{}"
390
+
391
+ replaced with your own identifying information. (Don't include
392
+
393
+ the brackets!) The text should be enclosed in the appropriate
394
+
395
+ comment syntax for the file format. We also recommend that a
396
+
397
+ file or class name and description of purpose be included on the
398
+
399
+ same "printed page" as the copyright notice for easier
400
+
401
+ identification within third-party archives.
402
+
403
+
404
+
405
+
406
+ Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
407
+
408
+
409
+
410
+
411
+ Licensed under the Apache License, Version 2.0 (the "License");
412
+
413
+ you may not use this file except in compliance with the License.
414
+
415
+ You may obtain a copy of the License at
416
+
417
+
418
+
419
+
420
+ http://www.apache.org/licenses/LICENSE-2.0
421
+
422
+
423
+
424
+
425
+ Unless required by applicable law or agreed to in writing, software
426
+
427
+ distributed under the License is distributed on an "AS IS" BASIS,
428
+
429
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
430
+
431
+ See the License for the specific language governing permissions and
432
+
433
+ limitations under the License.
@@ -0,0 +1,61 @@
1
+ const path = require('path')
2
+ const NullDependency = require('webpack/lib/dependencies/NullDependency')
3
+ const makeSerializable = require('webpack/lib/util/makeSerializable')
4
+
5
+ class RequireExternalDependency extends NullDependency {
6
+ constructor (range, url) {
7
+ super()
8
+ this.range = range
9
+ this.url = url
10
+ }
11
+
12
+ get type () {
13
+ return 'mpx require external'
14
+ }
15
+
16
+ updateHash (hash, context) {
17
+ hash.update('' + (+new Date()) + Math.random())
18
+ super.updateHash(hash, context)
19
+ }
20
+
21
+ serialize (context) {
22
+ const { write } = context
23
+ write(this.url)
24
+ write(this.range)
25
+ super.serialize(context)
26
+ }
27
+
28
+ deserialize (context) {
29
+ const { read } = context
30
+ this.url = read()
31
+ this.range = read()
32
+ super.deserialize(context)
33
+ }
34
+ }
35
+
36
+ RequireExternalDependency.Template = class RequireExternalDependencyTemplate {
37
+ apply (dependency, source, { module, chunkGraph, runtimeTemplate }) {
38
+ const { range } = dependency
39
+ const compliation = runtimeTemplate.compilation
40
+ const publicPath = compliation.outputOptions.publicPath
41
+ const chunks = chunkGraph.getModuleChunks(module)
42
+ const chunk = chunks[0]
43
+ const chunkPath = path.dirname(publicPath + chunk.name)
44
+ const imgPath = publicPath + dependency.url
45
+ let relativePath = path.relative(chunkPath, imgPath)
46
+ if (!relativePath.startsWith('.')) {
47
+ relativePath = './' + relativePath
48
+ }
49
+
50
+ if (!compliation.__mpx__.externalRequestsMap.has(chunk.name)) {
51
+ compliation.__mpx__.externalRequestsMap.set(chunk.name, new Set())
52
+ }
53
+ compliation.__mpx__.externalRequestsMap.get(chunk.name).add(relativePath)
54
+
55
+ source.replace(range[0], range[1] - 1, `require(${JSON.stringify(relativePath)})`)
56
+ }
57
+ }
58
+
59
+ makeSerializable(RequireExternalDependency, '@mpxjs/webpack-plugin/lib/dependencies/RequireExternalDependency')
60
+
61
+ module.exports = RequireExternalDependency
@@ -35,8 +35,9 @@ module.exports = function loader (content, prevOptions) {
35
35
 
36
36
  let publicPath = `__webpack_public_path__ + ${JSON.stringify(url)}`
37
37
 
38
- // todo 未来添加分包处理后相对地址不一定是./开头的,需要考虑通过dependency的方式在sourceModule时通过最终的chunkName得到准确的相对路径
39
- if (isRN) publicPath = `__non_webpack_require__(${JSON.stringify(`./${url}`)})`
38
+ if (isRN) {
39
+ publicPath = `__mpx_require_external__(${JSON.stringify(url)})`
40
+ }
40
41
 
41
42
  if (options.publicPath) {
42
43
  if (typeof options.publicPath === 'function') {
package/lib/index.js CHANGED
@@ -44,9 +44,11 @@ const FlagPluginDependency = require('./dependencies/FlagPluginDependency')
44
44
  const RemoveEntryDependency = require('./dependencies/RemoveEntryDependency')
45
45
  const RecordLoaderContentDependency = require('./dependencies/RecordLoaderContentDependency')
46
46
  const RecordRuntimeInfoDependency = require('./dependencies/RecordRuntimeInfoDependency')
47
+ const RequireExternalDependency = require('./dependencies/RequireExternalDependency')
47
48
  const SplitChunksPlugin = require('webpack/lib/optimize/SplitChunksPlugin')
48
49
  const fixRelative = require('./utils/fix-relative')
49
50
  const parseRequest = require('./utils/parse-request')
51
+ const { transSubpackage } = require('./utils/trans-async-sub-rules')
50
52
  const { matchCondition } = require('./utils/match-condition')
51
53
  const processDefs = require('./utils/process-defs')
52
54
  const config = require('./config')
@@ -72,6 +74,9 @@ const isEmptyObject = require('./utils/is-empty-object')
72
74
  const DynamicPlugin = require('./resolver/DynamicPlugin')
73
75
  const { isReact, isWeb } = require('./utils/env')
74
76
  const VirtualModulesPlugin = require('webpack-virtual-modules')
77
+ const RuntimeGlobals = require('webpack/lib/RuntimeGlobals')
78
+ const LoadAsyncChunkModule = require('./react/LoadAsyncChunkModule')
79
+ const ExternalModule = require('webpack/lib/ExternalModule')
75
80
  require('./utils/check-core-version-match')
76
81
 
77
82
  const isProductionLikeMode = options => {
@@ -138,6 +143,9 @@ class MpxWebpackPlugin {
138
143
  if (options.dynamicComponentRules && !options.dynamicRuntime) {
139
144
  errors.push('Please make sure you have set dynamicRuntime true in mpx webpack plugin config because you have use the dynamic runtime feature.')
140
145
  }
146
+ if (options.transSubpackageRules && !isReact(options.mode)) {
147
+ warnings.push('MpxWebpackPlugin transSubpackageRules option only supports "ios", "android", or "harmony" mode')
148
+ }
141
149
  options.externalClasses = options.externalClasses || ['custom-class', 'i-class']
142
150
  options.resolveMode = options.resolveMode || 'webpack'
143
151
  options.writeMode = options.writeMode || 'changed'
@@ -408,7 +416,7 @@ class MpxWebpackPlugin {
408
416
  let splitChunksOptions = null
409
417
  let splitChunksPlugin = null
410
418
  // 输出web ssr需要将optimization.splitChunks设置为false以关闭splitChunks
411
- if (optimization.splitChunks !== false && !isReact(this.options.mode)) {
419
+ if (optimization.splitChunks !== false) {
412
420
  splitChunksOptions = Object.assign({
413
421
  chunks: 'all',
414
422
  usedExports: optimization.usedExports === true,
@@ -606,6 +614,22 @@ class MpxWebpackPlugin {
606
614
  return mpx
607
615
  }
608
616
  })
617
+
618
+ if (isReact(this.options.mode)) {
619
+ compilation.hooks.runtimeRequirementInTree
620
+ .for(RuntimeGlobals.loadScript)
621
+ .tap({
622
+ stage: -1000,
623
+ name: 'LoadAsyncChunk'
624
+ }, (chunk, set) => {
625
+ compilation.addRuntimeModule(
626
+ chunk,
627
+ new LoadAsyncChunkModule(this.options.rnConfig && this.options.rnConfig.asyncChunk && this.options.rnConfig.asyncChunk.timeout)
628
+ )
629
+ return true
630
+ })
631
+ }
632
+
609
633
  compilation.dependencyFactories.set(ResolveDependency, new NullFactory())
610
634
  compilation.dependencyTemplates.set(ResolveDependency, new ResolveDependency.Template())
611
635
 
@@ -654,6 +678,9 @@ class MpxWebpackPlugin {
654
678
  compilation.dependencyFactories.set(RecordRuntimeInfoDependency, new NullFactory())
655
679
  compilation.dependencyTemplates.set(RecordRuntimeInfoDependency, new RecordRuntimeInfoDependency.Template())
656
680
 
681
+ compilation.dependencyFactories.set(RequireExternalDependency, new NullFactory())
682
+ compilation.dependencyTemplates.set(RequireExternalDependency, new RequireExternalDependency.Template())
683
+
657
684
  compilation.dependencyTemplates.set(ImportDependency, new ImportDependencyTemplate())
658
685
  })
659
686
 
@@ -701,6 +728,8 @@ class MpxWebpackPlugin {
701
728
  assetsModulesMap: new Map(),
702
729
  // 记录与asset相关联的ast,用于体积分析和esCheck,避免重复parse
703
730
  assetsASTsMap: new Map(),
731
+ // 记录RequireExternalDependency相关资源路径
732
+ externalRequestsMap: new Map(),
704
733
  globalComponents: {},
705
734
  globalComponentsInfo: {},
706
735
  // todo es6 map读写性能高于object,之后会逐步替换
@@ -740,7 +769,7 @@ class MpxWebpackPlugin {
740
769
  removedChunks: [],
741
770
  forceProxyEventRules: this.options.forceProxyEventRules,
742
771
  // 若配置disableRequireAsync=true, 则全平台构建不支持异步分包
743
- supportRequireAsync: !this.options.disableRequireAsync && (this.options.mode === 'wx' || this.options.mode === 'ali' || this.options.mode === 'tt' || isWeb(this.options.mode)),
772
+ supportRequireAsync: !this.options.disableRequireAsync && (this.options.mode === 'wx' || this.options.mode === 'ali' || this.options.mode === 'tt' || isWeb(this.options.mode) || isReact(this.options.mode)),
744
773
  partialCompileRules: this.options.partialCompileRules,
745
774
  collectDynamicEntryInfo: ({ resource, packageName, filename, entryType, hasAsync }) => {
746
775
  const curInfo = mpx.dynamicEntryInfo[packageName] = mpx.dynamicEntryInfo[packageName] || {
@@ -756,6 +785,7 @@ class MpxWebpackPlugin {
756
785
  })
757
786
  },
758
787
  asyncSubpackageRules: this.options.asyncSubpackageRules,
788
+ transSubpackageRules: this.options.transSubpackageRules,
759
789
  optimizeRenderRules: this.options.optimizeRenderRules,
760
790
  pathHash: (resourcePath) => {
761
791
  if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
@@ -1151,6 +1181,11 @@ class MpxWebpackPlugin {
1151
1181
  return rawCallback(null, module)
1152
1182
  }
1153
1183
  }
1184
+
1185
+ if (isReact(mpx.mode) && module instanceof ExternalModule) {
1186
+ module.hasChunkCondition = () => false // 跳过 EnsureChunkConditionsPlugin 的过滤,避免被输出到包含 entry module 的 chunk 当中
1187
+ module.chunkCondition = () => true // 可以正常被 SplitChunkPlugin 处理
1188
+ }
1154
1189
  return rawAddModule.call(compilation, module, callback)
1155
1190
  }
1156
1191
 
@@ -1199,12 +1234,12 @@ class MpxWebpackPlugin {
1199
1234
  // 自动使用分包配置修改splitChunksPlugin配置
1200
1235
  if (splitChunksPlugin) {
1201
1236
  let needInit = false
1202
- if (isWeb(mpx.mode)) {
1237
+ if (isWeb(mpx.mode) || isReact(mpx.mode)) {
1203
1238
  // web独立处理splitChunk
1204
- if (!hasOwn(splitChunksOptions.cacheGroups, 'main')) {
1239
+ if (isWeb(mpx.mode) && !hasOwn(splitChunksOptions.cacheGroups, 'main')) {
1205
1240
  splitChunksOptions.cacheGroups.main = {
1206
1241
  chunks: 'initial',
1207
- name: 'bundle',
1242
+ name: 'lib/index', // web 输出 chunk 路径和 rn 输出分包格式拉齐
1208
1243
  test: /[\\/]node_modules[\\/]/
1209
1244
  }
1210
1245
  needInit = true
@@ -1212,8 +1247,9 @@ class MpxWebpackPlugin {
1212
1247
  if (!hasOwn(splitChunksOptions.cacheGroups, 'async')) {
1213
1248
  splitChunksOptions.cacheGroups.async = {
1214
1249
  chunks: 'async',
1215
- name: 'async',
1216
- minChunks: 2
1250
+ name: 'async-common/index',
1251
+ minChunks: 2,
1252
+ minSize: 1
1217
1253
  }
1218
1254
  needInit = true
1219
1255
  }
@@ -1360,6 +1396,15 @@ class MpxWebpackPlugin {
1360
1396
  }
1361
1397
  })
1362
1398
 
1399
+ parser.hooks.call.for('__mpx_require_external__').tap('MpxWebpackPlugin', (expr) => {
1400
+ const args = expr.arguments.map((i) => i.value)
1401
+ args.unshift(expr.range)
1402
+
1403
+ const dep = new RequireExternalDependency(...args)
1404
+ parser.state.current.addPresentationalDependency(dep)
1405
+ return true
1406
+ })
1407
+
1363
1408
  parser.hooks.call.for('__mpx_dynamic_entry__').tap('MpxWebpackPlugin', (expr) => {
1364
1409
  const args = expr.arguments.map((i) => i.value)
1365
1410
  args.unshift(expr.range)
@@ -1389,10 +1434,11 @@ class MpxWebpackPlugin {
1389
1434
  if (queryObj.root) request = addQuery(request, {}, false, ['root'])
1390
1435
  // wx、ali和web平台支持require.async,其余平台使用CommonJsAsyncDependency进行模拟抹平
1391
1436
  if (mpx.supportRequireAsync) {
1392
- if (isWeb(mpx.mode)) {
1437
+ if (isWeb(mpx.mode) || isReact(mpx.mode)) {
1438
+ if (isReact(mpx.mode)) tarRoot = transSubpackage(mpx.transSubpackageRules, tarRoot)
1393
1439
  const depBlock = new AsyncDependenciesBlock(
1394
1440
  {
1395
- name: tarRoot
1441
+ name: tarRoot + '/index'
1396
1442
  },
1397
1443
  expr.loc,
1398
1444
  request
@@ -1815,9 +1861,11 @@ try {
1815
1861
  normalModuleFactory.hooks.afterResolve.tap('MpxWebpackPlugin', ({ createData }) => {
1816
1862
  const { queryObj } = parseRequest(createData.request)
1817
1863
  const loaders = createData.loaders
1818
- const type = queryObj.type
1819
- if ((queryObj.mpx && queryObj.mpx !== MPX_PROCESSED_FLAG) || queryObj.vue) {
1820
- if (type === 'styles' || type === 'style') {
1864
+ if (queryObj.mpx && queryObj.mpx !== MPX_PROCESSED_FLAG) {
1865
+ const type = queryObj.type
1866
+ const extract = queryObj.extract
1867
+
1868
+ if (type === 'styles') {
1821
1869
  let insertBeforeIndex = -1
1822
1870
  // 单次遍历收集所有索引
1823
1871
  loaders.forEach((loader, index) => {
@@ -1832,10 +1880,7 @@ try {
1832
1880
  }
1833
1881
  loaders.push({ loader: styleStripConditionalPath })
1834
1882
  }
1835
- }
1836
1883
 
1837
- if (queryObj.mpx && queryObj.mpx !== MPX_PROCESSED_FLAG) {
1838
- const extract = queryObj.extract
1839
1884
  switch (type) {
1840
1885
  case 'styles':
1841
1886
  case 'template': {