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

update ace to v1.2.9; fix ts build; #93

Merged
merged 2 commits into from
Oct 30, 2017
Merged

Conversation

filipsch
Copy link
Collaborator

  • update aceTag to v1.2.8
  • updated build/update-ts.js to follow new structure of DefinitivelyTyped repo.

@thlorenz
Copy link
Owner

thlorenz commented Jul 20, 2017

Thanks @filipsch.
Could I get some more collaborators to review this? On quick skim LGTM.

Copy link
Collaborator

@gokmen gokmen left a comment

Choose a reason for hiding this comment

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

it LGTM in general. It's not related with this PR but there is a minor that I commented on.

ext/searchbox.js Outdated
this.editor = editor;
};

this.setSession = function(e) {
debugger
Copy link
Collaborator

@gokmen gokmen Jul 20, 2017

Choose a reason for hiding this comment

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

that seems weird, it's introduced with https://github.com/ajaxorg/ace/pull/3329/files#diff-2b1fc8367171d51dd3148748a50accb2R88 on Ace repo 23 days ago. maybe we should let them know first fix there and merge after the change.

Copy link
Collaborator

Choose a reason for hiding this comment

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

created a PR for that ajaxorg/ace#3358 fyi.

Copy link
Owner

Choose a reason for hiding this comment

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

OK let's wait for that to go through and then run the upgrade again.
Don't want to pull anything in that introduces an obvious bug from the upstream code base.

Copy link
Collaborator

Choose a reason for hiding this comment

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

it's merged on upstream, if @filipsch can update the code we are good to go I believe 👍

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I guess I'll have to wait for ajaxorg to make a new release of ace, right?

Copy link
Owner

Choose a reason for hiding this comment

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

Yeah better since we don't want to depend on an unreleased version.

Feasul pushed a commit to Feasul/brace that referenced this pull request Aug 18, 2017
…hub.com/sevin7676/Ace.Tern/tree/master/ace-builds/src-noconflict to be available for brace "build/update" proces

- hack update script to include ext-tern.js and worker-tern.js to the build
- include update script fix from thlorenz#93
@pankitgami
Copy link

pankitgami commented Aug 22, 2017

When will you merge this request? As ace is on 1.2.8 and this package is on 1.2.6. And there are lots of changes between both the release in terms of worker, theme, mode etc.

@filipsch
Copy link
Collaborator Author

filipsch commented Aug 22, 2017

@gokmen noticed that the people from ace merged in a bug (a debugger call) and this bug is in 1.2.8 of ace. A fix of this has been merged, but we're still waiting for the people of ace to bump their version, so we can have brace depend on a new release (without the bug).

@pankitgami
Copy link

bug_brace
This version of the brace has a bug in php-worker.

editor.js:3609 Could not load worker TypeError: Cannot read property 'split' of undefined

@shepmaster
Copy link

Is there a link to an issue requesting a new ace release that someone could provide?

FWIW, I'd be OK with using Ace 1.2.8 even with the debugger statement, especially considering there are bugs that impact my downstream users fixed in 1.2.8.

To my knowledge, the debugger statement will only have an effect when the user has the browser inspector open, and in that case you presumably understand what you are doing and how to continue past a rogue debugger.

From another POV, if brace upgrades to 1.2.8, then more people can experience any issue that this causes and then check in with upstream to get it fixed / released.

@shepmaster
Copy link

Ace 1.2.9 has been released! Now with one less debugger statement 😺

@filipsch
Copy link
Collaborator Author

@shepmaster I'll update the PR then to depend on v1.2.9, and see if the builds still work.

@filipsch filipsch changed the title update ace to v1.2.8; fix ts build; update ace to v1.2.9; fix ts build; Oct 17, 2017
@filipsch
Copy link
Collaborator Author

Done, but my new commit and push to the pr branch of datacamp/brace fork is not coming through for some reason.

@shepmaster
Copy link

shepmaster commented Oct 17, 2017

Huh; I see the same behavior. Maybe it's just some GitHub slowness?

Edit — Yeah "We are investigating reports of elevated error rates." 11 minutes ago

Edit2 — I see it now! 🎉

@filipsch
Copy link
Collaborator Author

@shepmaster Okay cool; we're ready then. @gokmen can this be merged in now, and can a new release be made at the same time? Thanks!

@gokmen
Copy link
Collaborator

gokmen commented Oct 17, 2017

it's good to go for me 👍, on you @thlorenz

@filipsch
Copy link
Collaborator Author

@thlorenz ping!

@thlorenz
Copy link
Owner

Sorry, just seeing this now. LGTM

@filipsch made you collaborator.

Please merge to master following this guide.
I will then version and publish to npm.

Thanks.

Obviously @gokmen if you see this first and want to merge, fine by me.

Just ping me when done and I'll publish a new minor to npm.

@filipsch filipsch merged commit 651f084 into thlorenz:master Oct 30, 2017
@filipsch
Copy link
Collaborator Author

filipsch commented Oct 30, 2017

@thlorenz done! Ping me when new version is released and published; thanks!

@thlorenz
Copy link
Owner

@filipsch getting test errors (did you run npm test and open devtools?).
I don't see any error annotations in the editors, seems like something not working with the worker scripts.

I have 10/10 tests failing.

If we cannot solve this today we need to revert the commits from master.
I thought we had checked the tests before merging.

@thlorenz
Copy link
Owner

OK, confirmed that before these commits everything works fine.

> git reset --hard a417c2e
HEAD is now at a417c2e Fix link to DefinitelyTyped definition in README

> npm ts

@filipsch
Copy link
Collaborator Author

@thlorenz will look into it before EOD.

@thlorenz
Copy link
Owner

thlorenz commented Oct 30, 2017

OK I force pushed to master, reverting the commits (hoping no one else but the two of us updated from master at this point).
The errors are a regression we cannot have, one main point of brace is that the worker scripts are inlined and error annotations just work out of the box.

Sorry to do this, but I feel this is better to have reverted these and now we can calmly figure out why things broke.

@filipsch
Copy link
Collaborator Author

@thlorenz completely understand; I should have run the test scripts before; my bad.

@thlorenz
Copy link
Owner

No problem (we caught it in time). Probably best to open another PR with the changes as I cannot reopen this one.

@shepmaster
Copy link

I force pushed to master, reverting the commits

For the future, you can just revert the merge. GitHub should even have a button:

image

@thlorenz
Copy link
Owner

@shepmaster I know you can do that, but that adds extra commits.
The fact that this was up for only 30 mins made me think no one would get hurt if I just force push ;)

@LeviRosol
Copy link

Is this still going to happen? I was looking forward to the update.

@filipsch
Copy link
Collaborator Author

filipsch commented Nov 9, 2017

@LeviRosol it's still on my todo list, but I'm pretty swamped at my daytime job currently. When doing this PR, I didn't dive into the brace codebase itself, and basically just updated the build scripts. Therefore, I guess it will take a pretty long time for me to figure out where and why the tests now fail. I have no idea how long this is going to take.

@LeviRosol
Copy link

no worries. I assumed as much. If I can find some time I'll try to lend a hand.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants