Prettier on scss and css files generated + reformat css.ejs and scss.ejs #7476

JulioJu · 2018-04-12T15:53:55Z

Please make sure the below checklist is followed for Pull Requests.

Travis tests are green
Tests are added where necessary
Documentation is added/updated where necessary
Coding Rules & Commit Guidelines as per our CONTRIBUTING.md document are followed

deepu105 · 2018-04-12T16:10:02Z

@JulioJu great work.

JulioJu · 2018-04-12T17:39:31Z

generators/client/templates/angular/.prettierrc.ejs

+  options:
+    jsxBracketSameLine: false
+    arrowParens: avoid
+    parser: typescript


This line is not mandatory. Prettier detects the parser needed.
@gmarziou. To simplify prettierrc, we could delete all "parser" lines? What do you think about that? I asked me before commit, but I didn't dare delete that…
Maybe it's better to have a more accurate prettierc? We have a complete syntax… Maybe it's better ^^! I believe it's better to see what we do… As you wish ;-).

Note: parser will be renamed "language" (see prettier/prettier#2846).

EDIT excuse-me: the original author of this file is @deepu105 ;-)

Lets leave it like that as its more explicit

@deepu105. I'm pretty sure, this syntax doesn't work. We could deduce that beccause we could see than 7fcd4b0 works, but 7a85416 fail. My assumption is that somewhere (but I don't know where) a command $ yarn prettier --write --parser css "src/**/*.ts" is launched. In my computer, in folder ngx-default-sample, when I run command $ yarn prettier --write --parser css "src/**/*.ts", I have the same kind of error than in line 1526 of https://travis-ci.org/jhipster/generator-jhipster/jobs/365956929 (build of 7a85416).

We could read at line 1526 of https://travis-ci.org/jhipster/generator-jhipster/jobs/365956929 than

SyntaxError: (postcss) CssSyntaxError Unknown word (1:1) > 1 | export * from './foo.service'; | ^ 2 | export * from './foo-update.component'; 3 | export * from './foo-delete-dialog.component';

I don't understand this error beacause in folder "ngx-default-sample" there isn't file "foo.service", there isn't entity "foo". Have you an ideay why on remote Travis it tests folder "foo"?

As 7fcd4b0 works, I could --hard reset to this commit ?

Or maybe I could try simply with a .prettierrc without explicit parser? Thanks 7fcd4b0, and with the result of the command « $ yarn prettier --write --parser css "src/**/*.ts » I believe it's better to let prettier choose the parser corresponding to the file extension.

printWidth: 140 singleQuote: true tabWidth: 4 useTabs: false overrides: - files: "src/**/{*.ts,*.tsx}" options: jsxBracketSameLine: false arrowParens: avoid

What do you think about that?

@deepu105 I'm going to test the syntax above with a new commit…

JulioJu · 2018-04-12T17:40:52Z

generators/client/templates/angular/.prettierrc.ejs

+    jsxBracketSameLine: false
+    arrowParens: avoid
+    parser: typescript
+- files: "src/**/*.css"


@gmarziou : same as above: should we delete it ?

JulioJu

Try to track why https://travis-ci.org/jhipster/generator-jhipster/jobs/365748086 fail.

JulioJu · 2018-04-12T19:47:39Z

travis/scripts/00-install-jhipster.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex


There is a strange error so I enable the bash option « trace for each command after it expands the command and before it executes it » to see accurately where there is a bug. Advise at https://docs.travis-ci.com/user/installing-dependencies/#Installing-Projects-from-Source.

Note: when I run ~~$ ./build-samples.sh build ngx-default~~ or yarn prettier:format on my computer, all work fine. Strange!

EDIT:
$ ./build-samples.sh build ngx-default could success because it doesn't call the script who failed: scripts/00-install-jhipster.sh! Moreover, there isn't yarn link, so we dowload each time the last release of JHipster. I will submit a new issue, and maybe a Pull Request.

@pascalgrimaud is this ok?

jdubois · 2018-04-12T19:54:12Z

This is totally awesome!!! Only downside is that @deepu105 you need to modify your Devoxx slides to include this :-D

JulioJu · 2018-04-13T07:23:46Z

@deepu105 I'm going to test the idea explained at #7476 (comment).

bc31205 reverts the previous who failed : as 7fcd4b0 works, bc31205 works.
3625f47 who tests the idea above (see https://travis-ci.org/jhipster/generator-jhipster/builds/365977592?utm_source=github_status&utm_medium=notification).

JulioJu · 2018-04-13T08:08:32Z

@deepu105 it works!
I prefer 7fcd4b0 than 3625f47 because 7fcd4b0 it's more clear and maybe more reliable and more human readable.

There is a strange behaviour in the Travis build of 7a85416. I've let an hypothesis, but it's strange. I believe it's better to let Prettier choose which rules and which parser work on a filetype. Be too much accurate in .prettierrc seems introduce confusion during Travis build. Only let a comment for humans is I believe better, and let Prettier works freely is I believe more reliable.

deepu105 · 2018-04-13T05:40:28Z

generators/generator-base-private.js

@@ -1071,12 +1074,12 @@ module.exports = class extends Generator {
     */
    registerClientTransforms(generator = this) {
        if (!generator.skipClient) {
-            const typescriptFilter = filter(['**/*.{ts,tsx}'], { restore: true });
+            const myFilter = filter(['src/**/*.{ts,tsx,scss,css}'], { restore: true });


Rename to prettierFilter

deepu105 · 2018-04-13T05:41:46Z

travis/scripts/00-install-jhipster.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex


@pascalgrimaud is this ok?

deepu105 · 2018-04-13T09:41:03Z

@JulioJu ok for your last comment, let prettier choose options, if that works fine. Can you cleanup your commits, may be squash the reverts

JulioJu · 2018-04-13T10:34:33Z

@deepu105. Ok squashed ! Commit with set -ex deleted because this afternoon I will work on a separate PR for that (see issue #7479).

JulioJu · 2018-04-13T11:51:46Z

@deepu105
I havn't luck with Travis Builds ;-)
Network connection problem again:
«
[FATAL] Non-resolvable parent POM for io.github.jhipster:jhipster-dependencies:[unknown-version]: Failure to find io.github.jhipster:jhipster-parent:pom:2.0.0 in http://repo.maven.apache.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced @ io.github.jhipster:jhipster-dependencies:[unknown-version], /home/travis/.m2/repository/io/github/jhipster/jhipster-dependencies/2.0.0/jhipster-dependencies-2.0.0.pom, line 5, column 13
» (https://travis-ci.org/jhipster/generator-jhipster/jobs/366048640).
So I start again the Travis build

jdubois · 2018-04-13T12:14:15Z

No the jhipster-parent failure is my fault!!

JulioJu · 2018-04-13T12:30:23Z

@jdubois ok :-) !
So could you restart the travis build when all will be ok ? We could see at https://travis-ci.org/jhipster/generator-jhipster/builds/366077749?utm_source=github_status&utm_medium=notification that all Travis build won't success ;-)

What is « jhipster-parent » ?

jdubois · 2018-04-13T12:52:37Z

"jhipster-parent" is a new library on which "jhipster-framework" and "jhipster-dependencies" depend - they should all be served from Maven Central, and this is what I failed this morning.
I just released version 2.0.1 and upgraded the generator, see f12c59c - it should be good, but it's not fully tested yet. I'm monitoring this right now.

fix jhipster#7451

JulioJu · 2018-04-14T08:48:29Z

@jdubois thanks for your explanation :-) ! All work fine now ;-).
@deepu105 thanks for the review and the merge :-).

JulioJu added 3 commits April 12, 2018 11:54

react: css files with 2 spaces indent

a03cd70

angular: correct indentation of css and scss files

0d6c8b2

reformat css.ejs/scss.ejs files with help of prettier

bcd4e55

JulioJu force-pushed the prettier-on-css-and-scss branch from 1d65c3e to 9cce38b Compare April 12, 2018 15:57

deepu105 approved these changes Apr 12, 2018

View reviewed changes

JulioJu force-pushed the prettier-on-css-and-scss branch from 9cce38b to 1d0920b Compare April 12, 2018 17:20

JulioJu commented Apr 12, 2018

View reviewed changes

JulioJu changed the title ~~Prettier on scss and css files generated + reformat css.ejs and scss.ejs +~~ Prettier on scss and css files generated + reformat css.ejs and scss.ejs Apr 12, 2018

JulioJu commented Apr 12, 2018

View reviewed changes

JulioJu mentioned this pull request Apr 12, 2018

Improve local travis build #7479

Closed

1 task

JulioJu force-pushed the prettier-on-css-and-scss branch 4 times, most recently from a12468d to 7a85416 Compare April 13, 2018 05:50

deepu105 reviewed Apr 13, 2018

View reviewed changes

JulioJu force-pushed the prettier-on-css-and-scss branch from 3625f47 to 8adca2a Compare April 13, 2018 10:30

JulioJu force-pushed the prettier-on-css-and-scss branch 2 times, most recently from 72ed276 to e19617a Compare April 13, 2018 11:50

JulioJu force-pushed the prettier-on-css-and-scss branch from e19617a to 16dbec9 Compare April 13, 2018 12:07

prettier also for css and scss files

5dc9dea

fix jhipster#7451

JulioJu force-pushed the prettier-on-css-and-scss branch from 16dbec9 to 5dc9dea Compare April 13, 2018 22:50

deepu105 approved these changes Apr 14, 2018

View reviewed changes

deepu105 merged commit 9ed5e49 into jhipster:master Apr 14, 2018

jdubois added this to the 5.0.0-beta.1 milestone May 3, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prettier on scss and css files generated + reformat css.ejs and scss.ejs #7476

Prettier on scss and css files generated + reformat css.ejs and scss.ejs #7476

JulioJu commented Apr 12, 2018

deepu105 commented Apr 12, 2018

JulioJu Apr 12, 2018 •

edited

deepu105 Apr 13, 2018

JulioJu Apr 13, 2018 •

edited

JulioJu Apr 13, 2018

JulioJu Apr 12, 2018

JulioJu left a comment

JulioJu Apr 12, 2018 •

edited

deepu105 Apr 13, 2018

jdubois commented Apr 12, 2018

JulioJu commented Apr 13, 2018 •

edited

JulioJu commented Apr 13, 2018 •

edited

deepu105 Apr 13, 2018

deepu105 Apr 13, 2018

deepu105 commented Apr 13, 2018

JulioJu commented Apr 13, 2018

JulioJu commented Apr 13, 2018

jdubois commented Apr 13, 2018

JulioJu commented Apr 13, 2018

jdubois commented Apr 13, 2018

JulioJu commented Apr 14, 2018

Prettier on scss and css files generated + reformat css.ejs and scss.ejs #7476

Prettier on scss and css files generated + reformat css.ejs and scss.ejs #7476

Conversation

JulioJu commented Apr 12, 2018

deepu105 commented Apr 12, 2018

JulioJu Apr 12, 2018 • edited

Choose a reason for hiding this comment

deepu105 Apr 13, 2018

Choose a reason for hiding this comment

JulioJu Apr 13, 2018 • edited

Choose a reason for hiding this comment

JulioJu Apr 13, 2018

Choose a reason for hiding this comment

JulioJu Apr 12, 2018

Choose a reason for hiding this comment

JulioJu left a comment

Choose a reason for hiding this comment

JulioJu Apr 12, 2018 • edited

Choose a reason for hiding this comment

deepu105 Apr 13, 2018

Choose a reason for hiding this comment

jdubois commented Apr 12, 2018

JulioJu commented Apr 13, 2018 • edited

JulioJu commented Apr 13, 2018 • edited

deepu105 Apr 13, 2018

Choose a reason for hiding this comment

deepu105 Apr 13, 2018

Choose a reason for hiding this comment

deepu105 commented Apr 13, 2018

JulioJu commented Apr 13, 2018

JulioJu commented Apr 13, 2018

jdubois commented Apr 13, 2018

JulioJu commented Apr 13, 2018

jdubois commented Apr 13, 2018

JulioJu commented Apr 14, 2018

JulioJu Apr 12, 2018 •

edited

JulioJu Apr 13, 2018 •

edited

JulioJu Apr 12, 2018 •

edited

JulioJu commented Apr 13, 2018 •

edited

JulioJu commented Apr 13, 2018 •

edited