-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Conversation
All tests pass now. |
Woah. Looks like this upgrade actually finally fixes the problems we had with Ionic/Cordova apps (cc @MiguelCastillo - would be very kind of you if you could test that). That'd be awesome. |
Out of curiosity, can I know why they can't be dependencies in package.json? |
The two libraries have to be located in the extension's folder, thus they cannot be part of the root |
I just now updated this to feature the latest Acorn & Tern versions, where Tern now has ES6 support (#11644). cc @redmunds @nethip for review. Would like to get this in fast so it has a long testing phase on master. |
@marcelgerber - tern 0.15 is just released a few hours ago. I think that it will be worth doing that version since ES6 has been more thoroughly tested and bugs fixed. That should definitely improve things. Some things to keep in mind is that there is a new plugin called
|
Thanks @MiguelCastillo I'll try to look at the |
As this is a core change, Moving to next release as all external integrations happen at the beginning of the cycle. |
@abose what is the timeline for the 1.5 release? I'm just asking, since it's not clear to me, if this means we are holding off PR's for days, weeks or months. |
1.5 is due within the next 2 weeks and the move to release branch is by next week. |
That's great @abose! Then let's hold it off until then. |
4d7640e
to
1f89f7b
Compare
Updated once again to include the latest & greatest. |
@marcelgerber, accidentally tried more or less the same and hit the unfortunate change in
|
@busykai Where'd you suggest putting the commit SHA (we already have the version embedded in code)? |
@marcelgerber, I was thinking additionally a version tag/sha in the commit comment. So that you could see with |
Ah yes, that makes sense. |
@marcelgerber, understood. What about removing all the acorn junk? We don't need it there (provided we know where to take it from): since it's no longer a submodule, having it in I'll take a look at it functionally and run some tests this weekend. @MiguelCastillo also was going to get back to this. |
@marcelgerber @busykai Ok, I had to read the whole thing again. :) I'd really prefer using npm packages. It just makes our lives easier because we don't need to worry maintaining yet another repo. One thing that I think we can do as a separate PR is to move thirdparty deps into the package.json as way to manage dependency upgrades. And we can manage copying these modules from node_modules into thirdparty (or any other place) in our gruntfile.js, which we already do for a few other things. I can look into that separately. But for now, adding tern as a dependency and adding a config in the gruntfile.js to copy the needed files to the right place will be a more straight forward workflow for future upgrades. I see that there are concerns with setting up brackets for hacking. I am not too concerned about that because we will be checking in the dependencies into the thirdparty directory anyways. Upgrades will continue to be a manual process of running I am going to pull this down right now and take it out for test. |
@MiguelCastillo you should take a look at #12006 |
@ficristo Well thank you very much sir! |
travis builds on node 0.10 which doesn't have promise
6b7b4bb
to
f1ba730
Compare
Rebased, squashed & ready to review. |
Hm, there's a merge conflict in |
Resolved the conflict @marcelgerber |
Another failure: Use the global "use strict" for fix-acorn.js |
🤦 fixed |
If using node_modules or requirejs is too hard maybe we could go with browserify? |
a) introducing a new tool when you can fix the script with 6 lines of code doesn't appeal to me |
"version": "1.0.0", | ||
"from": "buffer-shims@>=1.0.0 <2.0.0", | ||
"resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz" | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this file supposed to have all these packages in there?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes - that's how shrinkwrap works, it's generated by npm shrinkwrap
command, I'd write more about it but it's easy to google
LGTM, just keen to know if |
LGTM +1 |
Thank you @zaggino for the work you have done these last few days to bring this up to par and make it mergeable! |
I've run the |
PR here #12732 |
Since Acorn's build process changed (there are no more prebuilt
dist
files in the repo, but in the npm package), I've switched from having it available as a submodule to just having the files in the file tree. Hope that's fine.The build is based on my fork https://github.com/MarcelGerber/acorn, where I removed a build step that doesn't quite work with Brackets.
Fixes #11568, and hopefully some others, too.
Commit logs:
Tern + Release notes
Acorn