Requirejs as submodule (text.js & i18n.js as well) #3680
Conversation
| "text" : "../../../thirdparty/text", | ||
| "i18n" : "../../../thirdparty/i18n" | ||
| "text" : "../../../thirdparty/text/text", | ||
| "i18n" : "../../../thirdparty/i18n/i18n" |
There was a problem hiding this comment.
@jasonsanjose, should this file not be modified in this situation either?
There was a problem hiding this comment.
No. It never should be modified. This files is never run. It is just used to test how brackets behave with heavy files from a performance perspective.
There was a problem hiding this comment.
Understood, thank you.
|
@redmunds do you have cycles to review this one? Feel free to reassign if not. Glenn and I couldn't think of any good reason why we didn't make this a submodule originally, so it seems ok to merge assuming the code changes look good. |
|
@TuckerWhitehouse there are still some whitespace diffs in brackets-concat.js -- can you try to back those out? Also -- are the SHAs pointing to the same versions of Require, text, and i18n that we had before? Or is this upgrading us to the latest versions? |
ghost
assigned 
|
@peterflynn I reverted that change to brackets-concat.js (learned a lot about git and rebasing this evening...)
Edit: I added another commit, updating to the latest versions
|
|
@TuckerWhitehouse can you update your pull request? There's a merge conflict. |
|
@jasonsanjose I think I fixed it (Conflict in NOTICE for some odd reason?) |
|
Looks like the latest errors from Travis are due to connectivity to GitHub and not any errors from running |
|
Reviewing... |
|
This looks good. @jasonsanjose Are you sure Travis is happy? :) |
|
Actually, I was able to kick off a new build...I think this is a new Travis feature. Under the settings icon, "Restart Build". Travis is happy now. |
|
Merging. |
Requirejs as submodule (text.js & i18n.js as well)
Include RequireJS as a submodule as well as text.js and i18n.js to keep in sync with the repos and make updates easier.