@mpxjs/webpack-plugin 2.7.1-beta.0 → 2.7.1-beta.1

package/lib/index.js

@@ -139,9 +139,6 @@ class MpxWebpackPlugin {
     options.transRpxRules = options.transRpxRules || null
     options.auditResource = options.auditResource || false
     options.decodeHTMLText = options.decodeHTMLText || false
-    options.nativeOptions = Object.assign({
-      cssLangs: ['css', 'less', 'stylus', 'scss', 'sass']
-    }, options.nativeOptions)
     options.i18n = options.i18n || null
     options.checkUsingComponents = options.checkUsingComponents || false
     options.reportSize = options.reportSize || null
@@ -156,6 +153,10 @@ class MpxWebpackPlugin {
       include: () => true
     }
     options.customOutputPath = options.customOutputPath || null
+    options.nativeConfig = Object.assign({
+      cssLangs: ['css', 'less', 'stylus', 'scss', 'sass']
+    }, options.nativeConfig)
+    options.webConfig = options.webConfig || {}
     this.options = options
   }
 
@@ -315,6 +316,7 @@ class MpxWebpackPlugin {
         originalWriteFile(filePath, content, callback)
       }
     }
+
     const defs = this.options.defs
 
     const typeExtMap = config[this.options.mode].typeExtMap
@@ -504,8 +506,10 @@ class MpxWebpackPlugin {
           transRpxRules: this.options.transRpxRules,
           postcssInlineConfig: this.options.postcssInlineConfig,
           decodeHTMLText: this.options.decodeHTMLText,
-          // native文件专用相关配置
-          nativeOptions: this.options.nativeOptions,
+          // native文件专用配置
+          nativeConfig: this.options.nativeConfig,
+          // 输出web专用配置
+          webConfig: this.options.webConfig,
           tabBarMap: {},
           defs: preProcessDefs(this.options.defs),
           i18n: this.options.i18n,
@@ -1273,7 +1277,7 @@ try {
       })
     })
 
-    compiler.hooks.emit.tapAsync('MpxWebpackPlugin', (compilation, callback) => {
+    compiler.hooks.emit.tap('MpxWebpackPlugin', (compilation) => {
       if (this.options.generateBuildMap) {
         const pagesMap = compilation.__mpx__.pagesMap
         const componentsPackageMap = compilation.__mpx__.componentsMap
@@ -1290,7 +1294,31 @@ try {
           }
         }
       }
-      callback()
+    })
+
+    const clearFileCache = () => {
+      const fs = compiler.intermediateFileSystem
+      const cacheLocation = compiler.options.cache.cacheLocation
+      return new Promise((resolve, reject) => {
+        fs.rm(cacheLocation, {
+          recursive: true,
+          force: true
+        }, (err) => {
+          if (err) return reject(err)
+          resolve()
+        })
+      })
+    }
+
+    compiler.hooks.done.tapPromise('MpxWebpackPlugin', async () => {
+      const cache = compiler.getCache('MpxWebpackPlugin')
+      const cacheIsValid = await cache.getPromise('cacheIsValid', null)
+      if (!cacheIsValid) {
+        await Promise.all([
+          clearFileCache(),
+          cache.storePromise('cacheIsValid', null, true)
+        ])
+      }
     })
   }
 }

package/lib/native-loader.js

@@ -55,7 +55,7 @@ module.exports = function (content) {
   }
 
   function checkCSSLangFiles (callback) {
-    const langs = mpx.nativeOptions.cssLangs || ['less', 'stylus', 'scss', 'sass']
+    const langs = mpx.nativeConfig.cssLangs || ['less', 'stylus', 'scss', 'sass']
     const results = []
     async.eachOf(langs, function (lang, i, callback) {
       if (!CSS_LANG_EXT_MAP[lang]) {

package/lib/runtime/components/web/mpx-swiper.vue

@@ -36,7 +36,8 @@
       easingFunction: {
         type: String,
         default: 'default'
-      }
+      },
+      scrollOptions: Object
     },
     data () {
       return {
@@ -90,11 +91,21 @@
         this.goto(val)
       }
     },
+    activated () {
+      if (this.bs && this.autoplay) {
+        this.bs.startPlay()
+      }
+    },
+    deactivated () {
+      if (this.bs && this.autoplay) {
+        this.bs.pausePlay()
+      }
+    },
     beforeCreate () {
       this.itemIds = []
     },
     mounted () {
-      this.bs = new BScroll(this.$refs.wrapper, {
+      const originBsOptions = {
         scrollX: !this.vertical,
         scrollY: this.vertical,
         slide: {
@@ -103,14 +114,17 @@
           speed: this.duration,
           easing: this.easing,
           interval: this.interval,
-          autoplay: this.autoplay
+          autoplay: this.autoplay,
+          startPageXIndex: this.vertical ? 0 : this.current,
+          startPageYIndex: this.vertical? this.current : 0
         },
         momentum: false,
         bounce: false,
         probeType: 3,
         stopPropagation: true
-      })
-
+      }
+      const bsOptions = Object.assign({}, originBsOptions, this.scrollOptions)
+      this.bs = new BScroll(this.$refs.wrapper, bsOptions)
       this.bs.on('slideWillChange', (page) => {
         this.currentIndex = this.vertical ? page.pageY : page.pageX
         this.$emit('change', getCustomEvent('change', {

package/lib/runtime/components/web/mpx-textarea.vue

@@ -86,7 +86,7 @@
       }
 
       if (this.maxlength !== -1) {
-        domProps.maxlength = this.maxlength
+        domProps.maxLength = this.maxlength
       }
 
       const data = {

package/lib/style-compiler/index.js

@@ -23,6 +23,7 @@ module.exports = function (css, map) {
   const transRpxRulesRaw = mpx.transRpxRules
   const transRpxRules = transRpxRulesRaw ? (Array.isArray(transRpxRulesRaw) ? transRpxRulesRaw : [transRpxRulesRaw]) : []
 
+  const transRpxFn = mpx.webConfig.transRpxFn
   const testResolveRange = (include = () => true, exclude) => {
     return matchCondition(this.resourcePath, { include, exclude })
   }
@@ -67,7 +68,7 @@ module.exports = function (css, map) {
     }
 
     if (mpx.mode === 'web') {
-      plugins.push(vw)
+      plugins.push(vw({ transRpxFn }))
     }
     // source map
     if (this.sourceMap && !options.map) {

package/lib/style-compiler/plugins/vw.js

@@ -5,12 +5,13 @@ const rpxRegExpG = /\b(\d+(\.\d+)?)rpx\b/g
 module.exports = postcss.plugin('vw', (options = {}) => root => {
   const rpx2vwRatio = +(100 / 750).toFixed(8)
 
+  const transRpxFn = options.transRpxFn && typeof options.transRpxFn === 'function' ? options.transRpxFn : function (match, $1) {
+    if ($1 === '0') return $1
+    return `${$1 * rpx2vwRatio}vw`
+  }
   function transVw (declaration) {
     if (rpxRegExp.test(declaration.value)) {
-      declaration.value = declaration.value.replace(rpxRegExpG, function (match, $1) {
-        if ($1 === '0') return $1
-        return `${$1 * rpx2vwRatio}vw`
-      })
+      declaration.value = declaration.value.replace(rpxRegExpG, transRpxFn)
     }
   }
 

package/lib/web/processScript.js

@@ -210,11 +210,11 @@ module.exports = function (script, {
         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 += '\n\n\n/** Source start **/\n'
       content += script.src
         ? `require(${stringifyRequest(script.src)})\n`
         : script.content
-      content += '\n/**   ====== Source end ====== **/\n\n\n'
+      content += '\n/** Source end **/\n\n\n'
       // createApp/Page/Component执行完成后立刻获取当前的option并暂存
       content += `  const currentOption = global.currentOption\n`
       // 获取pageConfig

package/lib/wxs/pre-loader.js

@@ -39,11 +39,16 @@ module.exports = function (content) {
             let results = targetPath.unshiftContainer('body', insertNodes) || []
             targetPath.inserted = true
             results.forEach((item) => {
-              item.stop()
+              item.shouldStopTraverse = true
             })
           }
         }
       },
+      ForStatement (path) {
+        if (path.shouldStopTraverse) {
+          path.stop()
+        }
+      },
       // 处理vant-aliapp中export var bem = bem;这种不被acorn支持的2b语法
       ExportNamedDeclaration (path) {
         if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.1-beta.0",
+  "version": "2.7.1-beta.1",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -77,5 +77,8 @@
     "@types/babel-traverse": "^6.25.4",
     "@types/babel-types": "^7.0.4"
   },
-  "gitHead": "025a2d1590aec3f8749c1a43090394249393a625"
+  "engines": {
+    "node": ">=14.14.0"
+  },
+  "gitHead": "0ea8bcfff2ccfc433cb2ce43275b7e2af2bc8a61"
 }