Merge pull request #5 from nkCoding/master

Add `usingComponents` support

Author: Cap32

.eslintrc

@@ -60,6 +60,7 @@
         "__DEV__": true,
         "App": true,
         "Page": true,
+        "Component": true,
         "wx": true,
         "getApp": true,
     },

src/index.js

@@ -4,7 +4,7 @@ import { resolve, dirname, relative, join, parse } from 'path';
 import { optimize, LoaderTargetPlugin, JsonpTemplatePlugin } from 'webpack';
 import { ConcatSource } from 'webpack-sources';
 import globby from 'globby';
-import { defaults } from 'lodash';
+import { defaults, values } from 'lodash';
 import MultiEntryPlugin from 'webpack/lib/MultiEntryPlugin';
 import SingleEntryPlugin from 'webpack/lib/SingleEntryPlugin';
 import FunctionModulePlugin from 'webpack/lib/FunctionModulePlugin';
@@ -143,7 +143,26 @@ export default class WXAppPlugin {
 	async getEntryResource() {
 		const appJSONFile = resolve(this.base, 'app.json');
 		const { pages = [] } = await readJson(appJSONFile);
-		return ['app'].concat(pages);
+		const components = new Set();
+		for (const page of pages) {
+			await this.getComponents(components, resolve(this.base, page));
+		}
+		return ['app', ...pages, ...components];
+	}
+
+	async getComponents(components, instance) {
+		const { usingComponents = {} } =
+			await readJson(`${instance}.json`).catch(
+				err => err && err.code !== 'ENOENT' && console.error(err)
+			) || {};
+		const componentBase = parse(instance).dir;
+		for (const relativeComponent of values(usingComponents)) {
+			const component = resolve(componentBase, relativeComponent);
+			if (!components.has(component)) {
+				components.add(relative(this.base, component));
+				await this.getComponents(components, component);
+			}
+		}
 	}
 
 	getFullScriptPath(path) {

test/src/components/common-component/common-component.js

@@ -0,0 +1 @@
+Component({})

test/src/components/common-component/common-component.json

@@ -0,0 +1,3 @@
+{
+  "component": true
+}

test/src/components/common-component/common-component.wxml

@@ -0,0 +1 @@
+<view class="common-text">Common Component loaded.</view>

test/src/components/common-component/common-component.wxss

@@ -0,0 +1,3 @@
+.common-text {
+  color: grey;
+}

test/src/components/index-component/index-component.js

@@ -0,0 +1 @@
+Component({})

test/src/components/index-component/index-component.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "common-component": "../common-component/common-component"
+  }
+}

test/src/components/index-component/index-component.wxml

@@ -0,0 +1,4 @@
+<view>
+  <view>'Index Component loaded.'</view>
+  <common-component></common-component>
+</view>

test/src/components/log-component/log-component.js

@@ -0,0 +1 @@
+Component({})