@mpxjs/webpack-plugin 2.8.25-alpha → 2.8.25-alpha.1

package/lib/tenon/processScript.js

@@ -5,6 +5,7 @@ const normalize = require('../utils/normalize')
 const builtInLoaderPath = normalize.lib('built-in-loader')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
 const createJSONHelper = require('../json-compiler/helper')
+const createHelpers = require('../helpers')
 const async = require('async')
 const hasOwn = require('../utils/has-own')
 
@@ -89,6 +90,8 @@ module.exports = function (script, options, callback) {
     emitError
   })
 
+  const { getRequire } = createHelpers(loaderContext)
+
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
   // let tabBarPagesMap = {}
   // if (tabBar && tabBarMap) {
@@ -188,10 +191,14 @@ module.exports = function (script, options, callback) {
       if (!isProduction) {
         content += `  global.currentResource = ${JSON.stringify(loaderContext.resourcePath)}\n`
       }
-      // 为了正确获取currentSrcMode便于运行时进行转换，对于src引入的组件script采用require方式引入(由于webpack会将import的执行顺序上升至最顶)，这意味着对于src引入脚本中的named export将不会生效，不过鉴于mpx和小程序中本身也没有在组件script中声明export的用法，所以应该没有影响
-      content += script.src
-        ? `require(${stringifyRequest(script.src)})\n`
-        : (script.content + '\n') + '\n'
+      // 传递ctorType以补全js内容
+      const extraOptions = {
+        ctorType,
+        lang: script.lang || 'js'
+      }
+      // 使用 require 引入 script
+      content += `  ${getRequire('script', script, extraOptions)}\n`
+
       // createApp/Page/Component执行完成后立刻获取当前的option并暂存
       content += `  const currentOption = global.__mpxOptionsMap[${JSON.stringify(moduleId)}]\n`
       // 获取pageConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.25-alpha",
+  "version": "2.8.25-alpha.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -85,5 +85,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "345dc10820535a06d9aee8d2a1e6cc735ba08882"
+  "gitHead": "0d932ec0de2bf893ac37811b9280c1c693e644ef"
 }