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 packages #35

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
__mocks__
.github
.husky
.vscode
.build
node_modules
public
12 changes: 8 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@
},
{
"files": ["src/**/*.js"],
"extends": [
"react-app",
"react-app/jest"
]
"extends": ["react-app", "react-app/jest"],
"rules": {
"testing-library/no-render-in-setup": "warn",
"testing-library/no-wait-for-side-effects": "warn",
"testing-library/no-node-access": "warn",
"testing-library/no-debugging-utils": "warn"
}
}
],
"parserOptions": {
Expand All @@ -48,6 +51,7 @@
"react/display-name": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"import/no-unresolved": "error",
"import/no-unused-modules": [2, {
"unusedExports": true
}],
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/code-quality-pipline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '14.18'
cache: 'yarn'
cache-dependency-path: yarn.lock

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '14.18'
cache: 'yarn'
cache-dependency-path: yarn.lock

Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '14.18'
cache: 'yarn'
cache-dependency-path: yarn.lock

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '14.18'
cache: 'yarn'
cache-dependency-path: yarn.lock

Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '14.18'
cache: 'yarn'
cache-dependency-path: yarn.lock

Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '14.18'
cache: 'yarn'
cache-dependency-path: yarn.lock

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manually-triggered-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: '14.18'
cache: 'yarn'
cache-dependency-path: yarn.lock

Expand Down
11 changes: 6 additions & 5 deletions cypress/plugins/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,19 @@
const injectCodeCoverage = require('@cypress/code-coverage/task');

// eslint-disable-next-line no-unused-vars
const { lighthouse, prepareAudit } = require('@cypress-audit/lighthouse');
const { pa11y } = require('@cypress-audit/pa11y');
const lighthouseConfig = require('@cypress-audit/lighthouse');
const pa11yConfig = require('@cypress-audit/pa11y');

module.exports = (on, config) => {
// eslint-disable-next-line no-unused-vars
on('before:browser:launch', (browser = {}, launchOptions) => {
prepareAudit(launchOptions);
lighthouseConfig.prepareAudit(launchOptions);
pa11yConfig.prepareAudit(launchOptions);
});

on('task', {
lighthouse: lighthouse(),
pa11y: pa11y((pa11yReport) => {
lighthouse: lighthouseConfig.lighthouse(),
pa11y: pa11yConfig.pa11y((pa11yReport) => {
console.log(pa11yReport); // raw pa11y reports
}),
});
Expand Down
3 changes: 2 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"baseUrl": "."
}
},
"exclude": ["node_modules", "build", ".husky", ".github", "__mocks__"]
}
55 changes: 27 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
"cy:open": "cypress open",
"code:coverage:report": "./.github/scripts/generate-combine-code-coverage.sh",
"postcode:coverage:report": "nyc report --temp-dir=coverage --reporter=text-summary --reporter=lcov --report-dir=coverage",
"build": "GENERATE_SOURCEMAP=false react-scripts build",
"build": "cross-env GENERATE_SOURCEMAP=false react-scripts build",
"build:with:map": "react-scripts build",
"winBuild:prod": "set \"GENERATE_SOURCEMAP=false\" && react-scripts build",
"firebase:set:dev": "firebase use DEVELOP && firebase apps:sdkconfig web --json > ./src/utasks-configuration.json",
"firebase:local:deploy": "firebase emulators:start --only hosting:utasks-develop",
"analyze": "source-map-explorer 'build/static/js/*.js'",
Expand Down Expand Up @@ -77,53 +76,53 @@
]
},
"dependencies": {
"bootstrap": "4.5.2",
"firebase": "^9.6.1",
"moment": "^2.29.1",
"bootstrap": "5.1.3",
"firebase": "^9.8.1",
"moment": "^2.29.3",
"node-sass": "4.14.1",
"prop-types": "^15.7.2",
"prop-types": "^15.8.1",
"react": "^18.1.0",
"react-bootstrap": "2.4.0",
"react-dom": "^18.1.0",
"react-icons": "^4.3.1",
"react-router-dom": "6.3.0",
"react-scripts": "5.0.0",
"react-scripts": "5.0.1",
"uuid": "^8.3.2",
"web-vitals": "^2.1.2"
"web-vitals": "^2.1.4"
},
"devDependencies": {
"@cypress-audit/lighthouse": "^1.1.0",
"@cypress-audit/pa11y": "^1.1.0",
"@cypress-audit/lighthouse": "^1.3.0",
"@cypress-audit/pa11y": "^1.3.0",
"@cypress/code-coverage": "^3.9.12",
"@cypress/instrument-cra": "^1.4.0",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.2.0",
"@testing-library/user-event": "^14.2.0",
"babel-plugin-istanbul": "6.1.1",
"babel-plugin-module-resolver": "^4.1.0",
"babel-plugin-transform-class-properties": "6.24.1",
"cross-env": "7.0.3",
"cypress": "^9.2.0",
"cross-env": "^7.0.3",
"cypress": "^9.7.0",
"cypress-file-upload": "^5.0.8",
"dotenv-cli": "^4.1.1",
"eslint": "7.32.0",
"eslint-config-react-app": "^7.0.0",
"dotenv-cli": "^5.1.0",
"eslint": "8.16.0",
"eslint-config-react-app": "^7.0.1",
"eslint-import-resolver-babel-module": "^5.3.1",
"eslint-plugin-chai-friendly": "^0.7.1",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-import": "2.25.3",
"eslint-plugin-react": "7.28.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-react": "7.30.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-spellcheck": "^0.0.19",
"firebase-tools": "^10.0.1",
"husky": "^7.0.0",
"lint-staged": "12.1.4",
"mochawesome": "7.0.1",
"firebase-tools": "^11.0.1",
"husky": "^8.0.1",
"lint-staged": "12.4.2",
"mochawesome": "7.1.3",
"mochawesome-merge": "^4.2.0",
"mochawesome-report-generator": "^6.0.1",
"mochawesome-report-generator": "^6.2.0",
"prettier": "^2.4.1",
"react-test-renderer": "^17.0.2",
"shx": "^0.3.3",
"react-test-renderer": "^18.1.0",
"shx": "^0.3.4",
"source-map-explorer": "^2.5.2"
}
}
Loading