@mpxjs/webpack-plugin 2.9.70-alpha.0 → 2.9.71

package/LICENSE

@@ -0,0 +1,433 @@
+                              Apache License
+
+                        Version 2.0, January 2004
+
+                     http://www.apache.org/licenses/
+
+
+
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+
+
+
+1. Definitions.
+
+
+
+
+   "License" shall mean the terms and conditions for use, reproduction,
+
+   and distribution as defined by Sections 1 through 9 of this document.
+
+
+
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+
+   the copyright owner that is granting the License.
+
+
+
+
+   "Legal Entity" shall mean the union of the acting entity and all
+
+   other entities that control, are controlled by, or are under common
+
+   control with that entity. For the purposes of this definition,
+
+   "control" means (i) the power, direct or indirect, to cause the
+
+   direction or management of such entity, whether by contract or
+
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+
+
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+
+   exercising permissions granted by this License.
+
+
+
+
+   "Source" form shall mean the preferred form for making modifications,
+
+   including but not limited to software source code, documentation
+
+   source, and configuration files.
+
+
+
+
+   "Object" form shall mean any form resulting from mechanical
+
+   transformation or translation of a Source form, including but
+
+   not limited to compiled object code, generated documentation,
+
+   and conversions to other media types.
+
+
+
+
+   "Work" shall mean the work of authorship, whether in Source or
+
+   Object form, made available under the License, as indicated by a
+
+   copyright notice that is included in or attached to the work
+
+   (an example is provided in the Appendix below).
+
+
+
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+
+   form, that is based on (or derived from) the Work and for which the
+
+   editorial revisions, annotations, elaborations, or other modifications
+
+   represent, as a whole, an original work of authorship. For the purposes
+
+   of this License, Derivative Works shall not include works that remain
+
+   separable from, or merely link (or bind by name) to the interfaces of,
+
+   the Work and Derivative Works thereof.
+
+
+
+
+   "Contribution" shall mean any work of authorship, including
+
+   the original version of the Work and any modifications or additions
+
+   to that Work or Derivative Works thereof, that is intentionally
+
+   submitted to Licensor for inclusion in the Work by the copyright owner
+
+   or by an individual or Legal Entity authorized to submit on behalf of
+
+   the copyright owner. For the purposes of this definition, "submitted"
+
+   means any form of electronic, verbal, or written communication sent
+
+   to the Licensor or its representatives, including but not limited to
+
+   communication on electronic mailing lists, source code control systems,
+
+   and issue tracking systems that are managed by, or on behalf of, the
+
+   Licensor for the purpose of discussing and improving the Work, but
+
+   excluding communication that is conspicuously marked or otherwise
+
+   designated in writing by the copyright owner as "Not a Contribution."
+
+
+
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+
+   on behalf of whom a Contribution has been received by Licensor and
+
+   subsequently incorporated within the Work.
+
+
+
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   copyright license to reproduce, prepare Derivative Works of,
+
+   publicly display, publicly perform, sublicense, and distribute the
+
+   Work and such Derivative Works in Source or Object form.
+
+
+
+
+3. Grant of Patent License. Subject to the terms and conditions of
+
+   this License, each Contributor hereby grants to You a perpetual,
+
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+
+   (except as stated in this section) patent license to make, have made,
+
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+
+   where such license applies only to those patent claims licensable
+
+   by such Contributor that are necessarily infringed by their
+
+   Contribution(s) alone or by combination of their Contribution(s)
+
+   with the Work to which such Contribution(s) was submitted. If You
+
+   institute patent litigation against any entity (including a
+
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+
+   or a Contribution incorporated within the Work constitutes direct
+
+   or contributory patent infringement, then any patent licenses
+
+   granted to You under this License for that Work shall terminate
+
+   as of the date such litigation is filed.
+
+
+
+
+4. Redistribution. You may reproduce and distribute copies of the
+
+   Work or Derivative Works thereof in any medium, with or without
+
+   modifications, and in Source or Object form, provided that You
+
+   meet the following conditions:
+
+
+
+
+   (a) You must give any other recipients of the Work or
+
+       Derivative Works a copy of this License; and
+
+
+
+
+   (b) You must cause any modified files to carry prominent notices
+
+       stating that You changed the files; and
+
+
+
+
+   (c) You must retain, in the Source form of any Derivative Works
+
+       that You distribute, all copyright, patent, trademark, and
+
+       attribution notices from the Source form of the Work,
+
+       excluding those notices that do not pertain to any part of
+
+       the Derivative Works; and
+
+
+
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+
+       distribution, then any Derivative Works that You distribute must
+
+       include a readable copy of the attribution notices contained
+
+       within such NOTICE file, excluding those notices that do not
+
+       pertain to any part of the Derivative Works, in at least one
+
+       of the following places: within a NOTICE text file distributed
+
+       as part of the Derivative Works; within the Source form or
+
+       documentation, if provided along with the Derivative Works; or,
+
+       within a display generated by the Derivative Works, if and
+
+       wherever such third-party notices normally appear. The contents
+
+       of the NOTICE file are for informational purposes only and
+
+       do not modify the License. You may add Your own attribution
+
+       notices within Derivative Works that You distribute, alongside
+
+       or as an addendum to the NOTICE text from the Work, provided
+
+       that such additional attribution notices cannot be construed
+
+       as modifying the License.
+
+
+
+
+   You may add Your own copyright statement to Your modifications and
+
+   may provide additional or different license terms and conditions
+
+   for use, reproduction, or distribution of Your modifications, or
+
+   for any such Derivative Works as a whole, provided Your use,
+
+   reproduction, and distribution of the Work otherwise complies with
+
+   the conditions stated in this License.
+
+
+
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+
+   any Contribution intentionally submitted for inclusion in the Work
+
+   by You to the Licensor shall be under the terms and conditions of
+
+   this License, without any additional terms or conditions.
+
+   Notwithstanding the above, nothing herein shall supersede or modify
+
+   the terms of any separate license agreement you may have executed
+
+   with Licensor regarding such Contributions.
+
+
+
+
+6. Trademarks. This License does not grant permission to use the trade
+
+   names, trademarks, service marks, or product names of the Licensor,
+
+   except as required for reasonable and customary use in describing the
+
+   origin of the Work and reproducing the content of the NOTICE file.
+
+
+
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+
+   agreed to in writing, Licensor provides the Work (and each
+
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+
+   implied, including, without limitation, any warranties or conditions
+
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+
+   appropriateness of using or redistributing the Work and assume any
+
+   risks associated with Your exercise of permissions under this License.
+
+
+
+
+8. Limitation of Liability. In no event and under no legal theory,
+
+   whether in tort (including negligence), contract, or otherwise,
+
+   unless required by applicable law (such as deliberate and grossly
+
+   negligent acts) or agreed to in writing, shall any Contributor be
+
+   liable to You for damages, including any direct, indirect, special,
+
+   incidental, or consequential damages of any character arising as a
+
+   result of this License or out of the use or inability to use the
+
+   Work (including but not limited to damages for loss of goodwill,
+
+   work stoppage, computer failure or malfunction, or any and all
+
+   other commercial damages or losses), even if such Contributor
+
+   has been advised of the possibility of such damages.
+
+
+
+
+9. Accepting Warranty or Additional Liability. While redistributing
+
+   the Work or Derivative Works thereof, You may choose to offer,
+
+   and charge a fee for, acceptance of support, warranty, indemnity,
+
+   or other liability obligations and/or rights consistent with this
+
+   License. However, in accepting such obligations, You may act only
+
+   on Your own behalf and on Your sole responsibility, not on behalf
+
+   of any other Contributor, and only if You agree to indemnify,
+
+   defend, and hold each Contributor harmless for any liability
+
+   incurred by, or claims asserted against, such Contributor by reason
+
+   of your accepting any such warranty or additional liability.
+
+
+
+
+END OF TERMS AND CONDITIONS
+
+
+
+
+APPENDIX: How to apply the Apache License to your work.
+
+
+
+
+   To apply the Apache License to your work, attach the following
+
+   boilerplate notice, with the fields enclosed by brackets "{}"
+
+   replaced with your own identifying information. (Don't include
+
+   the brackets!)  The text should be enclosed in the appropriate
+
+   comment syntax for the file format. We also recommend that a
+
+   file or class name and description of purpose be included on the
+
+   same "printed page" as the copyright notice for easier
+
+   identification within third-party archives.
+
+
+
+
+Copyright (C) 2017 Beijing Didi Infinity Technology and Development Co.,Ltd. All rights reserved.
+
+
+
+
+Licensed under the Apache License, Version 2.0 (the "License");
+
+you may not use this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+
+
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+
+
+
+Unless required by applicable law or agreed to in writing, software
+
+distributed under the License is distributed on an "AS IS" BASIS,
+
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and
+
+limitations under the License.

package/README.md

@@ -13,6 +13,6 @@ module.exports = {
     new mpxWebpackPlugin({
       mode: 'wx'
     })
-  ]
+  ],
 }
 ```

package/lib/config.js

@@ -368,20 +368,6 @@ module.exports = {
       templatePrefix: 'module.exports = \n'
     }
   },
-  tenon: {
-    directive: {
-      if: 'v-if',
-      elseif: 'v-else-if',
-      else: 'v-else'
-    },
-    wxs: {
-      tag: 'wxs',
-      module: 'module',
-      src: 'src',
-      ext: '.wxs',
-      templatePrefix: 'module.exports = \n'
-    }
-  },
   qa: {
     typeExtMap: {
       json: '.json',

package/lib/dependencies/ResolveDependency.js

@@ -76,11 +76,6 @@ ResolveDependency.Template = class ResolveDependencyTemplate {
 
   getContent (dep) {
     const { resolved = '' } = dep
-    // for tenon
-    if (dep.compilation.__mpx__.mode === 'tenon') {
-      // 只支持所有产物在一个目录下的场景 进行相对路径跳转
-      return `'./${resolved}.js'`
-    }
     // ?resolve 必定返回绝对路径
     return JSON.stringify('/' + resolved)
   }

package/lib/index.js

@@ -66,7 +66,7 @@ const emitFile = require('./utils/emit-file')
 const { MPX_PROCESSED_FLAG, MPX_DISABLE_EXTRACTOR_CACHE, MPX_APP_MODULE_ID } = require('./utils/const')
 const isEmptyObject = require('./utils/is-empty-object')
 const DynamicPlugin = require('./resolver/DynamicPlugin')
-const { isReact, isWeb, isTenon } = require('./utils/env')
+const { isReact, isWeb } = require('./utils/env')
 const VirtualModulesPlugin = require('webpack-virtual-modules')
 require('./utils/check-core-version-match')
 
@@ -323,7 +323,7 @@ class MpxWebpackPlugin {
       }
     }
 
-    if (!isWeb(this.options.mode) && !isReact(this.options.mode) && !isTenon(this.options.mode)) {
+    if (!isWeb(this.options.mode) && !isReact(this.options.mode)) {
       // 强制设置publicPath为'/'
       if (compiler.options.output.publicPath && compiler.options.output.publicPath !== publicPath) {
         warnings.push(`webpack options: MpxWebpackPlugin accept options.output.publicPath to be ${publicPath} only, custom options.output.publicPath will be ignored!`)
@@ -381,7 +381,7 @@ class MpxWebpackPlugin {
     compiler.options.resolve.plugins.push(dynamicPlugin)
 
     const optimization = compiler.options.optimization
-    if (!isWeb(this.options.mode) && !isReact(this.options.mode) && !isTenon(this.options.mode)) {
+    if (!isWeb(this.options.mode) && !isReact(this.options.mode)) {
       optimization.runtimeChunk = {
         name: (entrypoint) => {
           for (const packageName in mpx.independentSubpackagesMap) {
@@ -397,7 +397,7 @@ class MpxWebpackPlugin {
     let splitChunksOptions = null
     let splitChunksPlugin = null
     // 输出web ssr需要将optimization.splitChunks设置为false以关闭splitChunks
-    if (optimization.splitChunks !== false && !isReact(this.options.mode) && !isTenon(this.options.mode)) {
+    if (optimization.splitChunks !== false && !isReact(this.options.mode)) {
       splitChunksOptions = Object.assign({
         chunks: 'all',
         usedExports: optimization.usedExports === true,
@@ -1482,27 +1482,6 @@ class MpxWebpackPlugin {
           }
         })
 
-        // processing for tenon-store
-        if (mpx.mode === 'tenon') {
-          let TENON_STORE_ID = 0
-          parser.hooks.call.for('imported var').tap('MpxWebpackPlugin', (expr) => {
-            if (['createStore', 'createStoreWithThis'].includes(expr.callee.name)) {
-              const current = parser.state.current
-              const storeOptions = expr.arguments.length && expr.arguments[0]
-              if (storeOptions) {
-                current.addDependency(new InjectDependency({
-                  content: 'Object.assign(',
-                  index: storeOptions.range[0]
-                }))
-                current.addDependency(new InjectDependency({
-                  content: `, { __store_id: ${TENON_STORE_ID++} })`,
-                  index: storeOptions.range[1]
-                }))
-              }
-            }
-          })
-        }
-
         parser.hooks.evaluate.for('NewExpression').tap('MpxWebpackPlugin', (expression) => {
           if (/@intlify\/core-base/.test(parser.state.module.resource)) {
             if (expression.callee.name === 'Function') {
@@ -1618,7 +1597,7 @@ class MpxWebpackPlugin {
         name: 'MpxWebpackPlugin',
         stage: compilation.PROCESS_ASSETS_STAGE_ADDITIONS
       }, () => {
-        if (isWeb(mpx.mode) || isReact(mpx.mode) || isTenon(mpx.mode)) return
+        if (isWeb(mpx.mode) || isReact(mpx.mode)) return
 
         if (this.options.generateBuildMap) {
           const pagesMap = compilation.__mpx__.pagesMap
@@ -1859,31 +1838,21 @@ try {
         // mpxStyleOptions 为 mpx style 文件的标识，避免 Vue 文件插入 styleCompiler 后导致 vue scoped 样式隔离失效
         if (isWeb(mpx.mode) && queryObj.mpxStyleOptions) {
           const firstLoader = loaders[0] ? toPosix(loaders[0].loader) : ''
-          const isPitcherRequest = firstLoader.includes('node_modules/vue-loader/lib/loaders/pitcher') || firstLoader.includes('node_modules/@hummer/tenon-loader/dist/pitcher.js')
+          const isPitcherRequest = firstLoader.includes('node_modules/vue-loader/lib/loaders/pitcher')
           let cssLoaderIndex = -1
           let vueStyleLoaderIndex = -1
           let mpxStyleLoaderIndex = -1
-          let tenonStyleLoaderIndex = -1
           loaders.forEach((loader, index) => {
             const currentLoader = toPosix(loader.loader)
             if (currentLoader.includes('node_modules/css-loader') && cssLoaderIndex === -1) {
               cssLoaderIndex = index
             } else if (currentLoader.includes('node_modules/vue-loader/lib/loaders/stylePostLoader') && vueStyleLoaderIndex === -1) {
               vueStyleLoaderIndex = index
-            } else if (currentLoader.includes('@hummer/tenon-style-loader/dist/index.js') && tenonStyleLoaderIndex === -1) {
-              tenonStyleLoaderIndex = index
             } else if (currentLoader.includes(styleCompilerPath) && mpxStyleLoaderIndex === -1) {
               mpxStyleLoaderIndex = index
             }
           })
-          if (mpx.mode === 'tenon' && mpxStyleLoaderIndex === -1) {
-            if (tenonStyleLoaderIndex > -1 && !isPitcherRequest) {
-              loaders.splice(tenonStyleLoaderIndex + 1, 0, {
-                loader: normalize.lib('style-compiler/index.js'),
-                options: (mpxStyleOptions && JSON.parse(mpxStyleOptions)) || {}
-              })
-            }
-          } else if (mpxStyleLoaderIndex === -1) {
+          if (mpxStyleLoaderIndex === -1) {
             let loaderIndex = -1
             if (cssLoaderIndex > -1 && vueStyleLoaderIndex === -1) {
               loaderIndex = cssLoaderIndex

package/lib/json-compiler/helper.js

@@ -7,7 +7,7 @@ const addQuery = require('../utils/add-query')
 const loaderUtils = require('loader-utils')
 const resolve = require('../utils/resolve')
 const { matchCondition } = require('../utils/match-condition')
-const { isWeb, isReact, isTenon } = require('../utils/env')
+const { isWeb, isReact } = require('../utils/env')
 
 module.exports = function createJSONHelper ({ loaderContext, emitWarning, customGetDynamicEntry }) {
   const mpx = loaderContext.getMpx()
@@ -76,7 +76,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
       const resourceName = path.join(parsed.dir, parsed.name)
 
       if (!outputPath) {
-        if (isScript(ext) && resourceName.includes('node_modules') && !isWeb(mode) && !isTenon(mode) && !isReact(mode)) {
+        if (isScript(ext) && resourceName.includes('node_modules') && !isWeb(mode) && !isReact(mode)) {
           let root = info.descriptionFileRoot
           let name = 'nativeComponent'
           if (info.descriptionFileData) {
@@ -139,7 +139,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
           outputPath = /^(.*?)(\.[^.]*)?$/.exec(relative)[1]
         }
       }
-      if (isScript(ext) && !isWeb(mode) && !isTenon(mode) && !isReact(mode)) {
+      if (isScript(ext) && !isWeb(mode) && !isReact(mode)) {
         resource = `!!${nativeLoaderPath}!${resource}`
       }
       const entry = getDynamicEntry(resource, 'page', outputPath, tarRoot, publicPath + tarRoot)

package/lib/loader.js

@@ -4,8 +4,6 @@ const parseRequest = require('./utils/parse-request')
 const { matchCondition } = require('./utils/match-condition')
 const addQuery = require('./utils/add-query')
 const async = require('async')
-const processForTenon = require('./tenon/index')
-const getJSONContent = require('./utils/get-json-content')
 const normalize = require('./utils/normalize')
 const getEntryName = require('./utils/get-entry-name')
 const AppEntryDependency = require('./dependencies/AppEntryDependency')
@@ -19,11 +17,6 @@ const path = require('path')
 const processWeb = require('./web')
 const processReact = require('./react')
 const genMpxCustomElement = require('./runtime-render/gen-mpx-custom-element')
-const loaderUtils = require('loader-utils')
-
-function stringifyRequest (loaderContext, request) {
-  return loaderUtils.stringifyRequest(loaderContext, request)
-}
 
 module.exports = function (content) {
   this.cacheable()
@@ -135,52 +128,6 @@ module.exports = function (content) {
       const hasComment = templateAttrs && templateAttrs.comments
       const isNative = false
 
-
-      if (mode === 'tenon') {
-        let output = ''
-        if (ctorType === 'app' && !queryObj.app) {
-          const request = addQuery(this.resource, { app: true })
-          output += `
-      import App from ${stringifyRequest(loaderContext, request)}
-      import * as Tenon from '@hummer/tenon-vue'
-
-      Tenon.render(App)\n`
-          // 直接结束loader进入parse
-          this.loaderIndex = -1
-          return callback(null, output)
-        }
-        if (ctorType === 'page' && queryObj.tenon) {
-          console.log(resourcePath)
-          const request = addQuery(resourcePath, { page: true })
-          output += `
-      import page from ${stringifyRequest(loaderContext, request)}
-      import * as Tenon from '@hummer/tenon-vue'
-
-      Tenon.render(page)\n`
-          this.loaderIndex = -1
-          return callback(null, output)
-        }
-        return processForTenon({
-          parts,
-          jsonContent,
-          loaderContext,
-          pagesMap,
-          componentsMap,
-          queryObj,
-          ctorType,
-          srcMode,
-          moduleId,
-          isProduction,
-          hasScoped,
-          hasComment,
-          isNative,
-          usingComponentsInfo: JSON.stringify(usingComponentsInfo),
-          componentGenerics,
-          autoScope,
-          callback
-        })
-      }
-
       // 处理mode为web时输出vue格式文件
       if (mode === 'web') {
         return processWeb({

package/lib/parser.js

@@ -14,7 +14,7 @@ module.exports = (content, { filePath, needMap, mode, env }) => {
   output = compiler.parseComponent(content, {
     mode,
     filePath,
-    pad: 'line',
+    // pad: 'line', // stylus编译遇到大量空行时会出现栈溢出，故注释掉
     env
   })
   if (needMap) {