Skip to content

Commit

Permalink
Merge branch 'main' into ci/ticket-889-1700974455106
Browse files Browse the repository at this point in the history
  • Loading branch information
zhyd1997 authored Dec 21, 2023
2 parents e465372 + 612019d commit d89acdd
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
steps:
- uses: actions/[email protected]
- 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].0
- uses: actions/[email protected].1
with:
node-version: ${{ matrix.node_version }}
- run: $SCRIPT_DIR/git-config.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
os: [ubuntu-latest]
steps:
- uses: actions/[email protected]
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version: ${{ matrix.node_version }}
- 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
distribution: 'adopt'
java-version: '11.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].0
- uses: actions/[email protected].1
with:
node-version: ${{ matrix.node_version }}
- run: $SCRIPT_DIR/git-config.sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version: 16
registry-url: https://registry.npmjs.org/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sample-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
path: sample-app
- name: 'SETUP: git history'
run: cd generator-jhipster-react-native && 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].0
- uses: actions/[email protected].1
with:
node-version: ${{ matrix.node_version }}
- name: 'TOOLS: configure git'
Expand Down
14 changes: 7 additions & 7 deletions generators/app/templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"querystringify": "2.2.0",
"ramda": "0.29.1",
"react-dom": "18.2.0",
"react-datepicker": "4.24.0",
"react-datepicker": "4.25.0",
"react-native-keyboard-aware-scroll-view": "0.9.5",
"react-native-modal-datetime-picker": "17.1.0",
"react-native-picker-select": "9.0.0",
Expand All @@ -29,21 +29,21 @@
"seamless-immutable": "7.1.4",
"sockjs-client": "1.6.1",
"webstomp-client": "1.2.6",
"yup": "1.3.2"
"yup": "1.3.3"
},
"devDependencies": {
"@react-native-community/eslint-config": "3.2.0",
"@storybook/addons": "7.6.4",
"@storybook/addons": "7.6.6",
"@storybook/react-native": "6.5.7",
"@storybook/theming": "7.6.4",
"@storybook/theming": "7.6.6",
"@testing-library/jest-native": "5.4.3",
"@testing-library/react-native": "12.4.1",
"@testing-library/react-native": "12.4.2",
"babel-jest": "29.7.0",
"babel-preset-env": "1.7.0",
"buffer": "6.0.3",
"create-expo-app": "2.1.1",
"detox": "20.14.1",
"eslint": "8.55.0",
"detox": "20.14.3",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "4.2.1",
"expect": "29.7.0",
Expand Down
60 changes: 30 additions & 30 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@
"devDependencies": {
"chai": "4.3.10",
"ejs-lint": "2.0.0",
"eslint": "8.55.0",
"eslint": "8.56.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-prettier": "4.2.1",
"husky": "8.0.3",
"jsdoc": "4.0.2",
Expand Down

0 comments on commit d89acdd

Please sign in to comment.