javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(builder): handle modules with "/" or "~/" (#7418)

Browse Source
This commit is contained in:
Alexander Vakrilov
2019-06-28 15:38:42 +03:00
committed by Manol Donev
parent 4437cd622b
commit 8851835cb1
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tns-core-modules/ui/builder/builder.ts
View File

@@ -57,20 +57,21 @@ export const createViewFromEntry = profile("createViewFromEntry", (entry: ViewEn
return view;
} else if (entry.moduleName) {
const resolvedCodeModuleName = resolveModuleName(entry.moduleName, ""); //`${moduleName}.xml`;
const moduleName = sanitizeModuleName(entry.moduleName);
const resolvedCodeModuleName = resolveModuleName(moduleName, ""); //`${moduleName}.xml`;
let moduleExports = resolvedCodeModuleName ? global.loadModule(resolvedCodeModuleName) : null;
if (moduleExports && moduleExports.createPage) {
// Exports has a createPage() method
const view = moduleExports.createPage();
const resolvedCssModuleName = resolveModuleName(entry.moduleName, "css"); //entry.moduleName + ".css";
const resolvedCssModuleName = resolveModuleName(moduleName, "css"); //entry.moduleName + ".css";
if (resolvedCssModuleName) {
view.addCssFile(resolvedCssModuleName);
}
return view;
} else {
const componentModule = loadInternal(entry.moduleName, moduleExports);
const componentModule = loadInternal(moduleName, moduleExports);
const componentView = componentModule && componentModule.component;
return componentView;