Skip to content

Fix CommonJS relative require generation, and test it#1274

Merged
haberman merged 2 commits intoprotocolbuffers:masterfrom
murgatroid99:node_relative_requires
Feb 29, 2016
Merged

Fix CommonJS relative require generation, and test it#1274
haberman merged 2 commits intoprotocolbuffers:masterfrom
murgatroid99:node_relative_requires

Conversation

@murgatroid99
Copy link
Copy Markdown
Contributor

This makes proto files that require each other use the proper relative CommonJS require statements. It also adds a simple test with two proto files in different directories, with one importing the other.


message ImportedMessage {
string string_value = 1;
} No newline at end of file
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Add newline at eof.

@murgatroid99
Copy link
Copy Markdown
Contributor Author

All comments done.

@murgatroid99
Copy link
Copy Markdown
Contributor Author

ping

haberman added a commit that referenced this pull request Feb 29, 2016
Fix CommonJS relative require generation, and test it
@haberman haberman merged commit 52f62e3 into protocolbuffers:master Feb 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants