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

# Conflicts:
#	.eslintignore

.eslintignore

@@ -2,4 +2,4 @@ src/core/helpers/html-parser.js
 src/platforms/app-plus-nvue/runtime
 build/rollup-plugin-require-context
 packages/*/packages
-packages/uni-cli-shared/template
+packages/*/template/**/*

packages/vue-cli-plugin-uni/util/stringify.js

@@ -14,11 +14,14 @@ module.exports = function stringify (errors) {
             if (typeof result === 'string') {
               return result
             } else {
-              const file = path.relative(process.env.UNI_INPUT_DIR, err.module.resource).split('?')[0]
-              if (file === 'pages.json') {
-                result.line = 1
+              if (err.module.resource) {
+                const file = path.relative(process.env.UNI_INPUT_DIR, err.module.resource).split('?')[0]
+                if (file === 'pages.json') {
+                  result.line = 1
+                }
+                return `${result.message} at ${file}:${result.line || 1}`
               }
-              return `${result.message} at ${file}:${result.line || 1}`
+              return `${result.message}`
             }
           } else if (result === false) {
             return '' // skip
@@ -29,5 +32,5 @@ module.exports = function stringify (errors) {
     )
   )
     .filter(msg => !!msg)
-    .join('\n'))
+    .join('\n'))
 }