Merge pull request #166 from didi/0.4.x-dev-yyl

0.4.x dev yyl

packages/chameleon-loader/src/cml-compile/json-handle.js

@@ -13,8 +13,11 @@ module.exports = function(loaderContext, jsonObject, cmlType, componentDeps) {
         componentDeps.push(filePath);
         components[key] = refUrl;
       } else {
-        delete components[key];
-        cmlUtils.log.error(`can't find component:${refUrl} in ${loaderContext.resourcePath}`);
+        // plugin开头的小程序插件不做处理
+        if (components[key].indexOf('plugin://') !== 0) {
+          delete components[key];
+          cmlUtils.log.error(`can't find component:${refUrl} in ${loaderContext.resourcePath}`);
+        }
       }
     })
   }

packages/chameleon-templates/project/src/app/app.cml

 <template>
-  <app></app>
+  <app router-config="{{routerConfig}}"></app>
 </template>
 
 <script>
+import routerConfig from '../router.config.json';
 
 class App {
-  data = {}
+  data = {
+    routerConfig
+  }
   created(res) {
   }
 }

packages/chameleon-templates/todo-demo/src/app/app.cml

 <template>
-  <app></app>
+  <app router-config="{{routerConfig}}"></app>
 </template>
 
 <script>
+import routerConfig from '../router.config.json';
+
 class App {
-  data = {}
+  data = {
+    routerConfig
+  }
   created(res) {
   }
 }

packages/mvvm-cml-loader/index.js

@@ -108,8 +108,10 @@ module.exports = function(source) {
         import ${helper.toUpperCase(key)} from "${cmlUtils.handleRelativePath(self.resourcePath, filePath)}"\n`;
 
     } else {
-      delete coms[key];
-      cmlUtils.log.error(`can't find component:${coms[key]} in ${self.resourcePath}`);
+      if (coms[key].indexOf('plugin://') !== 0) {
+        delete coms[key];
+        cmlUtils.log.error(`can't find component:${coms[key]} in ${self.resourcePath}`);
+      }
     }
   })