Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(6_1_X) [TIMOB-24796] iOS: Hybrid CommonJS and Native modules don't handl… #9132

Merged
merged 4 commits into from Jun 15, 2017

Conversation

sgtcoolguy
Copy link
Contributor

JIRA: https://jira.appcelerator.org/browse/TIMOB-24796

Optional Description:
back port of #9131

@sgtcoolguy sgtcoolguy added this to the 6.1.1 milestone Jun 8, 2017
Copy link
Collaborator

@hansemannn hansemannn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR looks fine, let's go for it!

return [moduleAssets performSelector:@selector(resolveModuleAsset:) withObject:fromPath];
// Look up the file by it's original name. We preserve the filename in our Node-js based module build
NSData* data = [moduleAssets performSelector:@selector(resolveModuleAsset:) withObject:fromPath];
if (data != null) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use nil please

@mukherjee2 mukherjee2 self-requested a review June 15, 2017 18:25
Copy link
Contributor

@mukherjee2 mukherjee2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Passed FR! With this environment:
Node Version: 6.10.3
NPM Version: 3.10.10
Mac OS: 10.12.4
Appc CLI: 6.2.2
Appc CLI NPM: 4.2.9
Titanium SDK version: 6.1.1 pr/9132
Appcelerator Studio, build: 4.9.0.201705302345-39
Xcode 8.3.2

I followed the instructions in the ticket to build the module. The module was successfully built. Then I used the module in the demo app. App worked as expected, and no errors were seen.

@mukherjee2 mukherjee2 merged commit 1f6478c into tidev:6_1_X Jun 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants