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

ES6 module import syntax. Fixes #347 #351

Merged
merged 2 commits into from
Feb 9, 2017
Merged

ES6 module import syntax. Fixes #347 #351

merged 2 commits into from
Feb 9, 2017

Conversation

coreygrunewald
Copy link
Contributor

@coreygrunewald coreygrunewald commented Feb 6, 2017

  • Fixes ES5 -> ES6 module import syntax.
  • Fixes circular dependency issue for richPromise.jsx.
  • Fixes issue with the Publish dialog when no servers are present in project file.
  • Various syntax improvements.

I ran the JS tests locally, all passed. I tried running the Python tests, saw some errors, but they seemed all to originate from dependencies (My knowledge with python and it's tooling is still a bit rough)? I also ran through some manual testing, everything seemed OK, but it would probably be good to get some other hands on it.

One question:

How do the production assets get built when Lektor is deployed to pip / installed from the shell script?

A few recommendations for tasks:

  • Add eslint for JS linting.
  • Add prettier for JS formatting.

@tariquesani
Copy link
Member

Thanks for this.

Copy link
Member

@singingwolfboy singingwolfboy left a comment

Choose a reason for hiding this comment

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

Thanks so much! I just tested this out locally and it seems to work great, although the JS console does seem to pop a few warnings related to using React in deprecated ways. Still, that can be addressed in a separate pull request.

And yes, adding eslint would be good -- and I didn't know about prettier, but I'll check it out!

@@ -1,38 +1,35 @@
import ErrorDialog from './dialogs/errorDialog';
import dialogSystem from './dialogSystem';

function bringUpDialog(error) {
// we need to import this here due to circular dependencies
Copy link
Member

Choose a reason for hiding this comment

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

Can you remove this outdated comment?

Copy link
Member

Choose a reason for hiding this comment

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

Actually, I'll do it post-merge.

@singingwolfboy singingwolfboy merged commit db59e1e into lektor:master Feb 9, 2017
nixjdm pushed a commit that referenced this pull request Jun 12, 2017
ES6 module import syntax. Fixes #347
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.

3 participants