Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,16 @@ export default class WXAppPlugin {

async getEntryResource() {
const appJSONFile = resolve(this.base, 'app.json');
const { pages = [], subPackages = [], tabBar = {} } = await readJson(
const { pages = [], subPackages = [], tabBar = {}, usingComponents = {} } = await readJson(
appJSONFile
);

const components = new Set();

for (const relativeComponent of values(usingComponents)) {
await this.addComponent(components, relativeComponent, parse(appJSONFile).dir);
}

for (const page of pages) {
await this.getComponents(components, resolve(this.base, page));
}
Expand Down Expand Up @@ -282,12 +287,16 @@ export default class WXAppPlugin {
)) || {};
const componentBase = parse(instance).dir;
for (const relativeComponent of values(usingComponents)) {
if (relativeComponent.indexOf('plugin://') === 0) continue;
const component = resolve(componentBase, relativeComponent);
if (!components.has(component)) {
components.add(relative(this.base, component));
await this.getComponents(components, component);
}
await this.addComponent(components, relativeComponent, componentBase);
}
}

async addComponent(components, relativeComponent, componentBase) {
if (relativeComponent.indexOf('plugin://') === 0) return;
const component = resolve(componentBase, relativeComponent);
if (!components.has(component)) {
components.add(relative(this.base, component));
await this.getComponents(components, component);
}
}

Expand Down
3 changes: 3 additions & 0 deletions test/src/js/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,8 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "WeChat",
"navigationBarTextStyle":"black"
},
"usingComponents": {
"index-component": "./components/index-component/index-component"
}
}
3 changes: 0 additions & 3 deletions test/src/js/pages/index/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
{
"usingComponents": {
"index-component": "../../components/index-component/index-component"
}
}
1 change: 1 addition & 0 deletions test/src/js/pages/index/index.wxml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!--index.wxml-->
<view class="container">
<index-component/>
<view bindtap="bindViewTap" class="userinfo">
<image class="userinfo-avatar" src="{{userInfo.avatarUrl}}" background-size="cover"></image>
<text class="userinfo-nickname">{{userInfo.nickName}}</text>
Expand Down
6 changes: 1 addition & 5 deletions test/src/js/pages/product/productList.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
{
"usingComponents": {
"index-component": "../../components/index-component/index-component"
}
}

}