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 Feb 21, 2024
2 parents e034d30 + 7a78816 commit e41073c
Show file tree
Hide file tree
Showing 9 changed files with 109 additions and 101 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].1
- uses: actions/[email protected].2
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].1
- uses: actions/[email protected].2
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].1
- uses: actions/[email protected].2
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].1
- uses: actions/[email protected].2
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].1
- uses: actions/[email protected].2
with:
node-version: ${{ matrix.node_version }}
- name: 'TOOLS: configure git'
Expand Down
6 changes: 3 additions & 3 deletions generators/app/resources/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"react-native-web": "~0.19.10"
},
"devDependencies": {
"@babel/core": "^7.23.6",
"@react-native-community/cli-server-api": "13.2.0",
"@types/react": "~18.2.45",
"@babel/core": "^7.23.9",
"@react-native-community/cli-server-api": "13.5.2",
"@types/react": "~18.2.55",
"jest-expo": "^49.0.0",
"typescript": "^5.3.3"
}
Expand Down
10 changes: 5 additions & 5 deletions generators/app/templates/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"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",
"react-native-picker-select": "9.0.1",
"react-native-sectioned-multi-select": "0.10.0",
"react-redux": "8.1.3",
"redux": "4.2.1",
Expand All @@ -33,23 +33,23 @@
},
"devDependencies": {
"@react-native-community/eslint-config": "3.2.0",
"@storybook/addons": "7.6.7",
"@storybook/addons": "7.6.13",
"@storybook/react-native": "6.5.7",
"@storybook/theming": "7.6.7",
"@storybook/theming": "7.6.13",
"@testing-library/jest-native": "5.4.3",
"@testing-library/react-native": "12.4.3",
"babel-jest": "29.7.0",
"babel-preset-env": "1.7.0",
"buffer": "6.0.3",
"create-expo-app": "2.1.1",
"detox": "20.14.8",
"detox": "20.17.1",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "4.2.1",
"expect": "29.7.0",
"jest": "29.7.0",
"jest-circus": "29.7.0",
"lint-staged": "15.2.0",
"lint-staged": "15.2.2",
"mockery": "2.1.0",
"patch-package": "8.0.0",
"path-exists": "5.0.0",
Expand Down
Loading

0 comments on commit e41073c

Please sign in to comment.