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

packages/uni-cli-shared/lib/file-loader.js

@@ -7,6 +7,7 @@ const {
 
 let inputDir
 
+const uniModulesStaticRe = /uni_modules\/[^/]+\/static\//
 module.exports = {
   loader: 'file-loader',
   options: {
@@ -20,7 +21,8 @@ module.exports = {
           resourcePath))
         const subPackageStatic = Object.keys(process.UNI_SUBPACKAGES || {}).map(root => normalizePath(path.join(root,
           'static')) + '/')
-        if (relativePath.startsWith('static/') || subPackageStatic.some(s => relativePath.startsWith(s))) {
+        if (relativePath.startsWith('static/') || uniModulesStaticRe.test(relativePath) ||
+          subPackageStatic.some(s => relativePath.startsWith(s))) {
           return relativePath
         }
       }