[CLOSED] Requirejs as submodule (text.js & i18n.js as well)

[core-ai-bot]

Issue by TuckerWhitehouse
Tuesday Apr 30, 2013 at 23:15 GMT
Originally opened as adobe/brackets#3680

---

Include RequireJS as a submodule as well as text.js and i18n.js to keep in sync with the repos and make updates easier.

---

TuckerWhitehouse included the following code: https://github.com/adobe/brackets/pull/3680/commits

[core-ai-bot]

Comment by peterflynn
Friday May 10, 2013 at 01:08 GMT

---

@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.

[core-ai-bot]

Comment by peterflynn
Friday May 10, 2013 at 01:09 GMT

---

@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?

[core-ai-bot]

Comment by TuckerWhitehouse
Friday May 10, 2013 at 02:36 GMT

---

@peterflynn I reverted that change to brackets-concat.js (learned a lot about git and rebasing this evening...)
The SHA's are pointing to upgraded versions of each (whatever the latest was when I did the submodule add 9 days ago or so).

• RequireJS: v2.1.1 >> v2.1.5
• Text: v1.0.8 >> v2.0.5
• i18n: v1.0.0 >> v2.0.2

Edit: I added another commit, updating to the latest versions

• RequireJS: v2.1.5
• Text: v2.0.6

[core-ai-bot]

Comment by jasonsanjose
Friday May 10, 2013 at 23:11 GMT

---

@TuckerWhitehouse can you update your pull request? There's a merge conflict.

[core-ai-bot]

Comment by TuckerWhitehouse
Friday May 10, 2013 at 23:58 GMT

---

@jasonsanjose I think I fixed it (Conflict in NOTICE for some odd reason?)

[core-ai-bot]

Comment by jasonsanjose
Monday May 13, 2013 at 18:45 GMT

---

Looks like the latest errors from Travis are due to connectivity to GitHub and not any errors from running grunt.

[core-ai-bot]

Comment by redmunds
Monday May 13, 2013 at 20:40 GMT

---

Reviewing...

[core-ai-bot]

Comment by redmunds
Monday May 13, 2013 at 21:36 GMT

---

This looks good.@jasonsanjose Are you sure Travis is happy? :)

[core-ai-bot]

Comment by jasonsanjose
Monday May 13, 2013 at 21:44 GMT

---

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.

[core-ai-bot]

Comment by redmunds
Monday May 13, 2013 at 21:55 GMT

---

Merging.