Merge branch 'dev' of https://github.com/dcloudio/uni-app into v3

packages/uni-cli-shared/package.json

@@ -9,7 +9,8 @@
     "directory": "packages/uni-cli-shared"
   },
   "files": [
-    "lib"
+    "lib",
+    "template"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

packages/vue-cli-plugin-hbuilderx/build/webpack.nvue.conf.js

@@ -231,7 +231,9 @@ module.exports = function () {
     },
     resolveLoader: {
       alias: {
-        'babel-loader': require.resolve('babel-loader')
+        'babel-loader': require.resolve('babel-loader', {
+          paths: [require.resolve('@vue/cli-plugin-babel')]
+        })
       }
     },
     module: {