Merge branch 'dev' into alpha

packages/vue-cli-plugin-hbuilderx/module-alias.js

@@ -17,6 +17,8 @@ moduleAlias.addAlias('@vue/component-compiler-utils/package.json', require.resol
   '@dcloudio/vue-cli-plugin-uni/packages/@vue/component-compiler-utils/package.json'))
 
 if (isInHBuilderX) {
+  moduleAlias.addAlias('typescript', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
+    'compile-typescript/node_modules/typescript'))
   moduleAlias.addAlias('less', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,
     'compile-less/node_modules/less'))
   moduleAlias.addAlias('node-sass', path.resolve(process.env.UNI_HBUILDERX_PLUGINS,

packages/vue-cli-plugin-uni/lib/chain-webpack.js

@@ -8,11 +8,11 @@ const {
   getPartialIdentifier
 } = require('./util')
 
-function resolve(dir) {
+function resolve (dir) {
   return path.resolve(__dirname, '..', dir)
 }
 
-module.exports = function chainWebpack(platformOptions, vueOptions, api) {
+module.exports = function chainWebpack (platformOptions, vueOptions, api) {
   const {
     runByHBuilderX, // 使用 HBuilderX 运行
     cssPreprocessOptions
@@ -154,8 +154,8 @@ module.exports = function chainWebpack(platformOptions, vueOptions, api) {
       .delete('@')
       .set(
         '@/pages.json',
-        path.resolve(process.env.UNI_INPUT_DIR, 'pages.json')
-        + '?' + JSON.stringify({
+        path.resolve(process.env.UNI_INPUT_DIR, 'pages.json') +
+        '?' + JSON.stringify({
           type: 'origin-pages-json'
         })
       )

packages/vue-cli-plugin-uni/lib/mp/index.js

@@ -189,7 +189,9 @@ module.exports = {
           ? process.env.UNI_MP_PLUGIN_MAIN
           : JSON.parse(process.env.UNI_MP_PLUGIN_EXPORT)
       ).forEach(fileName => addToUniEntry(fileName))
-      beforeCode += `${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
+      beforeCode += `
+// @ts-ignore
+${globalEnv}.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;`
     }
 
     const alias = { // 仅 mp-weixin
@@ -218,8 +220,7 @@ module.exports = {
       output.pathinfo = false
     }
     return {
-      mode: process.env.NODE_ENV === 'production' ? 'production'
-        : 'development',
+      mode: process.env.NODE_ENV === 'production' ? 'production' : 'development',
       entry () {
         return process.UNI_ENTRY
       },