Skip to content

Commit 7cddd9b

Browse files
authored
Merge pull request #117 from kailash360/upgrade-dependencies
Upgraded dependencies
2 parents 9bbff35 + b52df82 commit 7cddd9b

25 files changed

+170
-140
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
name: Bug report
33
about: Create a report to help us improve
4-
title: ""
5-
labels: "Type: Bug"
6-
assignees: ""
4+
title: ''
5+
labels: 'Type: Bug'
6+
assignees: ''
77
---
88

99
## Describe the bug

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
blank_issues_enabled: true
1+
blank_issues_enabled: true

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
name: Feature request
33
about: Suggest an idea for this project
4-
title: ""
5-
labels: "Type: Enhancement"
6-
assignees: ""
4+
title: ''
5+
labels: 'Type: Enhancement'
6+
assignees: ''
77
---
88

99
## Is your feature request related to a problem? Please describe.

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
node-version: [14.x]
12+
node-version: [16.x]
1313

1414
steps:
1515
- name: Checkout repository code
@@ -29,7 +29,7 @@ jobs:
2929

3030
- name: Install node modules
3131
if: steps.cache-node-modules.outputs.cache-hit != 'true'
32-
run: npm install
32+
run: npm install -f
3333

3434
- name: Build the site
3535
run: |

.github/workflows/github-ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919

2020
- name: Install node_modules
2121
if: steps.cache-node-modules.outputs.cache-hit != 'true'
22-
run: npm install
22+
run: npm install -f
2323

2424
- name: Test SCSS
2525
run: npm run test:scss
26-
26+
2727
- name: Test JS
2828
run: npm run test:js
2929

@@ -40,10 +40,11 @@ jobs:
4040
- name: Create config.json
4141
run: echo $TEST_CONFIG_JSON > src/config.json
4242
env:
43-
TEST_CONFIG_JSON: "{ \"apiURL\": \"http://localhost:1337\", \"APP_ENV\": \"prod\" }"
43+
TEST_CONFIG_JSON: '{ "apiURL": "http://localhost:1337", "APP_ENV": "prod" }'
4444

4545
- name: Test Cypress
4646
uses: cypress-io/github-action@v2
4747
with:
48+
install-command: npm i -f
4849
start: npm start
4950
wait-on: 'http://localhost:3000'

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ The goal of **User Story** is to design and present a scalable backend infrastru
1717

1818
### Setting up the project
1919

20-
After cloning this repository you will need to install all the dependencies: `npm i`
21-
22-
**NOTE**: `"node-sass": "^4.13.1"` requires `node v13.x.x` according to this [stackoverflow](https://stackoverflow.com/questions/60394291/error-node-modules-node-sass-command-failed) answer. You can use `nvm` to manage multiple node versions. Follow this [tutorial](https://www.loginradius.com/blog/async/run-multiple-nodejs-version-on-the-same-machine/) to setup nvm.
20+
After cloning this repository you will need to install all the dependencies: `npm i -f`
2321

2422
User Story uses [this repository](https://github.com/EOS-uiux-Solutions/strapi) as its `backend`. There are two ways to set up the `backend`:
2523

cypress.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,5 @@
88
"testStoryProduct": "EOS Icons",
99
"testCategory": "Documentation"
1010
},
11-
"testFiles": [
12-
"user_story.spec.js",
13-
"test_filters.spec.js"
14-
]
11+
"testFiles": ["user_story.spec.js", "test_filters.spec.js"]
1512
}

cypress/integration/test_filters.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ describe('Test the filters and search for stories in Home page', () => {
88
}
99

1010
const selectProduct = (productName) => {
11-
cy.get(`[data-cy=${productName.split(' ').join('-')}-card]`)
12-
.click({ force: true })
11+
cy.get(`[data-cy=${productName.split(' ').join('-')}-card]`).click({
12+
force: true
13+
})
1314
}
1415

1516
const setDropdown = (dropdown, value) => {

package.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,49 @@
44
"private": false,
55
"homepage": "https://userstory.eosdesignsystem.com/",
66
"dependencies": {
7-
"@reach/router": "^1.2.1",
8-
"@testing-library/jest-dom": "^4.2.4",
9-
"@testing-library/react": "^9.5.0",
10-
"@testing-library/user-event": "^7.2.1",
11-
"axios": "^0.19.2",
12-
"better-docs": "^2.0.1",
13-
"eos-icons-react": "^2.1.1",
14-
"i18next": "^19.4.5",
7+
"@reach/router": "^1.3.4",
8+
"@testing-library/jest-dom": "^5.16.1",
9+
"@testing-library/react": "^12.1.2",
10+
"@testing-library/user-event": "^13.5.0",
11+
"axios": "^0.25.0",
12+
"better-docs": "^2.7.1",
13+
"eos-icons-react": "^2.2.0",
14+
"i18next": "^21.6.7",
1515
"lodash": "^4.17.21",
16-
"markdown-it": "^12.0.6",
16+
"markdown-it": "^12.3.2",
1717
"moment": "^2.29.1",
18-
"node-sass": "^4.13.1",
19-
"react": "^16.13.1",
20-
"react-dom": "^16.13.1",
21-
"react-dropzone": "^11.0.1",
18+
"node-sass": "^7.0.1",
19+
"react": "^17.0.2",
20+
"react-dom": "^17.0.2",
21+
"react-dropzone": "^11.5.1",
2222
"react-helmet": "^6.1.0",
23-
"react-hook-form": "^6.3.2",
24-
"react-i18next": "^11.5.0",
25-
"react-image-gallery": "^1.2.5",
26-
"react-loading-skeleton": "^2.2.0",
27-
"react-markdown": "^5.0.2",
28-
"react-markdown-editor-lite": "^1.2.4",
29-
"react-mentions": "^4.3.0",
23+
"react-hook-form": "^7.25.0",
24+
"react-i18next": "^11.15.3",
25+
"react-image-gallery": "^1.2.7",
26+
"react-loading-skeleton": "^3.0.2",
27+
"react-markdown": "^8.0.0",
28+
"react-markdown-editor-lite": "^1.3.2",
29+
"react-mentions": "^4.3.1",
3030
"react-promise-tracker": "^2.1.0",
31-
"react-router-dom": "^5.2.0",
32-
"react-scripts": "3.4.1",
31+
"react-router-dom": "^6.2.1",
32+
"react-scripts": "5.0.0",
3333
"react-share": "^4.4.0"
3434
},
3535
"devDependencies": {
36-
"cypress": "^4.12.1",
37-
"eslint": "^6.8.0",
38-
"eslint-config-prettier": "^6.10.1",
39-
"eslint-config-standard": "^14.1.1",
40-
"eslint-plugin-cypress": "^2.11.3",
41-
"eslint-plugin-import": "^2.20.2",
36+
"cypress": "^9.3.1",
37+
"eslint": "^8.7.0",
38+
"eslint-config-prettier": "^8.3.0",
39+
"eslint-config-standard": "^16.0.3",
40+
"eslint-plugin-cypress": "^2.12.1",
41+
"eslint-plugin-import": "^2.25.4",
4242
"eslint-plugin-node": "^11.1.0",
43-
"eslint-plugin-prettier": "^3.1.3",
44-
"eslint-plugin-promise": "^4.2.1",
45-
"eslint-plugin-react": "^7.19.0",
46-
"eslint-plugin-standard": "^4.0.1",
47-
"husky": "^4.2.5",
48-
"prettier": "^2.0.5",
49-
"sass-lint": "^1.12.1"
43+
"eslint-plugin-prettier": "^4.0.0",
44+
"eslint-plugin-promise": "^6.0.0",
45+
"eslint-plugin-react": "^7.28.0",
46+
"eslint-plugin-standard": "^4.1.0",
47+
"husky": "^7.0.4",
48+
"prettier": "^2.5.1",
49+
"sass-lint": "^1.13.1"
5050
},
5151
"scripts": {
5252
"start": "react-scripts start",
@@ -80,4 +80,4 @@
8080
"last 1 safari version"
8181
]
8282
}
83-
}
83+
}

src/assets/scss/components/comments.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
}
3131

3232
.btn-comment-edit {
33-
margin:2% 0;
33+
margin: 2% 0;
3434
}
3535

3636
.comment-form {

0 commit comments

Comments
 (0)