@mpxjs/webpack-plugin 2.6.114-alpha.3 → 2.6.114-alpha.6

package/lib/index.js

@@ -1125,11 +1125,13 @@ try {
         if (data.loaders) {
           const { queryObj } = parseRequest(data.request)
           const mpxStyleOptions = queryObj.mpxStyleOptions
+          // todo 本套逻辑可能需要根据mode来提前判断以做编译优化
           const firstLoader = (data.loaders[0] && data.loaders[0].loader) || ''
-          const isPitcherRequest = firstLoader.includes('vue-loader/lib/loaders/pitcher.js')
+          const isPitcherRequest = firstLoader.includes('vue-loader/lib/loaders/pitcher.js') || firstLoader.includes('@hummer/tenon-loader/dist/pitcher.js')
           let cssLoaderIndex = -1
           let vueStyleLoaderIndex = -1
           let mpxStyleLoaderIndex = -1
+          let tenonStyleLoaderIndex = -1
           data.loaders.forEach((loader, index) => {
             const currentLoader = loader.loader
             if (currentLoader.includes('ts-loader')) {
@@ -1140,11 +1142,20 @@ try {
               cssLoaderIndex = index
             } else if (currentLoader.includes('vue-loader/lib/loaders/stylePostLoader.js')) {
               vueStyleLoaderIndex = index
+            } else if (currentLoader.includes('@hummer/tenon-style-loader/dist/index.js')) {
+              tenonStyleLoaderIndex = index
             } else if (currentLoader.includes('@mpxjs/webpack-plugin/lib/style-compiler/index.js')) {
               mpxStyleLoaderIndex = index
             }
           })
-          if (mpxStyleLoaderIndex === -1) {
+          if (mpx.mode === 'tenon' && mpxStyleLoaderIndex === -1) {
+            if (tenonStyleLoaderIndex > -1 && !isPitcherRequest) {
+              data.loaders.splice(tenonStyleLoaderIndex + 1, 0, {
+                loader: normalize.lib('style-compiler/index.js'),
+                options: (mpxStyleOptions && JSON.parse(mpxStyleOptions)) || {}
+              })
+            }
+          } else if (mpxStyleLoaderIndex === -1) {
             let loaderIndex = -1
             if (cssLoaderIndex > -1 && vueStyleLoaderIndex === -1) {
               loaderIndex = cssLoaderIndex

package/lib/runtime/components/tenon/tenon-button.vue

@@ -150,7 +150,7 @@ export default (function(){
 
 
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-button-versionv2
     width: 184px
     line-height 1.41176471

package/lib/runtime/components/tenon/tenon-image.vue

@@ -53,7 +53,7 @@ export default {
   },
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-image
   width 300px
   height 225px

package/lib/runtime/components/tenon/tenon-input.vue

@@ -83,7 +83,7 @@ export default {
   methods: {},
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
   .mpx-input
     cursor auto
     width 100%

package/lib/runtime/components/tenon/tenon-switch.vue

@@ -80,7 +80,7 @@ export default {
 };
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-switch-wrap
   .mpx-switch-label
     border-radius 16hm

package/lib/runtime/components/tenon/tenon-text-area.vue

@@ -51,7 +51,7 @@ export default {
   methods: {},
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-textarea
   font inherit
   cursor auto

package/lib/runtime/components/tenon/tenon-text.vue

@@ -55,7 +55,7 @@ export default {
   },
 };
 </script>
-<style lang="stylus">
+<style lang="stylus" scoped>
 .mpx-text
   user-select none
   &.selectable

package/lib/style-compiler/index.js

@@ -29,7 +29,7 @@ module.exports = function (css, map) {
 
   const transRpxRules = transRpxRulesRaw ? (Array.isArray(transRpxRulesRaw) ? transRpxRulesRaw : [transRpxRulesRaw]) : []
 
-  const transRpxFn = mpx.webConfig.transRpxFn
+  const transRpxFn = mpx.webConfig && mpx.webConfig.transRpxFn
   const testResolveRange = (include = () => true, exclude) => {
     return matchCondition(this.resourcePath, { include, exclude })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.114-alpha.3",
+  "version": "2.6.114-alpha.6",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -85,5 +85,5 @@
     "@types/babel-types": "^7.0.4",
     "webpack": "^4.46.0"
   },
-  "gitHead": "951dd877934ec6233bfb67452b790dc982317ccd"
+  "gitHead": "0009455df1bf8dfa2fa63cb7b2d044056337dd4a"
 }