Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

make work loading from the app bundle (from app root with ~ prefix) #3

Merged
merged 2 commits into from
May 18, 2016
Merged

make work loading from the app bundle (from app root with ~ prefix) #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6cf63a
make work loading from the app bundle (from app root with ~ prefix)
naderio May 15, 2016
894bf79
fix loading platform specific files from withing plugins
naderio May 15, 2016
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
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ exports.getConfig = function getConfig(userDefined) {
}
if (!userDefined.resolve) {
userDefined.resolve = {
extensions: ["", ".js"],
extensions: ["", ".js", "." + platform + ".js"],
packageMains: ["main"],
};
}
Expand Down
26 changes: 25 additions & 1 deletion resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ exports.TnsResolver = {
resolvedFile = plugin.resolveNonCoreFileModule(moduleName);
} else if (plugin.isNonCoreDirModule(moduleName)) {
resolvedFile = plugin.resolveNonCoreDirModule(moduleName);
} else if (plugin.isAppFileModule(moduleName)) {
resolvedFile = plugin.resolveAppFileModule(moduleName);
} else if (plugin.isAppDirModule(moduleName)) {
resolvedFile = plugin.resolveAppDirModule(moduleName);
}

if (!resolvedFile) {
Expand Down Expand Up @@ -115,7 +119,7 @@ exports.TnsResolver = {
resolveNonCoreFileModule: function(moduleName) {
var nodeModulesPath = path.join("node_modules", moduleName);
try {
return plugin.resolveFileModule(nodeModulesPath);
return this.resolveFileModule(nodeModulesPath);
} catch (e) {
return null;
}
Expand All @@ -136,4 +140,24 @@ exports.TnsResolver = {
isNonCoreFileModule: function(moduleFile) {
return shelljs.test("-f", moduleFile);
},
isAppFileModule: function (moduleName) {
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
return shelljs.test("-f", modulePath + ".js") || shelljs.test("-f", this.getPlatformModule(platform, modulePath));
},
resolveAppFileModule: function (moduleName) {
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
try {
return this.resolveFileModule(modulePath);
} catch (e) {
return null;
}
},
isAppDirModule: function (moduleName) {
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
return shelljs.test("-d", modulePath);
},
resolveAppDirModule: function (moduleName) {
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
return this.getDirModule(modulePath);
},
};