Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 421862b

Browse files
committed
Merge pull request #3 from naderio/master
make work loading from the app bundle (from app root with ~ prefix)
2 parents 8f8e767 + 894bf79 commit 421862b

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

‎index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ exports.getConfig = function getConfig(userDefined) {
7474
}
7575
if (!userDefined.resolve) {
7676
userDefined.resolve = {
77-
extensions: ["", ".js"],
77+
extensions: ["", ".js","."+platform+".js"],
7878
packageMains: ["main"],
7979
};
8080
}

‎resolver.js‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ exports.TnsResolver = {
5151
resolvedFile = plugin.resolveNonCoreFileModule(moduleName);
5252
} else if (plugin.isNonCoreDirModule(moduleName)) {
5353
resolvedFile = plugin.resolveNonCoreDirModule(moduleName);
54+
} else if (plugin.isAppFileModule(moduleName)) {
55+
resolvedFile = plugin.resolveAppFileModule(moduleName);
56+
} else if (plugin.isAppDirModule(moduleName)) {
57+
resolvedFile = plugin.resolveAppDirModule(moduleName);
5458
}
5559

5660
if (!resolvedFile) {
@@ -115,7 +119,7 @@ exports.TnsResolver = {
115119
resolveNonCoreFileModule: function(moduleName) {
116120
var nodeModulesPath = path.join("node_modules", moduleName);
117121
try {
118-
return plugin.resolveFileModule(nodeModulesPath);
122+
return this.resolveFileModule(nodeModulesPath);
119123
} catch (e) {
120124
return null;
121125
}
@@ -136,4 +140,24 @@ exports.TnsResolver = {
136140
isNonCoreFileModule: function(moduleFile) {
137141
return shelljs.test("-f", moduleFile);
138142
},
143+
isAppFileModule: function (moduleName) {
144+
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
145+
return shelljs.test("-f", modulePath + ".js") || shelljs.test("-f", this.getPlatformModule(platform, modulePath));
146+
},
147+
resolveAppFileModule: function (moduleName) {
148+
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
149+
try {
150+
return this.resolveFileModule(modulePath);
151+
} catch (e) {
152+
return null;
153+
}
154+
},
155+
isAppDirModule: function (moduleName) {
156+
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
157+
return shelljs.test("-d", modulePath);
158+
},
159+
resolveAppDirModule: function (moduleName) {
160+
var modulePath = path.resolve(__dirname, "..", "..", "app", moduleName.replace(/^~/, "."));
161+
return this.getDirModule(modulePath);
162+
},
139163
};

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /