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.

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

Update to generator-jhipster v8 #1537

Merged
merged 75 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
c58999c
v8 for files under root
hide212131 Jan 13, 2024
50bb1e1
fix prompt
hide212131 Jan 13, 2024
4d12fde
fix loadConfig
hide212131 Jan 15, 2024
6dda68c
Re-implementation of cli and generators/app (with reference to ionic …
hide212131 Jan 17, 2024
1c02f2e
move templates and resoucces
hide212131 Jan 19, 2024
26da64e
adjust yeoman-environment version
hide212131 Jan 19, 2024
90a3397
Re-implementation of generators/project-name
hide212131 Jan 19, 2024
d16ec34
fix commands.cjs
hide212131 Jan 19, 2024
bf85b75
adjust generators/app
hide212131 Jan 19, 2024
47b7a0d
Re-implementation of generators/react-native
hide212131 Jan 19, 2024
5eac40b
rename parameter names of templates
hide212131 Jan 19, 2024
265f9e2
adjust loadsh-es
hide212131 Jan 20, 2024
8f68002
adjust .eslintrc.json
hide212131 Jan 20, 2024
142d579
add detox prompt
hide212131 Jan 20, 2024
ff11eee
adjust entity-files
hide212131 Jan 25, 2024
3eb37da
adjust entityPluralFileName
hide212131 Jan 27, 2024
f6f802a
adjust replacePackageJsonVersions
hide212131 Jan 27, 2024
63adf99
adjust patchNavigationForEntity
hide212131 Jan 27, 2024
6005c2b
adjust patchEntityApi
hide212131 Jan 27, 2024
04ea0b6
adjust searchEngine
hide212131 Jan 28, 2024
4c1a5a3
adjust websocket
hide212131 Jan 28, 2024
206d8d1
Workaround for entityPluralFileName 'xxxundefined'
hide212131 Jan 28, 2024
3a55f24
remove old files
hide212131 Jan 28, 2024
6b73be6
adjust patch libs
hide212131 Jan 28, 2024
c79d329
adjust cli
hide212131 Feb 3, 2024
8389d4a
bump actions version
hide212131 Feb 3, 2024
ee1e911
adjust post writing section to allow 'jhipster -bluprint'
hide212131 Feb 3, 2024
73cc4f5
change the starting dir for generation from server to client in CICD
hide212131 Feb 3, 2024
6cb619e
fixed a bug that caused detox prompts to appear even when defaults ar…
hide212131 Feb 3, 2024
b17c332
revert version for CI
hide212131 Feb 3, 2024
ebfb9aa
fix ci client build
hide212131 Feb 3, 2024
bc1af69
adjust lint runtime error
hide212131 Feb 3, 2024
d185461
give up backward compatibility.
hide212131 Feb 3, 2024
7388dda
fix jdl errors
hide212131 Feb 3, 2024
b4de708
fix jest errors in oauth2
hide212131 Feb 3, 2024
e23ab62
forgot to delete
hide212131 Feb 3, 2024
2c42c19
adjust ios e2e ci
hide212131 Feb 3, 2024
048c4ba
adjust devDatabaseType for CI
hide212131 Feb 4, 2024
574bcf5
Merge remote-tracking branch 'zhyd1997/ci/ticket-889-1700974455106' i…
hide212131 Feb 4, 2024
c79cc96
adjust e2e entities
hide212131 Feb 4, 2024
872ac0e
adjust websocket
hide212131 Feb 4, 2024
611d832
adjust detox default enabled
hide212131 Feb 4, 2024
bb4b2d5
adjust how to generate app in CI
hide212131 Feb 4, 2024
f8b85ee
change error detection to reliable in e2e
hide212131 Feb 4, 2024
b6f0942
passed npm test
hide212131 Feb 8, 2024
d5ebf6b
Merge remote-tracking branch 'upstream/main' into jhipster-8
hide212131 Feb 8, 2024
42d6401
avoid npm test ci error
hide212131 Feb 8, 2024
b21f536
fix path in ci
hide212131 Feb 8, 2024
703584d
adjust sample-app ci
hide212131 Feb 8, 2024
eaa7cf6
refactor entity parameter
hide212131 Feb 8, 2024
14d4855
add logo
hide212131 Feb 8, 2024
ab604ce
remove unused files
hide212131 Feb 8, 2024
9f54e79
revert entity context layer
hide212131 Feb 9, 2024
6cfba42
replace deprecated properties
hide212131 Feb 9, 2024
e0a1384
update readme
hide212131 Feb 9, 2024
88b4124
Merge remote-tracking branch 'upstream/main' into jhipster-8
hide212131 Feb 23, 2024
664929c
Merge branch 'main' into jhipster-8
mshima Feb 24, 2024
f6c4331
use relative path in scripts.
mshima Feb 24, 2024
1db4902
use jhipster shared actions.
mshima Feb 24, 2024
c380b37
fix SCRIPT_DIR
mshima Feb 24, 2024
23d84fc
disable eslint at lint-staged
mshima Feb 24, 2024
ba70616
add compare step
mshima Feb 24, 2024
4e7fb1d
use node 16 at compare step
mshima Feb 24, 2024
8a652c3
Update ios.yml
mshima Feb 24, 2024
4ec84d6
Update ios.yml
mshima Feb 24, 2024
376a0ed
don’t fail on comprare failure
mshima Feb 25, 2024
b0d4f3c
convert prettierignore to partial template
mshima Feb 25, 2024
7c2a030
use prettierignore partial template
mshima Feb 25, 2024
57fa110
Delete generators/react-native/templates/.prettierrc.js.ejs
mshima Feb 29, 2024
54a7688
Merge remote-tracking branch 'upstream/main' into jhipster-8
hide212131 Feb 29, 2024
ef45141
exclude .prettierrc.js from target files
hide212131 Feb 29, 2024
3fc5614
update snapshot and test
hide212131 Feb 29, 2024
881341c
Delete generators/react-native/templates/.editorconfig.ejs
hide212131 Feb 29, 2024
b6c6b97
convert generators/react-native/templates/.gitattributes to partial t…
hide212131 Feb 29, 2024
2ab6139
convert generators/react-native/templates/.gitignore to partial template
hide212131 Feb 29, 2024
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
14 changes: 12 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true

[*]
indent_style = space
indent_size = 2

# We recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

# Change these settings to your own preference
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
64 changes: 35 additions & 29 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
{
"env": {
"node": true,
"es6": true
"es2020": true
},
"extends": ["airbnb-base", "plugin:prettier/recommended"],
"rules": {
"prettier/prettier": "error",
"indent": [2, 2, { "SwitchCase": 1 }],
"linebreak-style": 0,
"eol-last": 2,
"quotes": [2, "single", { "avoidEscape": true }],
"semi": [2, "always"],
"eqeqeq": [2, "smart"],
"no-use-before-define": [2, "nofunc"],
"no-unused-vars": [2, { "vars": "local", "args": "none" }],
"no-multi-str": 2,
"no-irregular-whitespace": 2,
"comma-dangle": "off",
"max-len": "off",
"func-names": "off",
"class-methods-use-this": "off",
"no-underscore-dangle": "off",
"no-plusplus": "off",
"no-unused-expressions": [2, { "allowShortCircuit": true, "allowTernary": true }],
"prefer-destructuring": "off",
"no-multi-assign": "off",
"no-param-reassign": "off",
"no-shadow": "off",
// remove later
"no-console": "off"
"parserOptions": {
"ecmaVersion": 11,
"sourceType": "module"
},
"overrides": [
{
"files": ["test/**/*.js"],
"env": { "mocha": true }
"files": ["**/*.spec.{c,m,}js", "test/**/*.{c,m,}js"]
}
]
],
"rules": {
"func-names": "off",
"import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
"import/no-unresolved": "off",
"import/extensions": [
"error",
"ignorePackages",
{
"mjs": "always"
}
],
"ristricted-exports": "off",
"no-restricted-syntax": [
"error",
{
"selector": "ForInStatement",
"message": "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array."
},
{
"selector": "LabeledStatement",
"message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand."
},
{
"selector": "WithStatement",
"message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize."
}
],
"no-shadow": "off"
}
}
171 changes: 150 additions & 21 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,21 +1,150 @@
# All text files should have the "lf" (Unix) line endings
* text eol=lf

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.java text
*.js text
*.css text
*.html text

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.jar binary
*.pdf binary
*.eot binary
*.ttf binary
*.gzip binary
*.gz binary
*.ai binary
*.eps binary
# This file is inspired by https://github.com/alexkaratarakis/gitattributes
#
# Auto detect text files and perform LF normalization
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
* text=auto

# The above will handle all files NOT found below
# These files are text and should be normalized (Convert crlf => lf)

*.bat text eol=crlf
*.cmd text eol=crlf
*.ps1 text eol=crlf
*.coffee text
*.css text
*.cql text
*.df text
*.ejs text
*.html text
*.java text
*.js text
*.json text
*.less text
*.properties text
*.sass text
*.scss text
*.sh text eol=lf
*.sql text
*.txt text
*.ts text
*.xml text
*.yaml text
*.yml text

# Documents
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.markdown text
*.md text
*.adoc text
*.textile text
*.mustache text
*.csv text
*.tab text
*.tsv text
*.txt text
AUTHORS text
CHANGELOG text
CHANGES text
CONTRIBUTING text
COPYING text
copyright text
*COPYRIGHT* text
INSTALL text
license text
LICENSE text
NEWS text
readme text
*README* text
TODO text

# Graphics
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.tif binary
*.tiff binary
*.ico binary
# SVG treated as an asset (binary) by default. If you want to treat it as text,
# comment-out the following line and uncomment the line after.
*.svg binary
#*.svg text
*.eps binary

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.class binary
*.jar binary
*.war binary

## LINTERS
.csslintrc text
.eslintrc text
.jscsrc text
.jshintrc text
.jshintignore text
.stylelintrc text

## CONFIGS
*.conf text
*.config text
.editorconfig text
.gitattributes text
.gitconfig text
.gitignore text
.htaccess text
*.npmignore text

## HEROKU
Procfile text
.slugignore text

## AUDIO
*.kar binary
*.m4a binary
*.mid binary
*.midi binary
*.mp3 binary
*.ogg binary
*.ra binary

## VIDEO
*.3gpp binary
*.3gp binary
*.as binary
*.asf binary
*.asx binary
*.fla binary
*.flv binary
*.m4v binary
*.mng binary
*.mov binary
*.mp4 binary
*.mpeg binary
*.mpg binary
*.swc binary
*.swf binary
*.webm binary

## ARCHIVES
*.7z binary
*.gz binary
*.rar binary
*.tar binary
*.zip binary

## FONTS
*.ttf binary
*.eot binary
*.otf binary
*.woff binary
*.woff2 binary
18 changes: 8 additions & 10 deletions .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,27 @@ jobs:
strategy:
fail-fast: false
matrix:
node_version: [16.x]
node_version: [20.x]
app_type:
- JwtDtoWebsocketsApp
- OauthFlickrApp
- OauthHealthPointsApp
- JwtDtoWebsocketsAppV6
include:
- app_type: JwtDtoWebsocketsApp
auth_type: jwt
dto: true
websockets: true
jhipster_version: 7
jhipster_version: 8
- app_type: OauthFlickrApp
auth_type: oauth2
dto: false
entity_jdl: entities-flickr2.jdl
jhipster_version: 7
jhipster_version: 8
- app_type: OauthHealthPointsApp
auth_type: oauth2
dto: false
entity_jdl: entities-21points.jdl
jhipster_version: 7
- app_type: JwtDtoWebsocketsAppV6
auth_type: jwt
dto: true
websockets: true
jhipster_version: 6
jhipster_version: 8
env:
JHI_REACT_NATIVE_APP_NAME: ${{ matrix.app_type }}
JHI_AUTH_TYPE: ${{ matrix.auth_type }}
Expand All @@ -61,6 +55,10 @@ jobs:
PLATFORM: ios
steps:
- uses: actions/[email protected]
- uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: '21.x'
- run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
- uses: actions/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
node-version: 16.x
node-version: 20.x
- run: git --no-pager log -n 10 --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue) <%an>%Creset' --abbrev-commit
- name: Config git variables
env:
Expand All @@ -37,5 +37,5 @@ jobs:
run: npm run test
- name: check-dependencies
run: |
cd generators/app/resources/expo
cd generators/react-native/resources/expo
npm run check-dependencies
Loading
Loading