@mpxjs/webpack-plugin 2.7.0-beta.4 → 2.7.0-beta.8

package/lib/web/processScript.js

@@ -2,7 +2,6 @@ const genComponentTag = require('../utils/gen-component-tag')
 const loaderUtils = require('loader-utils')
 const addQuery = require('../utils/add-query')
 const normalize = require('../utils/normalize')
-const builtInLoaderPath = normalize.lib('built-in-loader')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
 const tabBarContainerPath = normalize.lib('runtime/components/web/mpx-tab-bar-container.vue')
 const tabBarPath = normalize.lib('runtime/components/web/mpx-tab-bar.vue')
@@ -21,23 +20,29 @@ function shallowStringify (obj) {
   return `{${arr.join(',')}}`
 }
 
-module.exports = function (script, options, callback) {
-  const ctorType = options.ctorType
-  const builtInComponentsMap = options.builtInComponentsMap
-  const localComponentsMap = options.localComponentsMap
-  const localPagesMap = options.localPagesMap
-  const srcMode = options.srcMode
-  const loaderContext = options.loaderContext
-  const isProduction = options.isProduction
-  const componentId = options.componentId
-  const i18n = options.i18n
-  const jsonConfig = options.jsonConfig
+module.exports = function (script, {
+  loaderContext,
+  ctorType,
+  srcMode,
+  isProduction,
+  componentGenerics,
+  jsonConfig,
+  outputPath,
+  tabBarMap,
+  tabBarStr,
+  builtInComponentsMap,
+  genericsInfo,
+  wxsModuleMap,
+  localComponentsMap,
+  localPagesMap
+}, callback) {
+  const mpx = loaderContext.getMpx()
+  const {
+    i18n,
+    projectRoot
+  } = mpx
+
   const tabBar = jsonConfig.tabBar
-  const tabBarMap = options.tabBarMap
-  const tabBarStr = options.tabBarStr
-  const genericsInfo = options.genericsInfo
-  const componentGenerics = options.componentGenerics
-  const forceDisableBuiltInLoader = options.forceDisableBuiltInLoader
 
   const emitWarning = (msg) => {
     loaderContext.emitWarning(
@@ -49,7 +54,7 @@ module.exports = function (script, options, callback) {
   let tabBarPagesMap = {}
   if (tabBar && tabBarMap) {
     // 挂载tabBar组件
-    const tabBarRequest = stringifyRequest(addQuery(tabBar.custom ? './custom-tab-bar/index' : tabBarPath, { component: true }))
+    const tabBarRequest = stringifyRequest(addQuery(tabBar.custom ? './custom-tab-bar/index' : tabBarPath, { isComponent: true }))
     tabBarPagesMap['mpx-tab-bar'] = `getComponent(require(${tabBarRequest}))`
     // 挂载tabBar页面
     Object.keys(tabBarMap).forEach((pagePath) => {
@@ -161,9 +166,9 @@ module.exports = function (script, options, callback) {
       }
       // 注入wxs模块
       content += '  const wxsModules = {}\n'
-      if (options.wxsModuleMap) {
-        Object.keys(options.wxsModuleMap).forEach((module) => {
-          const src = loaderUtils.urlToRequest(options.wxsModuleMap[module], options.projectRoot)
+      if (wxsModuleMap) {
+        Object.keys(wxsModuleMap).forEach((module) => {
+          const src = loaderUtils.urlToRequest(wxsModuleMap[module], projectRoot)
           const expression = `require(${stringifyRequest(src)})`
           content += `  wxsModules.${module} = ${expression}\n`
         })
@@ -202,7 +207,7 @@ module.exports = function (script, options, callback) {
 
       Object.keys(builtInComponentsMap).forEach((componentName) => {
         const componentCfg = builtInComponentsMap[componentName]
-        const componentRequest = forceDisableBuiltInLoader ? stringifyRequest(componentCfg.resource) : stringifyRequest('builtInComponent.vue!=!' + builtInLoaderPath + '!' + componentCfg.resource)
+        const componentRequest = stringifyRequest(componentCfg.resource)
         componentsMap[componentName] = `getComponent(require(${componentRequest}), { __mpxBuiltIn: true })`
       })
 
@@ -211,10 +216,11 @@ module.exports = function (script, options, callback) {
         content += `  global.currentResource = ${JSON.stringify(loaderContext.resourcePath)}\n`
       }
       // 为了正确获取currentSrcMode便于运行时进行转换，对于src引入的组件script采用require方式引入(由于webpack会将import的执行顺序上升至最顶)，这意味着对于src引入脚本中的named export将不会生效，不过鉴于mpx和小程序中本身也没有在组件script中声明export的用法，所以应该没有影响
+      content += '\n\n\n/** ====== Source start ====== **/\n'
       content += script.src
         ? `require(${stringifyRequest(script.src)})\n`
         : script.content
-      content += '\n'
+      content += '\n/**   ====== Source end ====== **/\n\n\n'
       // createApp/Page/Component执行完成后立刻获取当前的option并暂存
       content += `  const currentOption = global.currentOption\n`
       // 获取pageConfig
@@ -245,7 +251,7 @@ module.exports = function (script, options, callback) {
     currentOption,
     ${JSON.stringify(ctorType)},
     ${JSON.stringify(firstPage)},
-    ${JSON.stringify(componentId)},
+    ${JSON.stringify(outputPath)},
     ${JSON.stringify(pageConfig)},
     // @ts-ignore
     ${shallowStringify(pagesMap)},

package/lib/web/processTemplate.js

@@ -1,9 +1,10 @@
 const templateCompiler = require('../template-compiler/compiler')
 const genComponentTag = require('../utils/gen-component-tag')
 const addQuery = require('../utils/add-query')
-const path = require('path')
 const parseRequest = require('../utils/parse-request')
 
+// const matchCondition = require('../utils/match-condition')
+
 function calculateRootEleChild (arr) {
   if (!arr) {
     return 0
@@ -20,17 +21,30 @@ function calculateRootEleChild (arr) {
   }, 0)
 }
 
-module.exports = function (template, options, callback) {
-  const mode = options.mode
-  const srcMode = options.srcMode
-  const defs = options.defs
-  const moduleId = options.moduleId
-  const loaderContext = options.loaderContext
-  const ctorType = options.ctorType
-  const resourcePath = parseRequest(loaderContext.resource).resourcePath
-  const builtInComponentsMap = {}
+module.exports = function (template, {
+  loaderContext,
+  // hasScoped,
+  hasComment,
+  isNative,
+  srcMode,
+  moduleId,
+  ctorType,
+  usingComponents,
+  componentGenerics
+}, callback) {
   const mpx = loaderContext.getMpx()
-  const wxsContentMap = mpx.wxsContentMap
+  const {
+    mode,
+    defs,
+    wxsContentMap,
+    decodeHTMLText,
+    externalClasses,
+    checkUsingComponents
+    // autoVirtualHostRules
+  } = mpx
+  const { resourcePath } = parseRequest(loaderContext.resource)
+  const builtInComponentsMap = {}
+
   let wxsModuleMap, genericsInfo
   let output = '/* template */\n'
 
@@ -40,7 +54,7 @@ module.exports = function (template, options, callback) {
       content: '<div class="app"><mpx-keep-alive><router-view class="page"></router-view></mpx-keep-alive></div>'
     }
     builtInComponentsMap['mpx-keep-alive'] = {
-      resource: addQuery('@mpxjs/webpack-plugin/lib/runtime/components/web/mpx-keep-alive.vue', { component: true })
+      resource: addQuery('@mpxjs/webpack-plugin/lib/runtime/components/web/mpx-keep-alive.vue', { isComponent: true })
     }
   }
 
@@ -59,7 +73,7 @@ module.exports = function (template, options, callback) {
       }
       if (template.content) {
         const templateSrcMode = template.mode || srcMode
-        const parsed = templateCompiler.parse(template.content, {
+        const { root, meta } = templateCompiler.parse(template.content, {
           warn: (msg) => {
             loaderContext.emitWarning(
               new Error('[template compiler][' + loaderContext.resource + ']: ' + msg)
@@ -70,54 +84,59 @@ module.exports = function (template, options, callback) {
               new Error('[template compiler][' + loaderContext.resource + ']: ' + msg)
             )
           },
-          usingComponents: options.usingComponents,
-          hasComment: options.hasComment,
-          isNative: options.isNative,
-          basename: path.basename(resourcePath),
+          usingComponents,
+          hasComment,
+          isNative,
           isComponent: ctorType === 'component',
           mode,
           srcMode: templateSrcMode,
           defs,
-          decodeHTMLText: options.decodeHTMLText,
-          externalClasses: options.externalClasses,
+          decodeHTMLText,
+          externalClasses,
           // todo 后续输出web也采用mpx的scoped处理
-          // hasScoped:options.hasScoped,
           hasScoped: false,
           moduleId,
           filePath: loaderContext.resourcePath,
           i18n: null,
-          checkUsingComponents: options.checkUsingComponents,
+          checkUsingComponents,
           // web模式下全局组件不会被合入usingComponents中，故globalComponents可以传空
           globalComponents: [],
           // web模式下实现抽象组件
-          componentGenerics: options.componentGenerics
+          componentGenerics
+          // todo 后续输出web也基于autoVirtualHostRules决定是否添加root wrapper
+          // hasVirtualHost: matchCondition(resourcePath, autoVirtualHostRules)
         })
-        if (parsed.meta.wxsModuleMap) {
-          wxsModuleMap = parsed.meta.wxsModuleMap
+        if (meta.wxsModuleMap) {
+          wxsModuleMap = meta.wxsModuleMap
         }
-        if (parsed.meta.wxsContentMap) {
-          for (let module in parsed.meta.wxsContentMap) {
-            wxsContentMap[`${resourcePath}~${module}`] = parsed.meta.wxsContentMap[module]
+        if (meta.wxsContentMap) {
+          for (let module in meta.wxsContentMap) {
+            wxsContentMap[`${resourcePath}~${module}`] = meta.wxsContentMap[module]
           }
         }
-        if (parsed.meta.builtInComponentsMap) {
-          Object.keys(parsed.meta.builtInComponentsMap).forEach((name) => {
+        if (meta.builtInComponentsMap) {
+          Object.keys(meta.builtInComponentsMap).forEach((name) => {
             builtInComponentsMap[name] = {
-              resource: addQuery(parsed.meta.builtInComponentsMap[name], { component: true })
+              resource: addQuery(meta.builtInComponentsMap[name], { isComponent: true })
             }
           })
         }
-        if (parsed.meta.genericsInfo) {
-          genericsInfo = parsed.meta.genericsInfo
+        if (meta.genericsInfo) {
+          genericsInfo = meta.genericsInfo
         }
-        // 输出H5有多个root element时, 使用div标签包裹
-        if (parsed.root.tag === 'temp-node') {
-          const childLen = calculateRootEleChild(parsed.root.children)
+        // 输出H5有多个root element时, 使用mpx-root-view标签包裹
+        // todo 后续输出web也基于autoVirtualHostRules决定是否添加root wrapper
+        if (root.tag === 'temp-node') {
+          const childLen = calculateRootEleChild(root.children)
           if (childLen >= 2) {
-            parsed.root.tag = 'div'
+            root.tag = 'div'
+            templateCompiler.addAttrs(root, [{
+              name: 'class',
+              value: 'mpx-root-view'
+            }])
           }
         }
-        return templateCompiler.serialize(parsed.root)
+        return templateCompiler.serialize(root)
       }
     })
     output += '\n\n'

package/lib/wxs/loader.js

@@ -3,7 +3,7 @@ const EntryPlugin = require('webpack/lib/EntryPlugin')
 const LimitChunkCountPlugin = require('webpack/lib/optimize/LimitChunkCountPlugin')
 const path = require('path')
 const WxsPlugin = require('./WxsPlugin')
-const RecordStaticResourceDependency = require('../dependencies/RecordStaticResourceDependency')
+const RecordResourceMapDependency = require('../dependencies/RecordResourceMapDependency')
 const parseRequest = require('../utils/parse-request')
 const toPosix = require('../utils/to-posix')
 const fixRelative = require('../utils/fix-relative')
@@ -14,8 +14,7 @@ module.exports = function () {
   const moduleGraph = this._compilation.moduleGraph
   const mpx = this.getMpx()
   const mode = mpx.mode
-  const wxsMap = mpx.wxsMap
-  const appInfo = mpx.appInfo
+  const getOutputPath = mpx.getOutputPath
   let { resourcePath, queryObj } = parseRequest(this.resource)
   const issuer = moduleGraph.getIssuer(this._module)
   const { resourcePath: issuerResourcePath, queryObj: issuerQueryObj } = parseRequest(queryObj.issuerResource || issuer.resource)
@@ -23,7 +22,7 @@ module.exports = function () {
   const pagesMap = mpx.pagesMap
   const componentsMap = mpx.componentsMap[issuerPackageName]
   const staticResourcesMap = mpx.staticResourcesMap[issuerPackageName]
-  const issuerName = issuerResourcePath === appInfo.resourcePath ? appInfo.name : (pagesMap[issuerResourcePath] || componentsMap[issuerResourcePath] || staticResourcesMap[issuerResourcePath])
+  const issuerName = pagesMap[issuerResourcePath] || componentsMap[issuerResourcePath] || staticResourcesMap[issuerResourcePath]
   const issuerDir = path.dirname(issuerName)
 
   const getName = (raw) => {
@@ -36,9 +35,9 @@ module.exports = function () {
     resourcePath = `${resourcePath}~${wxsModule}`
   }
   const packageRoot = queryObj.packageRoot || ''
-  const name = path.parse(resourcePath).name + mpx.pathHash(resourcePath)
-  const filename = toPosix(path.join(packageRoot, /^\.([^.]+)/.exec(config[mode].wxs.ext)[1], `${name}${config[mode].wxs.ext}`))
-  this._module.addPresentationalDependency(new RecordStaticResourceDependency(resourcePath, filename, packageRoot))
+  const ext = config[mode].wxs.ext
+  const filename = toPosix(path.join(packageRoot, getOutputPath(resourcePath, ext.slice(1), { ext })))
+  this._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'staticResource', filename, packageRoot))
 
   const callback = (err) => {
     if (err) return nativeCallback(err)
@@ -47,18 +46,25 @@ module.exports = function () {
     nativeCallback(null, `module.exports = ${JSON.stringify(relativePath)};`)
   }
 
-  if (wxsMap[filename]) {
-    wxsMap[filename].modules.push(this._module)
-    return callback()
-  }
-
-  wxsMap[filename] = {
-    dep: null,
-    modules: [this._module]
-  }
-
   const outputOptions = {
-    filename
+    filename,
+    // 避免输出的wxs中包含es语法
+    environment: {
+      // The environment supports arrow functions ('() => { ... }').
+      arrowFunction: false,
+      // The environment supports BigInt as literal (123n).
+      bigIntLiteral: false,
+      // The environment supports const and let for variable declarations.
+      const: false,
+      // The environment supports destructuring ('{ a, b } = obj').
+      destructuring: false,
+      // The environment supports an async import() function to import EcmaScript modules.
+      dynamicImport: false,
+      // The environment supports 'for of' iteration ('for (const x of array) { ... }').
+      forOf: false,
+      // The environment supports ECMAScript Module syntax to import ECMAScript modules (import ... from '...').
+      module: false
+    }
   }
   // wxs文件必须经过pre-loader
   const request = '!!' + this.remainingRequest
@@ -71,15 +77,6 @@ module.exports = function () {
 
   const childCompiler = this._compilation.createChildCompiler(resourcePath, outputOptions, plugins)
 
-  // let entryModule
-  // childCompiler.hooks.thisCompilation.tap('MpxWebpackPlugin ', (compilation) => {
-  //   compilation.hooks.succeedEntry.tap('MpxWebpackPlugin', (entry, name, module) => {
-  //     entryModule = module
-  //     // const dep = new ChildCompileDependency(entryModule)
-  //     // wxsMap[filename].dep = dep
-  //   })
-  // })
-
   childCompiler.hooks.afterCompile.tap('MpxWebpackPlugin', (compilation) => {
     // 持久化缓存，使用module.buildInfo.assets来输出文件
     compilation.getAssets().forEach(({ name, source, info }) => {

package/lib/wxs/pre-loader.js

@@ -1,7 +1,7 @@
-const babylon = require('babylon')
-const traverse = require('babel-traverse').default
-const t = require('babel-types')
-const generate = require('babel-generator').default
+const babylon = require('@babel/parser')
+const traverse = require('@babel/traverse').default
+const t = require('@babel/types')
+const generate = require('@babel/generator').default
 const parseRequest = require('../utils/parse-request')
 const isEmptyObject = require('../utils/is-empty-object')
 const parseQuery = require('loader-utils').parseQuery

package/lib/wxss/processCss.js

@@ -3,37 +3,37 @@
   Author Tobias Koppers @sokra
   Modified by @hiyuki
 */
-var formatCodeFrame = require('babel-code-frame')
-var Tokenizer = require('css-selector-tokenizer')
-var postcss = require('postcss')
-var loaderUtils = require('loader-utils')
-var assign = require('object-assign')
-var getLocalIdent = require('./getLocalIdent')
+const formatCodeFrame = require('@babel/code-frame')
+const Tokenizer = require('css-selector-tokenizer')
+const postcss = require('postcss')
+const loaderUtils = require('loader-utils')
+const assign = require('object-assign')
+const getLocalIdent = require('./getLocalIdent')
 
-var icssUtils = require('icss-utils')
-var localByDefault = require('postcss-modules-local-by-default')
-var extractImports = require('postcss-modules-extract-imports')
-var modulesScope = require('postcss-modules-scope')
-var modulesValues = require('postcss-modules-values')
-var valueParser = require('postcss-value-parser')
-var isUrlRequest = require('../utils/is-url-request')
+const icssUtils = require('icss-utils')
+const localByDefault = require('postcss-modules-local-by-default')
+const extractImports = require('postcss-modules-extract-imports')
+const modulesScope = require('postcss-modules-scope')
+const modulesValues = require('postcss-modules-values')
+const valueParser = require('postcss-value-parser')
+const isUrlRequest = require('../utils/is-url-request')
 
-var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
+const parserPlugin = postcss.plugin('css-loader-parser', function (options) {
   return function (css) {
-    var imports = {}
-    var exports = {}
-    var importItems = []
-    var urlItems = []
+    const imports = {}
+    let exports = {}
+    const importItems = []
+    const urlItems = []
 
     function replaceImportsInString (str) {
       if (options.import) {
-        var tokens = valueParser(str)
+        const tokens = valueParser(str)
         tokens.walk(function (node) {
           if (node.type !== 'word') {
             return
           }
-          var token = node.value
-          var importIndex = imports['$' + token]
+          const token = node.value
+          const importIndex = imports['$' + token]
           if (typeof importIndex === 'number') {
             node.value = '___CSS_LOADER_IMPORT___' + importIndex + '___'
           }
@@ -45,8 +45,8 @@ var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
 
     if (options.import) {
       css.walkAtRules(/^import$/i, function (rule) {
-        var values = Tokenizer.parseValues(rule.params)
-        var url = values.nodes[0].nodes[0]
+        const values = Tokenizer.parseValues(rule.params)
+        let url = values.nodes[0].nodes[0]
         if (url && url.type === 'url') {
           url = url.url
         } else if (url && url.type === 'string') {
@@ -56,7 +56,7 @@ var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
           return
         }
         values.nodes[0].nodes.shift()
-        var mediaQuery = Tokenizer.stringifyValues(values)
+        const mediaQuery = Tokenizer.stringifyValues(values)
 
         if (isUrlRequest(url, options.root)) {
           url = loaderUtils.urlToRequest(url, options.root)
@@ -70,10 +70,10 @@ var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
       })
     }
 
-    var icss = icssUtils.extractICSS(css)
+    const icss = icssUtils.extractICSS(css)
     exports = icss.icssExports
     Object.keys(icss.icssImports).forEach(function (key) {
-      var url = loaderUtils.parseString(key)
+      const url = loaderUtils.parseString(key)
       Object.keys(icss.icssImports[key]).forEach(function (prop) {
         imports['$' + prop] = importItems.length
         importItems.push({
@@ -101,7 +101,7 @@ var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
           item.nodes.forEach(processNode)
           break
         case 'item':
-          var importIndex = imports['$' + item.name]
+          const importIndex = imports['$' + item.name]
           if (typeof importIndex === 'number') {
             item.name = '___CSS_LOADER_IMPORT___' + importIndex + '___'
           }
@@ -112,7 +112,7 @@ var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
             item.stringType = ''
             delete item.innerSpacingBefore
             delete item.innerSpacingAfter
-            var url = item.url
+            const url = item.url
             item.url = '___CSS_LOADER_URL___' + urlItems.length + '___'
             urlItems.push({
               url: url
@@ -123,7 +123,7 @@ var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
     }
 
     css.walkDecls(function (decl) {
-      var values = Tokenizer.parseValues(decl.value)
+      const values = Tokenizer.parseValues(decl.value)
       values.nodes.forEach(function (value) {
         value.nodes.forEach(processNode)
       })
@@ -142,17 +142,17 @@ var parserPlugin = postcss.plugin('css-loader-parser', function (options) {
 })
 
 module.exports = function processCss (inputSource, inputMap, options, callback) {
-  var query = options.query
-  var root = query.root && query.root.length > 0 ? query.root.replace(/\/$/, '') : query.root
-  var context = query.context
-  var localIdentName = query.localIdentName || '[hash:base64]'
-  var localIdentRegExp = query.localIdentRegExp
-  var forceMinimize = query.minimize
-  var minimize = typeof forceMinimize !== 'undefined' ? !!forceMinimize : options.minimize
+  const query = options.query
+  const root = query.root && query.root.length > 0 ? query.root.replace(/\/$/, '') : query.root
+  const context = query.context
+  const localIdentName = query.localIdentName || '[hash:base64]'
+  const localIdentRegExp = query.localIdentRegExp
+  const forceMinimize = query.minimize
+  const minimize = typeof forceMinimize !== 'undefined' ? !!forceMinimize : options.minimize
 
-  var customGetLocalIdent = query.getLocalIdent || getLocalIdent
+  const customGetLocalIdent = query.getLocalIdent || getLocalIdent
 
-  var parserOptions = {
+  const parserOptions = {
     root: root,
     mode: options.mode,
     url: query.url !== false,
@@ -160,7 +160,7 @@ module.exports = function processCss (inputSource, inputMap, options, callback)
     resolve: options.resolve
   }
 
-  var pipeline = postcss([
+  const pipeline = postcss([
     modulesValues,
     localByDefault({
       mode: options.mode,
@@ -192,8 +192,8 @@ module.exports = function processCss (inputSource, inputMap, options, callback)
   ])
 
   if (minimize) {
-    var cssnano = require('cssnano')
-    var minimizeOptions = assign({}, query.minimize);
+    const cssnano = require('cssnano')
+    const minimizeOptions = assign({}, query.minimize);
     ['zindex', 'normalizeUrl', 'discardUnused', 'mergeIdents', 'reduceIdents', 'autoprefixer', 'svgo'].forEach(function (name) {
       if (typeof minimizeOptions[name] === 'undefined') {
         minimizeOptions[name] = false
@@ -226,7 +226,7 @@ module.exports = function processCss (inputSource, inputMap, options, callback)
     })
   }).catch(function (err) {
     if (err.name === 'CssSyntaxError') {
-      var wrappedError = new CSSLoaderError(
+      const wrappedError = new CSSLoaderError(
         'Syntax Error',
         err.reason,
         err.line != null && err.column != null
@@ -242,7 +242,7 @@ module.exports = function processCss (inputSource, inputMap, options, callback)
 }
 
 function formatMessage (message, loc, source) {
-  var formatted = message
+  let formatted = message
   if (loc) {
     formatted = formatted +
       ' (' + loc.line + ':' + loc.column + ')'
@@ -260,7 +260,7 @@ function CSSLoaderError (name, message, loc, source, error) {
   this.name = name
   this.error = error
   this.message = formatMessage(message, loc, source)
-  this.hideStack = true
+  this.message = formatMessage(message, loc, source)
 }
 
 CSSLoaderError.prototype = Object.create(Error.prototype)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.0-beta.4",
+  "version": "2.7.0-beta.8",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -15,6 +15,11 @@
     "lib"
   ],
   "dependencies": {
+    "@babel/code-frame": "^7.16.0",
+    "@babel/generator": "^7.16.0",
+    "@babel/parser": "^7.16.2",
+    "@babel/traverse": "^7.16.0",
+    "@babel/types": "^7.16.0",
     "@better-scroll/core": "^2.2.1",
     "@better-scroll/movable": "^2.2.1",
     "@better-scroll/observe-dom": "^2.2.1",
@@ -24,11 +29,6 @@
     "@better-scroll/zoom": "^2.2.1",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
-    "babel-code-frame": "^6.26.0",
-    "babel-generator": "^6.26.1",
-    "babel-traverse": "^6.26.0",
-    "babel-types": "^6.26.0",
-    "babylon": "^6.18.0",
     "consolidate": "^0.15.1",
     "css": "^2.2.1",
     "css-selector-tokenizer": "^0.7.0",
@@ -40,7 +40,7 @@
     "html-minifier": "^3.5.8",
     "icss-utils": "^2.1.0",
     "json5": "^2.1.3",
-    "loader-utils": "1.1.0",
+    "loader-utils": "^2.0.2",
     "lodash": "^4.17.15",
     "lodash.camelcase": "^4.3.0",
     "lru-cache": "^4.1.2",
@@ -77,5 +77,5 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "1a49588a7cca9f5d2d15e0116b6c540b9e804eae"
+  "gitHead": "73247d266ae7380b88295208d645f85b9dd72398"
 }

package/lib/built-in-loader.js

@@ -1,45 +0,0 @@
-const parseComponent = require('./parser')
-const loaderUtils = require('loader-utils')
-const parseRequest = require('./utils/parse-request')
-const normalize = require('./utils/normalize')
-const selectorPath = normalize.lib('selector')
-const genComponentTag = require('./utils/gen-component-tag')
-
-module.exports = function (content) {
-  this.cacheable()
-  const mpx = this.getMpx()
-  if (!mpx) {
-    return content
-  }
-  const mode = mpx.mode
-  const env = mpx.env
-  const resourcePath = parseRequest(this.resource).resourcePath
-  const parts = parseComponent(content, {
-    filePath: resourcePath,
-    needMap: this.sourceMap,
-    mode,
-    env
-  })
-
-  let output = ''
-
-  // 内建组件编写规范比较统一，不需要处理太多情况
-  if (parts.template) {
-    output += genComponentTag(parts.template)
-  }
-
-  if (parts.script) {
-    output += '\n' + genComponentTag(parts.script, (script) => {
-      let content = ''
-      if (parts.styles && parts.styles.length) {
-        parts.styles.forEach((style, i) => {
-          const requestString = loaderUtils.stringifyRequest(this, `builtInComponent.styl!=!${selectorPath}?type=styles&index=${i}!${loaderUtils.getRemainingRequest(this)}`)
-          content += `\n  import ${requestString}`
-        })
-      }
-      content += script.content
-      return content
-    })
-  }
-  return output
-}

package/lib/record-loader.js

@@ -1,11 +0,0 @@
-const parseRequest = require('./utils/parse-request')
-const RecordStaticResourceDependency = require('./dependencies/RecordStaticResourceDependency')
-
-module.exports = function (source) {
-  const mpx = this.getMpx()
-  const { resourcePath, queryObj } = parseRequest(this.resource)
-  const file = mpx.getExtractedFile(this.resource)
-  const packageRoot = queryObj.packageRoot || ''
-  this._module.addPresentationalDependency(new RecordStaticResourceDependency(resourcePath, file, packageRoot))
-  return source
-}