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.

Sign up for GitHub

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

Prettier xml #380

Merged
merged 3 commits into from
Dec 22, 2021
Merged

Prettier xml #380

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d2689e
Add prettier-xml
MSaguer Dec 21, 2021
3acffcb
Apply prettier on xml files
MSaguer Dec 21, 2021
821ff3a
Add white space option on prettier xml and apply it
MSaguer Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .lintstagedrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
'{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}': ['prettier --write'],
'{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}': ['prettier --write'],
};
73 changes: 72 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
"license": "UNLICENSED",
"scripts": {
"prepare": "husky install",
"prettier:check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\"",
"prettier:format": "prettier --write \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\""
"prettier:check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}\"",
"prettier:format": "prettier --write \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}\""
},
"devDependencies": {
"@prettier/plugin-xml": "^1.1.0",
"husky": "7.0.4",
"lint-staged": "12.1.3",
"prettier": "2.5.1",
"prettier": "^2.5.1",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"prettier": "^2.5.1",
"prettier": "2.5.1",

"prettier-plugin-java": "1.6.0",
"prettier-plugin-packagejson": "2.2.15"
},
Expand Down
17 changes: 9 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8" ?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>4.0.0</modelVersion>

<groupId>tech.jhipster.lite</groupId>
Expand All @@ -15,7 +17,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.1</version>
<relativePath/>
<relativePath />
</parent>

<repositories>
Expand Down Expand Up @@ -265,8 +267,7 @@
</goals>
<configuration>
<fileSets>
<fileSet
implementation="org.apache.maven.shared.model.fileset.FileSet">
<fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
<directory>${project.basedir}</directory>
<includes>
<include>**/*.exec</include>
Expand Down Expand Up @@ -304,7 +305,7 @@
<id>enforce-dependencyConvergence</id>
<configuration>
<rules>
<DependencyConvergence/>
<DependencyConvergence />
</rules>
<fail>false</fail>
</configuration>
Expand Down
27 changes: 14 additions & 13 deletions src/main/resources/generator/server/springboot/dbmigration/liquibase/resources/master.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<databaseChangeLog
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.5.xsd">
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.5.xsd"
>

<property name="now" value="now()" dbms="h2"/>
<property name="now" value="current_timestamp" dbms="postgresql"/>
<property name="floatType" value="float4" dbms="postgresql, h2"/>
<property name="floatType" value="float" dbms="mysql, oracle, mssql, mariadb"/>
<property name="clobType" value="longvarchar" dbms="h2"/>
<property name="clobType" value="clob" dbms="mysql, oracle, mssql, mariadb, postgresql"/>
<property name="uuidType" value="uuid" dbms="h2, postgresql"/>
<property name="datetimeType" value="datetime(6)" dbms="mysql, mariadb"/>
<property name="datetimeType" value="datetime" dbms="oracle, mssql, postgresql, h2"/>
<property name="now" value="now()" dbms="h2" />
<property name="now" value="current_timestamp" dbms="postgresql" />
<property name="floatType" value="float4" dbms="postgresql, h2" />
<property name="floatType" value="float" dbms="mysql, oracle, mssql, mariadb" />
<property name="clobType" value="longvarchar" dbms="h2" />
<property name="clobType" value="clob" dbms="mysql, oracle, mssql, mariadb, postgresql" />
<property name="uuidType" value="uuid" dbms="h2, postgresql" />
<property name="datetimeType" value="datetime(6)" dbms="mysql, mariadb" />
<property name="datetimeType" value="datetime" dbms="oracle, mssql, postgresql, h2" />

</databaseChangeLog>
15 changes: 8 additions & 7 deletions src/test/resources/generator/buildtool/maven/pom.test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<?xml version="1.0" encoding="UTF-8" ?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>4.0.0</modelVersion>

<groupId>com.mycompany.myapp</groupId>
Expand Down Expand Up @@ -168,8 +170,7 @@
</goals>
<configuration>
<fileSets>
<fileSet
implementation="org.apache.maven.shared.model.fileset.FileSet">
<fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
<directory>${project.basedir}</directory>
<includes>
<include>**/*.exec</include>
Expand Down Expand Up @@ -207,7 +208,7 @@
<id>enforce-dependencyConvergence</id>
<configuration>
<rules>
<DependencyConvergence/>
<DependencyConvergence />
</rules>
<fail>false</fail>
</configuration>
Expand Down
15 changes: 7 additions & 8 deletions src/test/resources/generator/server/springboot/core/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration>

<configuration scan="true">
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<include resource="org/springframework/boot/logging/logback/base.xml" />

<!-- The FILE and ASYNC appenders are here as examples for a production configuration -->
<!--
Expand All @@ -27,15 +26,15 @@
</root>
-->

<logger name="tech.jhipster.sample" level="INFO"/>
<logger name="tech.jhipster.sample" level="INFO" />

<logger name="ch.qos.logback" level="WARN"/>
<logger name="com.sun" level="WARN"/>
<logger name="org.springframework" level="WARN"/>
<logger name="ch.qos.logback" level="WARN" />
<logger name="com.sun" level="WARN" />
<logger name="org.springframework" level="WARN" />
<!-- jhipster-needle-logback-add-log -->

<!-- https://logback.qos.ch/manual/configuration.html#shutdownHook and https://jira.qos.ch/browse/LOGBACK-1090 -->
<shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
<shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook" />

<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
Expand Down
21 changes: 10 additions & 11 deletions src/test/resources/generator/server/springboot/core/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration>

<configuration scan="true">
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<include resource="org/springframework/boot/logging/logback/base.xml" />

<!-- The FILE and ASYNC appenders are here as examples for a production configuration -->
<!--
Expand All @@ -27,19 +26,19 @@
</root>
-->

<logger name="tech.jhipster.sample" level="INFO"/>
<logger name="tech.jhipster.sample" level="INFO" />

<logger name="ch.qos.logback" level="WARN"/>
<logger name="com.sun" level="WARN"/>
<logger name="org.springframework" level="WARN"/>
<logger name="com.github.dockerjava" level="WARN"/>
<logger name="org.testcontainers" level="WARN"/>
<logger name="com.tngtech.archunit.core.importer" level="ERROR"/>
<logger name="ch.qos.logback" level="WARN" />
<logger name="com.sun" level="WARN" />
<logger name="org.springframework" level="WARN" />
<logger name="com.github.dockerjava" level="WARN" />
<logger name="org.testcontainers" level="WARN" />
<logger name="com.tngtech.archunit.core.importer" level="ERROR" />
<!-- jhipster-needle-logback-add-log -->

<root>
<level>WARN</level>
<appender-ref ref="CONSOLE"/>
<appender-ref ref="CONSOLE" />
</root>

</configuration>
29 changes: 14 additions & 15 deletions src/test/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration>

<configuration scan="true">
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<include resource="org/springframework/boot/logging/logback/base.xml" />

<logger name="tech.jhipster.lite" level="WARN"/>
<logger name="org.springframework" level="WARN"/>
<logger name="org.springframework.web" level="WARN"/>
<logger name="org.springframework.security" level="WARN"/>
<logger name="org.eclipse.jgit" level="WARN"/>
<logger name="com.tngtech.archunit.core" level="ERROR"/>
<logger name="org.apache.catalina" level="ERROR"/>
<logger name="_org.springframework.web.servlet.HandlerMapping.Mappings" level="INFO"/>
<logger name="Validator" level="INFO"/>
<logger name="_org.springframework.web.servlet.HandlerMapping.Mappings" level="INFO"/>
<logger name="org.apache.tomcat.util.IntrospectionUtils" level="INFO"/>
<logger name="tech.jhipster.lite" level="WARN" />
<logger name="org.springframework" level="WARN" />
<logger name="org.springframework.web" level="WARN" />
<logger name="org.springframework.security" level="WARN" />
<logger name="org.eclipse.jgit" level="WARN" />
<logger name="com.tngtech.archunit.core" level="ERROR" />
<logger name="org.apache.catalina" level="ERROR" />
<logger name="_org.springframework.web.servlet.HandlerMapping.Mappings" level="INFO" />
<logger name="Validator" level="INFO" />
<logger name="_org.springframework.web.servlet.HandlerMapping.Mappings" level="INFO" />
<logger name="org.apache.tomcat.util.IntrospectionUtils" level="INFO" />

<root>
<level>WARN</level>
<appender-ref ref="CONSOLE"/>
<appender-ref ref="CONSOLE" />
</root>

</configuration>