Skip to content

Commit

Permalink
Updated to JHipster 6.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaugarcia committed Sep 14, 2019
1 parent db10d51 commit 45f4ce4
Show file tree
Hide file tree
Showing 138 changed files with 2,045 additions and 1,393 deletions.
9 changes: 9 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
node_modules/
src/main/docker/
src/test/javascript/protractor.conf.js
src/test/javascript/jest.conf.js
webpack/
target/
build/
node/
postcss.config.js
15 changes: 15 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"plugins": ["@typescript-eslint/tslint"],
"extends": ["jhipster"],
"parserOptions": {
"project": "./tsconfig.json"
},
"rules": {
"@typescript-eslint/tslint/config": [
"error",
{
"lintFile": "./tslint.json"
}
]
}
}
3 changes: 3 additions & 0 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
'{,src/**/}*.{md,json,ts,css,scss,yml}': ['prettier --write', 'git add']
};
4 changes: 2 additions & 2 deletions .mvn/wrapper/MavenWrapperDownloader.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

public class MavenWrapperDownloader {

private static final String WRAPPER_VERSION = "0.5.4";
private static final String WRAPPER_VERSION = "0.5.5";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + " .jar";
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";

/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
Expand Down
Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.4/maven-wrapper-0.5.4.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
19 changes: 6 additions & 13 deletions .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,22 @@
"buildTool": "maven",
"useSass": true,
"clientPackageManager": "npm",
"testFrameworks": [
"gatling",
"cucumber",
"protractor"
],
"testFrameworks": ["gatling", "cucumber", "protractor"],
"enableTranslation": true,
"nativeLanguage": "en",
"languages": [
"ca",
"es",
"en"
],
"languages": ["ca", "es", "en"],
"clientFramework": "angularX",
"jhiPrefix": "jhi",
"jhipsterVersion": "6.2.0",
"jhipsterVersion": "6.3.0",
"jwtSecretKey": "ZGI3MTQyY2I3YTNiMGZiNGUwMDU0ODdhMzYzNjRhNWNmZWRiMTcxOWYwNmMyZDU4ZGQyZDA1MGI4ZDlmNTdiYzQ4ZWViYzBjODI3ODBmNTFiOWJmZTY1NmQ0NWNmMGFlODQzOGJmNmY3NWM3ZDc3Y2ExNTg3ZGIwYTIzZmNlMzE=",
"clientTheme": "none",
"entitySuffix": "",
"dtoSuffix": "DTO",
"otherModules": [],
"blueprints": []
"blueprints": [],
"embeddableLaunchScript": false
},
"git-provider": "GitHub",
"git-company": "arnaugarcia",
"repository-name": "sallefy"
}
}
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Sallefy

This application was generated using JHipster 6.2.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v6.2.0](https://www.jhipster.tech/documentation-archive/v6.2.0).
This application was generated using JHipster 6.3.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v6.3.0](https://www.jhipster.tech/documentation-archive/v6.3.0).

## Development

Expand Down Expand Up @@ -178,13 +178,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.

[jhipster homepage and latest documentation]: https://www.jhipster.tech
[jhipster 6.2.0 archive]: https://www.jhipster.tech/documentation-archive/v6.2.0
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v6.2.0/development/
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v6.2.0/docker-compose
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v6.2.0/production/
[running tests page]: https://www.jhipster.tech/documentation-archive/v6.2.0/running-tests/
[code quality page]: https://www.jhipster.tech/documentation-archive/v6.2.0/code-quality/
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v6.2.0/setting-up-ci/
[jhipster 6.3.0 archive]: https://www.jhipster.tech/documentation-archive/v6.3.0
[using jhipster in development]: https://www.jhipster.tech/documentation-archive/v6.3.0/development/
[using docker and docker-compose]: https://www.jhipster.tech/documentation-archive/v6.3.0/docker-compose
[using jhipster in production]: https://www.jhipster.tech/documentation-archive/v6.3.0/production/
[running tests page]: https://www.jhipster.tech/documentation-archive/v6.3.0/running-tests/
[code quality page]: https://www.jhipster.tech/documentation-archive/v6.3.0/code-quality/
[setting up continuous integration]: https://www.jhipster.tech/documentation-archive/v6.3.0/setting-up-ci/
[node.js]: https://nodejs.org/
[yarn]: https://yarnpkg.org/
[webpack]: https://webpack.github.io/
Expand Down
4 changes: 2 additions & 2 deletions mvnw
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ else
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
fi
if [ -n "$MVNW_REPOURL" ]; then
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.4/maven-wrapper-0.5.4.jar"
jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
else
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.4/maven-wrapper-0.5.4.jar"
jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
fi
while IFS="=" read key value; do
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
Expand Down
4 changes: 2 additions & 2 deletions mvnw.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.4/maven-wrapper-0.5.4.jar"
set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"

FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
Expand All @@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
)
) else (
if not "%MVNW_REPOURL%" == "" (
SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.4/maven-wrapper-0.5.4.jar"
SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
)
if "%MVNW_VERBOSE%" == "true" (
echo Couldn't find %WRAPPER_JAR%, downloading it ...
Expand Down
128 changes: 63 additions & 65 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,119 +1,117 @@
{
"name": "sallefy",
"version": "0.0.0",
"version": "0.0.1-SNAPSHOT",
"description": "Description for Sallefy",
"private": true,
"license": "UNLICENSED",
"cacheDirectories": [
"node_modules"
],
"dependencies": {
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@angular/forms": "8.0.0",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@fortawesome/angular-fontawesome": "0.4.0",
"@fortawesome/fontawesome-svg-core": "1.2.19",
"@fortawesome/free-solid-svg-icons": "5.9.0",
"@ng-bootstrap/ng-bootstrap": "4.2.1",
"@angular/common": "8.2.4",
"@angular/compiler": "8.2.4",
"@angular/core": "8.2.4",
"@angular/forms": "8.2.4",
"@angular/platform-browser": "8.2.4",
"@angular/platform-browser-dynamic": "8.2.4",
"@angular/router": "8.2.4",
"@fortawesome/angular-fontawesome": "0.5.0",
"@fortawesome/fontawesome-svg-core": "1.2.22",
"@fortawesome/free-solid-svg-icons": "5.10.2",
"@ng-bootstrap/ng-bootstrap": "5.1.0",
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
"bootstrap": "4.3.1",
"core-js": "3.1.3",
"core-js": "3.2.1",
"moment": "2.24.0",
"ng-jhipster": "0.10.1",
"ng-jhipster": "0.11.1",
"ngx-cookie": "4.0.2",
"ngx-infinite-scroll": "7.2.0",
"ngx-infinite-scroll": "8.0.0",
"ngx-webstorage": "4.0.1",
"rxjs": "6.5.2",
"swagger-ui": "2.2.10",
"tslib": "1.10.0",
"zone.js": "0.9.1"
"zone.js": "0.10.2"
},
"devDependencies": {
"@angular/cli": "8.0.2",
"@angular/compiler-cli": "8.0.0",
"@ngtools/webpack": "8.0.2",
"@types/chai": "4.1.7",
"@types/chai-string": "1.4.1",
"@types/jest": "24.0.14",
"@angular/cli": "8.3.1",
"@angular/compiler-cli": "8.2.4",
"@ngtools/webpack": "8.3.1",
"@types/chai": "4.2.0",
"@types/chai-string": "1.4.2",
"@types/jest": "24.0.18",
"@types/mocha": "5.2.7",
"@types/node": "10.12.27",
"@types/selenium-webdriver": "4.0.0",
"acorn": "6.1.1",
"angular-router-loader": "0.8.5",
"@typescript-eslint/eslint-plugin": "2.0.0",
"@typescript-eslint/eslint-plugin-tslint": "2.0.0",
"@typescript-eslint/parser": "2.0.0",
"@types/selenium-webdriver": "4.0.2",
"angular2-template-loader": "0.6.2",
"autoprefixer": "9.6.0",
"autoprefixer": "9.6.1",
"base-href-webpack-plugin": "2.0.0",
"browser-sync": "2.26.7",
"browser-sync-webpack-plugin": "2.2.2",
"cache-loader": "4.0.0",
"cache-loader": "4.1.0",
"chai": "4.2.0",
"chai-as-promised": "7.1.1",
"chai-string": "1.5.0",
"codelyzer": "5.1.0",
"copy-webpack-plugin": "5.0.3",
"css-loader": "3.0.0",
"file-loader": "4.0.0",
"fork-ts-checker-webpack-plugin": "1.3.6",
"copy-webpack-plugin": "5.0.4",
"css-loader": "3.2.0",
"eslint": "6.2.2",
"eslint-config-jhipster": "0.0.1",
"eslint-config-prettier": "6.1.0",
"eslint-loader": "3.0.0",
"file-loader": "4.2.0",
"fork-ts-checker-webpack-plugin": "1.5.0",
"friendly-errors-webpack-plugin": "1.7.0",
"generator-jhipster": "6.2.0",
"generator-jhipster": "6.3.0",
"html-loader": "0.5.5",
"html-webpack-plugin": "3.2.0",
"husky": "2.4.1",
"jest": "24.8.0",
"jest-junit": "6.4.0",
"husky": "3.0.4",
"jest": "24.9.0",
"jest-junit": "8.0.0",
"jest-preset-angular": "7.1.1",
"jest-sonar-reporter": "2.0.0",
"lint-staged": "8.2.0",
"lint-staged": "8.2.1",
"merge-jsons-webpack-plugin": "1.0.19",
"mini-css-extract-plugin": "0.7.0",
"mocha": "6.1.4",
"moment-locales-webpack-plugin": "1.0.7",
"optimize-css-assets-webpack-plugin": "5.0.1",
"mini-css-extract-plugin": "0.8.0",
"mocha": "6.2.0",
"moment-locales-webpack-plugin": "1.1.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
"postcss-loader": "3.0.0",
"prettier": "1.18.2",
"protractor": "5.4.2",
"reflect-metadata": "0.1.13",
"rimraf": "2.6.3",
"sass": "1.21.0",
"sass-loader": "7.1.0",
"rimraf": "3.0.0",
"sass": "1.22.10",
"sass-loader": "7.3.1",
"simple-progress-webpack-plugin": "1.1.2",
"style-loader": "0.23.1",
"terser-webpack-plugin": "1.3.0",
"thread-loader": "2.1.2",
"style-loader": "1.0.0",
"terser-webpack-plugin": "1.4.1",
"thread-loader": "2.1.3",
"to-string-loader": "1.1.5",
"ts-loader": "6.0.2",
"ts-node": "8.2.0",
"tslint": "5.17.0",
"tslint-config-prettier": "1.18.0",
"tslint-loader": "3.5.4",
"ts-loader": "6.0.4",
"ts-node": "8.3.0",
"tslint": "5.19.0",
"typescript": "3.4.5",
"webdriver-manager": "12.1.5",
"webpack": "4.34.0",
"webpack-cli": "3.3.4",
"webpack-dev-server": "3.7.1",
"webpack-merge": "4.2.1",
"webpack-notifier": "1.7.0",
"webdriver-manager": "12.1.6",
"@openapitools/openapi-generator-cli": "0.0.19-4.1.2",
"webpack": "4.39.3",
"webpack-cli": "3.3.7",
"webpack-dev-server": "3.8.0",
"webpack-merge": "4.2.2",
"webpack-notifier": "1.8.0",
"webpack-visualizer-plugin": "0.1.11",
"workbox-webpack-plugin": "4.3.1",
"write-file-webpack-plugin": "4.5.0"
"write-file-webpack-plugin": "4.5.1"
},
"engines": {
"node": ">=8.9.0"
},
"lint-staged": {
"{,src/**/}*.{md,json,ts,css,scss,yml}": [
"prettier --write",
"git add"
]
},
"scripts": {
"prettier:format": "prettier --write \"{,src/**/}*.{md,json,ts,css,scss,yml}\"",
"lint": "tslint --project tsconfig.json -e 'node_modules/**'",
"lint": "eslint . --ext .js,.ts",
"lint:fix": "npm run lint -- --fix",
"ngc": "ngc -p tsconfig-aot.json",
"cleanup": "rimraf target/classes/static/ target/classes/aot",
Expand Down
Loading

0 comments on commit 45f4ce4

Please sign in to comment.