Skip to content

Commit

Permalink
run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
mshima committed Jun 13, 2024
1 parent a9bebef commit d59e2bb
Show file tree
Hide file tree
Showing 10 changed files with 190 additions and 193 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: javascript
languages: javascript

- name: Autobuild
uses: github/codeql-action/autobuild@v1
Expand Down
66 changes: 33 additions & 33 deletions .github/workflows/copyright-update.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
name: Copyright Update
on:
schedule:
- cron: '0 0 31 12 *' # Repeats December 31st every year
schedule:
- cron: '0 0 31 12 *' # Repeats December 31st every year

permissions:
contents: read
contents: read

jobs:
build:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR
name: copyright update
if: github.repository == 'jhipster/jhipster-kotlin'
runs-on: ubuntu-latest
timeout-minutes: 40
steps:
# Checkout
- uses: actions/checkout@v3
with:
ref: main
fetch-depth: 0
# Update the copyright headers
- name: Find and Replace
run: |
CURRENT_YEAR=$(date +'%Y')
NEW_YEAR=$(($CURRENT_YEAR + 1))
grep -rlZE "Copyright ([0-9]+)-$CURRENT_YEAR" . | xargs -0 sed -i -E "s/Copyright ([0-9]+)-$CURRENT_YEAR/Copyright \1-$NEW_YEAR/g"
# Create PR
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: 'Update copyright headers'
title: 'Update Copyright Headers'
body: 'This is an automated pull request to update the copyright headers'
branch: 'copyright-date-update'
author: 'jhipster-bot <[email protected]>'
build:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR
name: copyright update
if: github.repository == 'jhipster/jhipster-kotlin'
runs-on: ubuntu-latest
timeout-minutes: 40
steps:
# Checkout
- uses: actions/checkout@v3
with:
ref: main
fetch-depth: 0
# Update the copyright headers
- name: Find and Replace
run: |
CURRENT_YEAR=$(date +'%Y')
NEW_YEAR=$(($CURRENT_YEAR + 1))
grep -rlZE "Copyright ([0-9]+)-$CURRENT_YEAR" . | xargs -0 sed -i -E "s/Copyright ([0-9]+)-$CURRENT_YEAR/Copyright \1-$NEW_YEAR/g"
# Create PR
- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: 'Update copyright headers'
title: 'Update Copyright Headers'
body: 'This is an automated pull request to update the copyright headers'
branch: 'copyright-date-update'
author: 'jhipster-bot <[email protected]>'
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Refer [releases](https://github.com/jhipster/jhipster-kotlin/releases).

<a name="1.8.1"></a>
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,12 @@ Full documentation and information about JHipster is available [here](https://ww
[![NPM version][npm-image]][npm-url]
[![Dependency Status][daviddm-image]][daviddm-url]


## 🚀 How to get started

Install the package with `npm install -g generator-jhipster-kotlin`

1. Install the package with `npm install -g generator-jhipster-kotlin`
1. Create and navigate to a directory
1. Create and navigate to a directory
1. Generate the application with `khipster`

## Using Docker
Expand Down
2 changes: 1 addition & 1 deletion generators/entity-server/cleanup.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
function cleanupOldFiles(generator, javaDir, testDir) {
if (generator.isJhipsterVersionLessThan('7.6.1')) {
if (generator.searchEngineElasticsearch) {
generator.removeFile(`${javaDir}/repository/search/SortToFieldSortBuilderConverter.kt`);
generator.removeFile(`${javaDir}/repository/search/SortToFieldSortBuilderConverter.kt`);
}
}
if (generator.isJhipsterVersionLessThan('7.7.1')) {
Expand Down
1 change: 0 additions & 1 deletion generators/server/files.js
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ async function updateGradle(generator) {
_this.fs.write(fullPath, content.replace('classes/java/main', 'classes/kotlin/main'));
}


module.exports = {
writeFiles,
serverFiles,
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
},
"license": "Apache-2.0",
"author": "Sendil Kumar N <[email protected]> (https://sendilkumarn.com)",
"bin": {
"khipster": "cli/khipster.js"
},
"exports": {
"./cli/": "./cli/*",
"./package.json": "./package.json",
"./esm/generators/*": "./generators/*/esm.mjs"
},
"bin": {
"khipster": "cli/khipster.js"
},
"files": [
"cli",
"generators",
Expand All @@ -35,16 +35,16 @@
"!**/*.spec.?(c|m)js"
],
"scripts": {
"prettier:format": "prettier --write \"{,**/}*.{js,json,md,yml}\"",
"completion": "tabtab install --name jhipster --auto",
"lint": "npm run eslint && npm run ejs-lint",
"lint-fix": "npm run prettier:format && npm run eslint -- --fix",
"eslint": "eslint . --ext .js,.cjs,.mjs",
"ejs-lint": "mocha test/ejslint.js",
"ejslint": "ejslint",
"eslint": "eslint . --ext .js,.cjs,.mjs",
"lint": "npm run eslint && npm run ejs-lint",
"lint-fix": "npm run prettier:format && npm run eslint -- --fix",
"prettier:format": "prettier --write \"{,**/}*.{js,json,md,yml}\"",
"test": "mocha test --no-insight --forbid-only --parallel",
"update-snapshots": "npm run update-snapshot -- test generators",
"update-snapshot": "mocha --no-insight --no-parallel --updateSnapshot --"
"update-snapshot": "mocha --no-insight --no-parallel --updateSnapshot --",
"update-snapshots": "npm run update-snapshot -- test generators"
},
"dependencies": {
"chalk": "4.1.2",
Expand Down
162 changes: 81 additions & 81 deletions test-integration/workflow-samples/angular.json
Original file line number Diff line number Diff line change
@@ -1,83 +1,83 @@
{
"include": [
{
"name": "ngx-default",
"app-sample": "ngx-default",
"entity": "sqlfull",
"sonar-analyse": "true"
},
{
"name": "ngx-default-additional",
"entity": "none",
"app-sample": "ngx-default",
"jdl-entity": "*"
},
{
"name": "ngx-mongodb-kafka-cucumber",
"app-sample": "ngx-mongodb-kafka-cucumber",
"entity": "mongodb",
"environment": "dev"
},
{
"name": "ngx-gradle-fr",
"app-sample": "ngx-gradle-fr",
"entity": "sql"
},
{
"name": "ngx-gradle-h2disk-ws-nocache",
"app-sample": "ngx-gradle-h2disk-ws-nocache",
"entity": "sql",
"environment": "dev",
"war": 1,
"testcontainers": "false"
},
{
"name": "ngx-webflux-mongodb",
"app-sample": "webflux-mongodb",
"entity": "mongodb"
},
{
"name": "ngx-webflux-gradle-mongodb-oauth2",
"app-sample": "webflux-mongodb-oauth2",
"entity": "mongodb"
},
{
"name": "ngx-webflux-psql-default",
"app-sample": "webflux-psql",
"entity": "sql"
},
{
"name": "ngx-webflux-psql-additional",
"jdl-samples": "webflux-psql,custom-domain"
},
{
"name": "ngx-webflux-gradle-session-h2mem-es",
"app-sample": "webflux-gradle-session-h2mem-es",
"environment": "dev",
"entity": "sqllight"
},
{
"name": "ngx-webflux-couchbase",
"app-sample": "webflux-couchbase",
"entity": "couchbase"
},
{
"name": "ms-ngx-eureka-oauth2-mongodb-caffeine",
"jdl-samples": "ms-ngx-eureka-oauth2-mongodb-caffeine",
"extra-args": "--workspaces --monorepository",
"workspaces": "true"
},
{
"name": "mf-ngx-eureka-jwt-psql-ehcache",
"jdl-samples": "mf-ngx-eureka-jwt-psql-ehcache",
"extra-args": "--workspaces --monorepository",
"workspaces": "true"
},
{
"name": "ms-mf-ngx-consul-oauth2-neo4j",
"jdl-samples": "ms-mf-ngx-consul-oauth2-neo4j",
"extra-args": "--workspaces --monorepository",
"workspaces": "true"
}
]
"include": [
{
"name": "ngx-default",
"app-sample": "ngx-default",
"entity": "sqlfull",
"sonar-analyse": "true"
},
{
"name": "ngx-default-additional",
"entity": "none",
"app-sample": "ngx-default",
"jdl-entity": "*"
},
{
"name": "ngx-mongodb-kafka-cucumber",
"app-sample": "ngx-mongodb-kafka-cucumber",
"entity": "mongodb",
"environment": "dev"
},
{
"name": "ngx-gradle-fr",
"app-sample": "ngx-gradle-fr",
"entity": "sql"
},
{
"name": "ngx-gradle-h2disk-ws-nocache",
"app-sample": "ngx-gradle-h2disk-ws-nocache",
"entity": "sql",
"environment": "dev",
"war": 1,
"testcontainers": "false"
},
{
"name": "ngx-webflux-mongodb",
"app-sample": "webflux-mongodb",
"entity": "mongodb"
},
{
"name": "ngx-webflux-gradle-mongodb-oauth2",
"app-sample": "webflux-mongodb-oauth2",
"entity": "mongodb"
},
{
"name": "ngx-webflux-psql-default",
"app-sample": "webflux-psql",
"entity": "sql"
},
{
"name": "ngx-webflux-psql-additional",
"jdl-samples": "webflux-psql,custom-domain"
},
{
"name": "ngx-webflux-gradle-session-h2mem-es",
"app-sample": "webflux-gradle-session-h2mem-es",
"environment": "dev",
"entity": "sqllight"
},
{
"name": "ngx-webflux-couchbase",
"app-sample": "webflux-couchbase",
"entity": "couchbase"
},
{
"name": "ms-ngx-eureka-oauth2-mongodb-caffeine",
"jdl-samples": "ms-ngx-eureka-oauth2-mongodb-caffeine",
"extra-args": "--workspaces --monorepository",
"workspaces": "true"
},
{
"name": "mf-ngx-eureka-jwt-psql-ehcache",
"jdl-samples": "mf-ngx-eureka-jwt-psql-ehcache",
"extra-args": "--workspaces --monorepository",
"workspaces": "true"
},
{
"name": "ms-mf-ngx-consul-oauth2-neo4j",
"jdl-samples": "ms-mf-ngx-consul-oauth2-neo4j",
"extra-args": "--workspaces --monorepository",
"workspaces": "true"
}
]
}
34 changes: 17 additions & 17 deletions test-integration/workflow-samples/react.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"include": [
{
"name": "react-default",
"app-sample": "react-default",
"entity": "sqlfull"
},
{
"name": "react-maven-h2mem-memcached",
"app-sample": "react-maven-h2mem-memcached",
"entity": "sql"
},
{
"name": "react-gradle-cassandra-session-redis",
"app-sample": "react-gradle-cassandra-session-redis",
"entity": "cassandra"
}
]
"include": [
{
"name": "react-default",
"app-sample": "react-default",
"entity": "sqlfull"
},
{
"name": "react-maven-h2mem-memcached",
"app-sample": "react-maven-h2mem-memcached",
"entity": "sql"
},
{
"name": "react-gradle-cassandra-session-redis",
"app-sample": "react-gradle-cassandra-session-redis",
"entity": "cassandra"
}
]
}
Loading

0 comments on commit d59e2bb

Please sign in to comment.