@dcloudio/vue-cli-plugin-uni 2.0.2-3090820231124001 → 2.0.2-4000620240325001

package/lib/chain-webpack.js

@@ -31,17 +31,17 @@ module.exports = function chainWebpack (platformOptions, vueOptions, api) {
         }
         if (newOptions.fallback && newOptions.fallback.options) {
           const generator = {}
-          const oldOptions = newOptions.fallback.options
-          const keys = ['publicPath', 'outputPath']
-          keys.forEach(key => {
-            generator[key] = pathData => {
-              const outputPath = oldOptions[key](null, pathData.module.request)
-              const basename = path.basename(outputPath)
-              return outputPath.substring(0, outputPath.length - basename.length)
-            }
-          })
+          const options = newOptions.fallback.options
+          // const keys = ['publicPath', 'outputPath']
+          // keys.forEach(key => {
+          //   generator[key] = pathData => {
+          //     const outputPath = oldOptions[key](null, pathData.module.request)
+          //     const basename = path.basename(outputPath)
+          //     return outputPath.substring(0, outputPath.length - basename.length)
+          //   }
+          // })
           generator.filename = pathData => {
-            return path.basename(pathData.module.request)
+            return options.name(pathData.module.request)
           }
           webpackConfig.module.rule(staticType).set('generator', generator)
         }

package/lib/configure-webpack.js

@@ -1,4 +1,3 @@
-const fs = require('fs')
 const path = require('path')
 const webpack = require('webpack')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
@@ -14,10 +13,6 @@ function resolve (dir) {
   return path.resolve(__dirname, '..', dir)
 }
 
-function resolveModule (dir) {
-  return path.resolve(process.env.UNI_CLI_CONTEXT, './node_modules', dir)
-}
-
 module.exports = function configureWebpack (platformOptions, manifestPlatformOptions, vueOptions, api) {
   const {
     runByHBuilderX, // 使用 HBuilderX 运行
@@ -97,82 +92,30 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
     matchUse.push(loader)
   }
 
-  const userTsConfigJson = path.resolve(process.env.UNI_INPUT_DIR, 'tsconfig.json')
-  const defaultTsConfigJson = path.resolve(process.env.UNI_CLI_CONTEXT, 'tsconfig.json')
-
-  const tsConfigJsonFile = fs.existsSync(userTsConfigJson) ? userTsConfigJson : defaultTsConfigJson
-
-  const context = isInHBuilderX ? process.env.UNI_INPUT_DIR : process.env.UNI_CLI_CONTEXT
-
-  const tsLoaderOptions = {
-    context,
-    configFile: tsConfigJsonFile,
-    compilerOptions: {
-      baseUrl: context,
-      typeRoots: [
-        resolveModule('@dcloudio/types'),
-        resolveModule('@types'),
-        path.resolve(process.env.UNI_CLI_CONTEXT, 'types')
-      ],
-      types: [
-        'uni-app',
-        'uni-app-vue2',
-        'webpack-env'
-      ],
-      paths: {
-        '@/*': [
-          path.join(process.env.UNI_INPUT_DIR, '*')
-        ],
-        vue: [
-          resolveModule('vue')
-        ],
-        vuex: [
-          resolveModule('vuex')
-        ],
-        'vue-class-component': [
-          resolveModule('vue-class-component')
-        ],
-        'vue-property-decorator': [
-          resolveModule('vue-property-decorator')
-        ],
-        tslib: [
-          resolveModule('tslib')
-        ],
-        'mpvue-page-factory': [
-          resolveModule('@dcloudio/vue-cli-plugin-uni/packages/mpvue-page-factory')
-        ],
-        '@vue/composition-api': [
-          resolveModule('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api')
-        ],
-        '@dcloudio/uni-app': [
-          resolveModule('@dcloudio/uni-app')
-        ]
-      }
-    },
-    errorFormatter (error, colors) {
-      const messageColor = error.severity === 'warning' ? colors.bold.yellow : colors.bold.red
-      const filePath = path.relative(process.env.UNI_INPUT_DIR, error.file).replace('.vue.ts', '.vue')
-      if (error.code === 2307 && error.content.includes('.vue')) {
-        error.content = error.content.replace('Cannot find module ', '') +
-          ' script 节点必须使用 lang="ts",文档参考地址:https://uniapp.dcloud.io/frame?id=vue-ts'
-      }
-      return messageColor(
-        `[tsl] ERROR at ${filePath}:${error.line}
-  TS${error.code}:${error.content}`
-      )
-    }
-  }
+  const tsLoaderOptions = require('./util').getTsLoadOptions()
 
-  function updateTsLoader (rawRules, fakeFile, loader) {
+  function updateTsLoader (rawRules, fakeFile, loader, appendUTS = false) {
     const matchRule = rawRules.find(createMatcher(fakeFile))
     if (matchRule && matchRule.use) {
       if (isInHBuilderX) {
         matchRule.use.forEach(matchUse => {
           if (matchUse.loader.includes('ts-loader')) {
             Object.assign(matchUse.options, tsLoaderOptions)
+            if (appendUTS) {
+              if (!Array.isArray(matchUse.options.appendTsSuffixTo)) {
+                matchUse.options.appendTsSuffixTo = [matchUse.options.appendTsSuffixTo]
+              }
+              matchUse.options.appendTsSuffixTo.push(/\.uts$/)
+            }
           }
         })
       }
+      if (appendUTS) {
+        if (!Array.isArray(matchRule.test)) {
+          matchRule.test = [matchRule.test]
+        }
+        matchRule.test.push(/\.uts$/)
+      }
       matchRule.use.push(loader)
     }
   }
@@ -229,7 +172,7 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
     updateTsLoader(rawRules, 'foo.ts', {
       loader: resolve('packages/webpack-preprocess-loader'),
       options: jsPreprocessOptions
-    })
+    }, true)
     updateTsLoader(rawRules, 'foo.tsx', {
       loader: resolve('packages/webpack-preprocess-loader'),
       options: jsPreprocessOptions
@@ -261,7 +204,15 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
         .parseUniExtApis(false, process.env.UNI_UTS_PLATFORM, 'javascript')
       const keys = Object.keys(uniExtApis)
       if (keys.length) {
-        plugins.push(new webpack.ProvidePlugin(uniExtApis))
+        const provides = {}
+        keys.forEach(name => {
+          const provide = uniExtApis[name]
+          if (Array.isArray(provide) && provide.length === 3) {
+            provide.pop()
+          }
+          provides[name] = provide
+        })
+        plugins.push(new webpack.ProvidePlugin(provides))
       }
     }
     if (!process.env.UNI_SUBPACKGE || !process.env.UNI_MP_PLUGIN) {
@@ -449,4 +400,4 @@ module.exports = function configureWebpack (platformOptions, manifestPlatformOpt
       watchOptions: require('./util').getWatchOptions()
     }, platformWebpackConfig)
   }
-}
+}

package/lib/h5/index.js

@@ -194,4 +194,4 @@ module.exports = {
       require('./cssnano-options')(webpackConfig)
     }
   }
-}
+}

package/lib/util.js

@@ -1,4 +1,6 @@
+const fs = require('fs')
 const path = require('path')
+
 const {
   pathToGlob
 } = require('@dcloudio/uni-cli-shared/lib/util')
@@ -37,5 +39,79 @@ module.exports = {
         path.resolve(process.env.UNI_INPUT_DIR, 'cloudfunctions-tcb')
       ]
     }
+  },
+  getTsLoadOptions () {
+    const {
+      isInHBuilderX // 在 HBuilderX 的插件中
+    } = require('@dcloudio/uni-cli-shared')
+    const userTsConfigJson = path.resolve(process.env.UNI_INPUT_DIR, 'tsconfig.json')
+    const defaultTsConfigJson = path.resolve(process.env.UNI_CLI_CONTEXT, 'tsconfig.json')
+
+    const tsConfigJsonFile = fs.existsSync(userTsConfigJson) ? userTsConfigJson : defaultTsConfigJson
+
+    const context = isInHBuilderX ? process.env.UNI_INPUT_DIR : process.env.UNI_CLI_CONTEXT
+
+    function resolveModule (dir) {
+      return path.resolve(process.env.UNI_CLI_CONTEXT, './node_modules', dir)
+    }
+
+    return {
+      context,
+      configFile: tsConfigJsonFile,
+      compilerOptions: {
+        baseUrl: context,
+        typeRoots: [
+          resolveModule('@dcloudio/types'),
+          resolveModule('@types'),
+          path.resolve(process.env.UNI_CLI_CONTEXT, 'types')
+        ],
+        types: [
+          'uni-app',
+          'uni-app-vue2',
+          'webpack-env'
+        ],
+        paths: {
+          '@/*': [
+            path.join(process.env.UNI_INPUT_DIR, '*')
+          ],
+          vue: [
+            resolveModule('vue')
+          ],
+          vuex: [
+            resolveModule('vuex')
+          ],
+          'vue-class-component': [
+            resolveModule('vue-class-component')
+          ],
+          'vue-property-decorator': [
+            resolveModule('vue-property-decorator')
+          ],
+          tslib: [
+            resolveModule('tslib')
+          ],
+          'mpvue-page-factory': [
+            resolveModule('@dcloudio/vue-cli-plugin-uni/packages/mpvue-page-factory')
+          ],
+          '@vue/composition-api': [
+            resolveModule('@dcloudio/vue-cli-plugin-uni/packages/@vue/composition-api')
+          ],
+          '@dcloudio/uni-app': [
+            resolveModule('@dcloudio/uni-app')
+          ]
+        }
+      },
+      errorFormatter (error, colors) {
+        const messageColor = error.severity === 'warning' ? colors.bold.yellow : colors.bold.red
+        const filePath = path.relative(process.env.UNI_INPUT_DIR, error.file).replace('.vue.ts', '.vue')
+        if (error.code === 2307 && error.content.includes('.vue')) {
+          error.content = error.content.replace('Cannot find module ', '') +
+            ' script 节点必须使用 lang="ts",文档参考地址:https://uniapp.dcloud.io/frame?id=vue-ts'
+        }
+        return messageColor(
+          `[tsl] ERROR at ${filePath}:${error.line}
+    TS${error.code}:${error.content}`
+        )
+      }
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-uni",
-  "version": "2.0.2-3090820231124001",
+  "version": "2.0.2-4000620240325001",
   "description": "uni-app plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -17,7 +17,7 @@
   "author": "fxy060608",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dcloudio/uni-stat": "^2.0.2-3090820231124001",
+    "@dcloudio/uni-stat": "^2.0.2-4000620240325001",
     "buffer-json": "^2.0.0",
     "clone-deep": "^4.0.1",
     "cross-env": "^5.2.0",
@@ -41,5 +41,5 @@
     "copy-webpack-plugin": ">=5",
     "postcss": ">=7"
   },
-  "gitHead": "c32691147b539a337d6bca396ba42a6c3ddc1dbf"
+  "gitHead": "2f9ba8ff3e3f185745faa67dd4eefaef7f3db374"
 }