Skip to content

Commit

Permalink
chore: update deps (#88)
Browse files Browse the repository at this point in the history
* v1.3.2

* chore: updated lock file

* fix: husky upgrade

* fix: update gitignore

* feat: use yarn 4 & add missing deps

* fix: ci yarn install deprecated flag

* fix: ci yarn cache

* fix: ci yarn install

* fix: ci configs

* fix: e2e on ci

* fix: test disabled cache

* fix: disable yarn pnp & enable caching

* fix: update changelog
  • Loading branch information
slavikdenis authored Mar 19, 2024
1 parent 2b7f9ed commit 787fb67
Show file tree
Hide file tree
Showing 9 changed files with 13,157 additions and 9,094 deletions.
24 changes: 9 additions & 15 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,21 @@ jobs:
e2e:
# only runs this job on successful deploy
if: github.event_name == 'deployment_status' && github.event.deployment_status.state == 'success'
# The type of runner that the job will run on
runs-on: ubuntu-latest
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- name: Checkout 🛎
uses: actions/checkout@v3
# Cache node_modules
- name: Cache node_modules
id: cache-yarn
uses: actions/cache@v3
uses: actions/checkout@v4
- name: Setup Node.js & Yarn
uses: actions/setup-node@v4
with:
path: node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
# Install dependencies only when yarn.lock changes
- name: Install dependencies
if: steps.cache-yarn.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
node-version: "20"
cache: "yarn"
# Run Cypress
- name: Run Cypress 🌲
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
install: false
install-command: yarn install --immutable
env:
CYPRESS_BASE_URL: ${{ github.event.deployment_status.target_url }}
18 changes: 4 additions & 14 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,15 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Node.js & Yarn
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
cache: "yarn"
# Cache node_modules
- name: Cache node_modules
id: cache-yarn
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
# Install dependencies only when yarn.lock changes
- name: Install dependencies
if: steps.cache-yarn.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Run prettier
run: yarn prettier
- name: Run type check
Expand Down
16 changes: 15 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
/node_modules
/.pnp
.pnp.js
.pnp.*

# testing
/coverage
cypress/videos

# next.js
/.next/
Expand Down Expand Up @@ -46,3 +46,17 @@ yarn-error.log*

# tsconfig
tsconfig.tsbuildinfo

### CypressIO ###
cypress/results/*
cypress/reports/*
cypress/screenshots/*
cypress/videos/*

### yarn ###
.yarn/*
!.yarn/releases
!.yarn/patches
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
7 changes: 5 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
yarn test
yarn type-check
yarn prettier
yarn test
yarn lint
893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.1.cjs

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
yarnPath: .yarn/releases/yarn-4.1.1.cjs
nodeLinker: node-modules
39 changes: 21 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [v1.3.1](https://github.com/slavikdenis/vape-timer/compare/v1.2.0...v1.3.1)
## [v1.3.2](https://github.com/slavikdenis/vape-timer/compare/v1.1.0...v1.3.2)

### Merged

- fix: upgrade framer-motion from 10.16.16 to 10.17.9 [`#85`](https://github.com/slavikdenis/vape-timer/pull/85)
- fix: upgrade @emotion/react from 11.11.1 to 11.11.3 [`#84`](https://github.com/slavikdenis/vape-timer/pull/84)
- fix: upgrade next from 14.0.3 to 14.0.4 [`#83`](https://github.com/slavikdenis/vape-timer/pull/83)
- fix: upgrade framer-motion from 10.16.9 to 10.16.10 [`#82`](https://github.com/slavikdenis/vape-timer/pull/82)
- chore: update deps [`#81`](https://github.com/slavikdenis/vape-timer/pull/81)
- fix: upgrade @ducanh2912/next-pwa from 9.7.1 to 9.7.2 [`#80`](https://github.com/slavikdenis/vape-timer/pull/80)
- fix: upgrade next from 13.5.4 to 13.5.5 [`#79`](https://github.com/slavikdenis/vape-timer/pull/79)
- chore: dependencies upgrade [`#78`](https://github.com/slavikdenis/vape-timer/pull/78)
Expand All @@ -21,32 +26,30 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- fix: upgrade @ducanh2912/next-pwa from 9.0.1 to 9.1.1 [`#72`](https://github.com/slavikdenis/vape-timer/pull/72)
- fix: wake lock relock [`#70`](https://github.com/slavikdenis/vape-timer/pull/70)
- chore: update 1.2.0 [`#69`](https://github.com/slavikdenis/vape-timer/pull/69)
- feat: migrate from 'next-pwa' to '@ducanh2912/next-pwa' [`#68`](https://github.com/slavikdenis/vape-timer/pull/68)
- feat: version and github link in settings [`#67`](https://github.com/slavikdenis/vape-timer/pull/67)

### Commits

- chore: update deps [`a572c70`](https://github.com/slavikdenis/vape-timer/commit/a572c705bc541ec1cd86a85778d44edf5c0cce10)
- chore: update deps [`d79d400`](https://github.com/slavikdenis/vape-timer/commit/d79d400cc8f93cbc67fb40ac584e597ce81a19cf)
- feat: use yarn 4 & add missing deps [`885f964`](https://github.com/slavikdenis/vape-timer/commit/885f964b3a508a15a14c20c1a9e38fa927cecb3c)
- chore: updated lock file [`718c7e9`](https://github.com/slavikdenis/vape-timer/commit/718c7e93eed119e3a4f2c349a3b815f59ad0a743)
- fix: dep arrays [`040fd65`](https://github.com/slavikdenis/vape-timer/commit/040fd654cac2abe3a4284e7c39d536cd223a2c21)
- fix: ci configs [`29ee51b`](https://github.com/slavikdenis/vape-timer/commit/29ee51b7ffc14a46a6ef2f863927f05fbfd39110)
- chore: update README and add demo showcase [`1639777`](https://github.com/slavikdenis/vape-timer/commit/1639777a63b996e7eb20c1a973c4e10fcb6a2eae)
- Revert "Update to 1.2.0 (minor)" [`e81f4a7`](https://github.com/slavikdenis/vape-timer/commit/e81f4a73c393a2190800a44b088af666b753701a)
- Update to 1.2.0 (minor) [`3d4f8f5`](https://github.com/slavikdenis/vape-timer/commit/3d4f8f5bd0fc86d648f412356a4acdaebbb9274a)
- fix: update gitignore [`3b49e0b`](https://github.com/slavikdenis/vape-timer/commit/3b49e0b51d87f634c3a989d086f2f858947de7a9)
- fix: ci yarn cache [`60058de`](https://github.com/slavikdenis/vape-timer/commit/60058def1aedb77835ec3b2424f6f998220bb486)
- fix: disable yarn pnp & enable caching [`6927f60`](https://github.com/slavikdenis/vape-timer/commit/6927f60e4eb9fa669abea31f2d1364364f7a1b4f)
- fix: husky upgrade [`2d8c579`](https://github.com/slavikdenis/vape-timer/commit/2d8c5792437930cc0bbd24895cce52d763a82ef8)
- fix: test disabled cache [`6119761`](https://github.com/slavikdenis/vape-timer/commit/61197615027b7a4c70cf237368eda53e5e38e32a)
- fix: e2e on ci [`089867d`](https://github.com/slavikdenis/vape-timer/commit/089867d1d8b622e2a7745557dca5d376b1ab40fb)
- fix: ci yarn install deprecated flag [`0d12cca`](https://github.com/slavikdenis/vape-timer/commit/0d12ccad972f824a7088296f3f7226fcc103b742)
- fix: ci yarn install [`d30c250`](https://github.com/slavikdenis/vape-timer/commit/d30c250abe130e8c6ecc661ab856766186ccadcd)
- fix: await test [`3604f04`](https://github.com/slavikdenis/vape-timer/commit/3604f04ace5a00cfd78bb2482499e387b5f7ea96)
- fix: oops [`b9d807a`](https://github.com/slavikdenis/vape-timer/commit/b9d807a28d88ac6e713b389b0ade44bba91a8926)
- chore: use relative link to demo showcase [`2f73677`](https://github.com/slavikdenis/vape-timer/commit/2f7367711612e49835cf2e9cea1c497b47f4af72)

## [v1.2.0](https://github.com/slavikdenis/vape-timer/compare/v1.1.0...v1.2.0) - 2023-06-22

### Merged

- feat: migrate from 'next-pwa' to '@ducanh2912/next-pwa' [`#68`](https://github.com/slavikdenis/vape-timer/pull/68)
- feat: version and github link in settings [`#67`](https://github.com/slavikdenis/vape-timer/pull/67)

### Commits

- chore: update deps [`71fa068`](https://github.com/slavikdenis/vape-timer/commit/71fa06886375f64d78d8607d842da01c90a02066)
- Revert "v1.2.0" [`9532444`](https://github.com/slavikdenis/vape-timer/commit/9532444cbafdb230f805e595ccc40a484ea4418f)
- Revert "v1.2.0" [`6e603d8`](https://github.com/slavikdenis/vape-timer/commit/6e603d83b6caa6b9faa0b55afd8ce8ab123530ed)
- Revert "Update to 1.2.0 (minor)" [`e81f4a7`](https://github.com/slavikdenis/vape-timer/commit/e81f4a73c393a2190800a44b088af666b753701a)
- Update to 1.2.0 (minor) [`3d4f8f5`](https://github.com/slavikdenis/vape-timer/commit/3d4f8f5bd0fc86d648f412356a4acdaebbb9274a)

## [v1.1.0](https://github.com/slavikdenis/vape-timer/compare/v1.0.0...v1.1.0) - 2023-06-18

### Merged
Expand Down
59 changes: 32 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vape-timer",
"version": "1.3.1",
"version": "1.3.2",
"scripts": {
"dev": "next",
"build": "next build",
Expand All @@ -11,59 +11,63 @@
"test": "jest",
"test-watch": "jest --watch",
"test-coverage": "jest --coverage",
"prepare": "husky install",
"prepare": "husky",
"cypress": "cypress open",
"cypress-headless": "cypress run",
"version": "auto-changelog -p && git add CHANGELOG.md"
},
"dependencies": {
"@chakra-ui/form-control": "^2.2.0",
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/react": "^2.8.2",
"@chakra-ui/theme-tools": "^2.1.2",
"@ducanh2912/next-pwa": "^9.7.2",
"@emotion/react": "^11.11.3",
"@ducanh2912/next-pwa": "^10.2.5",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"framer-motion": "^10.17.9",
"next": "^14.0.4",
"framer-motion": "^11.0.15",
"next": "^14.1.3",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.11.0",
"@emotion/eslint-plugin": "^11.11.0",
"@next/eslint-plugin-next": "^14.0.3",
"@testing-library/jest-dom": "^6.1.5",
"@testing-library/react": "^14.1.2",
"@next/eslint-plugin-next": "^14.1.3",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/react-hooks": "^8.0.1",
"@types/dom-screen-wake-lock": "^1.0.3",
"@types/jest": "^29.5.10",
"@types/node": "^20.10.1",
"@types/react": "^18.2.39",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.30",
"@types/react": "^18.2.67",
"@types/react-dom": "^18.2.22",
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"auto-changelog": "^2.4.0",
"babel-jest": "^29.7.0",
"cypress": "^13.6.0",
"eslint": "8.54.0",
"eslint-config-next": "^14.0.3",
"eslint-config-prettier": "^9.0.0",
"cypress": "^13.7.0",
"eslint": "8.57.0",
"eslint-config-next": "^14.1.3",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-loader": "^4.0.2",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"husky": "^8.0.3",
"husky": "^9.0.11",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-localstorage-mock": "^2.4.26",
"jest-wake-lock-mock": "^1.1.0",
"lint-staged": "^15.1.0",
"prettier": "^3.1.0",
"lint-staged": "^15.2.2",
"prettier": "^3.2.5",
"react-test-renderer": "^18.2.0",
"typescript": "5.3.2"
"typescript": "5.4.2"
},
"resolutions": {
"eslint-plugin-react-hooks": "4.6.0"
},
"license": "MIT",
"husky": {
Expand All @@ -87,5 +91,6 @@
},
"engines": {
"node": ">=16"
}
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 787fb67

Please sign in to comment.