Skip to content

Commit

Permalink
chore(prettier): simplify prettier configuration: run prettier by def…
Browse files Browse the repository at this point in the history
…ault on all files excepted those explicitly ignored
  • Loading branch information
murdos committed Apr 20, 2024
1 parent 559ec46 commit 74f4ab9
Show file tree
Hide file tree
Showing 22 changed files with 193 additions and 123 deletions.
52 changes: 28 additions & 24 deletions .jhipster/modules/history.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
{
"actions" : [ {
"module" : "application-service-hexagonal-architecture-documentation",
"date" : "2022-07-29T05:45:39.864617462Z",
"properties" : { }
}, {
"module" : "maven-java",
"date" : "2024-01-29T22:31:20.121046866Z",
"properties" : {
"packageName" : "com.mycompany.myapp",
"projectName" : "JHipster Sample Application",
"baseName" : "jhipsterSampleApplication",
"endOfLine" : "lf",
"indentSize" : 2
"actions": [
{
"module": "application-service-hexagonal-architecture-documentation",
"date": "2022-07-29T05:45:39.864617462Z",
"properties": {}
},
{
"module": "maven-java",
"date": "2024-01-29T22:31:20.121046866Z",
"properties": {
"packageName": "com.mycompany.myapp",
"projectName": "JHipster Sample Application",
"baseName": "jhipsterSampleApplication",
"endOfLine": "lf",
"indentSize": 2
}
},
{
"module": "jacoco-check-min-coverage",
"date": "2024-01-29T22:31:20.126024517Z",
"properties": {
"packageName": "com.mycompany.myapp",
"projectName": "JHipster Sample Application",
"baseName": "jhipsterSampleApplication",
"endOfLine": "lf",
"indentSize": 2
}
}
}, {
"module" : "jacoco-check-min-coverage",
"date" : "2024-01-29T22:31:20.126024517Z",
"properties" : {
"packageName" : "com.mycompany.myapp",
"projectName" : "JHipster Sample Application",
"baseName" : "jhipsterSampleApplication",
"endOfLine" : "lf",
"indentSize" : 2
}
} ]
]
}
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ build
package-lock.json
.git
.mvn
template-infinitest.filters
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@
"lint:pug": "npm run lint:ci:pug",
"lint:sass": "npm run lint:ci:sass -- --fix",
"prepare": "husky",
"prettier:check": "npm run prettier:run -- --check",
"prettier:format": "npm run prettier:run -- --write",
"prettier:run": "prettier '{{src/**/,}*.{md,json,yml,html,vue,java,xml,feature},*.{js,ts},.github/**/*.yml,documentation/**/*.md,src/{main/glyph,main/webapp,test/javascript}/**/*.{css,scss}}'",
"prettier:check": "prettier . --check",
"prettier:format": "prettier . --write",
"preview": "vite preview",
"start": "npm run dev",
"test": "npm run vitest -- run --coverage --",
Expand Down
128 changes: 104 additions & 24 deletions src/main/glyph/font/jhlite-icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ describe('Oauth2 Auth Service', () => {

it('should init refresh token and return true when the user is authenticated', async () => {
// Given
jest
.spyOn(keycloakInstance, 'init')
.mockReturnValue(Promise.resolve(true).then() as unknown as Promise<boolean>);
jest.spyOn(keycloakInstance, 'init').mockReturnValue(Promise.resolve(true).then() as unknown as Promise<boolean>);

// When
const authenticated = await lastValueFrom(service.initAuthentication());
Expand All @@ -93,9 +91,7 @@ describe('Oauth2 Auth Service', () => {

it('should reload window and return false when the user is not authenticated', async () => {
// Given
jest
.spyOn(keycloakInstance, 'init')
.mockReturnValue(Promise.resolve(false).then() as unknown as Promise<boolean>);
jest.spyOn(keycloakInstance, 'init').mockReturnValue(Promise.resolve(false).then() as unknown as Promise<boolean>);

// When
const authenticated = await lastValueFrom(service.initAuthentication());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class Oauth2AuthService {
}),
tap(() => {
this.initUpdateTokenRefresh();
})
}),
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ describe('Home', () => {
cy.title().should('include', 'JHipster');
});
});

Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ export default defineConfig({
video: false,
},
});

Loading

0 comments on commit 74f4ab9

Please sign in to comment.