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

Develop #15

Merged
merged 30 commits into from
Mar 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
2fd54f1
only run workflow on pull request
y3owk1n Mar 21, 2023
4211a48
Merge branch 'main' into develop
y3owk1n Mar 21, 2023
e3690e7
updated from build to ci instead
y3owk1n Mar 21, 2023
4601fe5
updated formatting for workflow
y3owk1n Mar 23, 2023
64711be
bump @vercel/og to 0.4.1
y3owk1n Mar 23, 2023
817931d
test on action format runner
y3owk1n Mar 23, 2023
52224e6
Merge branch 'main' into develop
y3owk1n Mar 23, 2023
d2f0934
added permissions for workflows
y3owk1n Mar 23, 2023
02a5f9a
Apply formatting changes
y3owk1n Mar 23, 2023
8381e9f
updated commit message for workflow
y3owk1n Mar 23, 2023
61046c0
updated ci with separate steps
y3owk1n Mar 23, 2023
3de126e
Merge branch 'main' into develop
y3owk1n Mar 23, 2023
cf0a152
fix ci if present bug
y3owk1n Mar 23, 2023
7bfc4f1
updated tsconfig to include contentlayer
y3owk1n Mar 23, 2023
578d147
reverted back to yarn ci
y3owk1n Mar 23, 2023
db927ab
ci cache to yarn
y3owk1n Mar 23, 2023
65c4922
ci move yarn cache to after node installation
y3owk1n Mar 23, 2023
5f8889f
removed yarn cache actions
y3owk1n Mar 23, 2023
735e7e7
added next cache
y3owk1n Mar 23, 2023
cf8b0ab
fixed eslint issue
y3owk1n Mar 23, 2023
df6a9cd
fix input margin bug
y3owk1n Mar 23, 2023
4975010
added jsdocs for the whole project
y3owk1n Mar 23, 2023
c797302
updated node and prettier package
y3owk1n Mar 24, 2023
3d644e7
updated packages to latest
y3owk1n Mar 25, 2023
dd9340e
added yaml lint and formatting
y3owk1n Mar 25, 2023
afccd1a
Merge branch 'main' into develop
y3owk1n Mar 25, 2023
86fc8cf
Apply formatting & yarn cache changes
y3owk1n Mar 25, 2023
bb8d801
formatted yarnrc
y3owk1n Mar 25, 2023
dcb2537
Apply formatting & yarn cache changes
y3owk1n Mar 25, 2023
32b2479
ignore yml for prettier format
y3owk1n Mar 25, 2023
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
14 changes: 2 additions & 12 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,25 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

---
name: Node.js CI

# yamllint disable-line rule:truthy
on:
pull_request:
branches: ["main"]

jobs:
build:
runs-on: ubuntu-latest

permissions:
# Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.
contents: write

strategy:
matrix:
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: "yarn"

- uses: jongwooo/next-cache@v1

- run: yarn install --immutable
- run: yarn ci --if-present
- run: yarn format
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ public

.yarn/*

*.yml

.contentlayer/*
3 changes: 3 additions & 0 deletions .yamlfmt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
formatter:
type: basic
include_document_start: true
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 1 addition & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.4.1.cjs
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@
"next-themes": "^0.2.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.43.7",
"react-hook-form": "^7.43.8",
"react-icons": "^4.8.0",
"sharp": "^0.31.3",
"sharp": "^0.32.0",
"tailwind-merge": "^1.10.0",
"tailwindcss-animate": "^1.0.5",
"zod": "^3.21.4",
"zod-validation-error": "^1.1.0"
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "^3.7.1",
"@ianvs/prettier-plugin-sort-imports": "^3.7.2",
"@next/eslint-plugin-next": "^13.2.4",
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/line-clamp": "^0.4.2",
"@tailwindcss/typography": "^0.5.9",
"@types/node": "^18.15.7",
"@types/node": "^18.15.8",
"@types/prettier": "^2.7.2",
"@types/react": "^18.0.28",
"@types/react": "^18.0.29",
"@types/react-dom": "^18.0.11",
"@types/unist": "^2.0.6",
"@typescript-eslint/eslint-plugin": "^5.56.0",
Expand Down
65 changes: 38 additions & 27 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,9 @@ __metadata:
languageName: node
linkType: hard

"@ianvs/prettier-plugin-sort-imports@npm:^3.7.1":
version: 3.7.1
resolution: "@ianvs/prettier-plugin-sort-imports@npm:3.7.1"
"@ianvs/prettier-plugin-sort-imports@npm:^3.7.2":
version: 3.7.2
resolution: "@ianvs/prettier-plugin-sort-imports@npm:3.7.2"
dependencies:
"@babel/core": ^7.17.7
"@babel/generator": ^7.17.7
Expand All @@ -783,7 +783,7 @@ __metadata:
peerDependenciesMeta:
"@vue/compiler-sfc":
optional: true
checksum: a08c9c1ce7da39f4575c2022f339378ffd9064cbf3bef51bdc9ae777ed966d688830023b061e89bb5997070406880c4709b6ff70537043caf39121d56251b5b7
checksum: 181e169cf1f9c16ab978f3e1462f6063b66e089d1b62767bdee3034d36828b00a77845e6cc3ae897d9c04afad9870f2638e4d4a09e42b3ae558c9c7119cb8a4e
languageName: node
linkType: hard

Expand Down Expand Up @@ -2891,10 +2891,10 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^18.15.7":
version: 18.15.7
resolution: "@types/node@npm:18.15.7"
checksum: 08d1dd1898be10cd274955ed7f491bcab5b7e70ce66b6a1e996a582d5467f7517046b0d9c5f4e15871df94dd72d1ad9e7be236d2cff1a1450ec906d7fa3062d2
"@types/node@npm:^18.15.8":
version: 18.15.8
resolution: "@types/node@npm:18.15.8"
checksum: 795695b9f5bbfaea864261d3179da530dbe8c615bd525d6afcaa0d508f0b73f252507b54c735b1d744932677e30f55161bbe9b78487a60bd6a93b2d03027d30d
languageName: node
linkType: hard

Expand Down Expand Up @@ -2942,7 +2942,7 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.0.28":
"@types/react@npm:*, @types/react@npm:>=16":
version: 18.0.28
resolution: "@types/react@npm:18.0.28"
dependencies:
Expand All @@ -2953,6 +2953,17 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:^18.0.29":
version: 18.0.29
resolution: "@types/react@npm:18.0.29"
dependencies:
"@types/prop-types": "*"
"@types/scheduler": "*"
csstype: ^3.0.2
checksum: 75f56f81d80a1c15ee3fcd2039bdc5f7a70f49cf69827ee0fc8beece9809b234f245dd62552e91018d8f25792986bd513b44caf054554d5c5eb979a5f9460214
languageName: node
linkType: hard

"@types/resolve@npm:^1.17.1":
version: 1.20.2
resolution: "@types/resolve@npm:1.20.2"
Expand Down Expand Up @@ -3555,7 +3566,7 @@ __metadata:
resolution: "blog@workspace:."
dependencies:
"@heroicons/react": ^2.0.16
"@ianvs/prettier-plugin-sort-imports": ^3.7.1
"@ianvs/prettier-plugin-sort-imports": ^3.7.2
"@next/eslint-plugin-next": ^13.2.4
"@radix-ui/react-accordion": ^1.1.1
"@radix-ui/react-alert-dialog": ^1.0.3
Expand Down Expand Up @@ -3597,9 +3608,9 @@ __metadata:
"@tiptap/pm": ^2.0.0-beta.220
"@tiptap/react": ^2.0.0-beta.220
"@tiptap/starter-kit": ^2.0.0-beta.220
"@types/node": ^18.15.7
"@types/node": ^18.15.8
"@types/prettier": ^2.7.2
"@types/react": ^18.0.28
"@types/react": ^18.0.29
"@types/react-dom": ^18.0.11
"@types/unist": ^2.0.6
"@typescript-eslint/eslint-plugin": ^5.56.0
Expand All @@ -3624,15 +3635,15 @@ __metadata:
prettier-plugin-tailwindcss: ^0.2.5
react: 18.2.0
react-dom: 18.2.0
react-hook-form: ^7.43.7
react-hook-form: ^7.43.8
react-icons: ^4.8.0
rehype-autolink-headings: ^6.1.1
rehype-pretty-code: ^0.9.4
rehype-slug: ^5.1.0
remark: ^14.0.2
remark-code-import: ^1.1.1
remark-gfm: ^3.0.1
sharp: ^0.31.3
sharp: ^0.32.0
shiki: ^0.14.1
tailwind-merge: ^1.10.0
tailwindcss: ^3.2.7
Expand Down Expand Up @@ -7801,12 +7812,12 @@ __metadata:
languageName: node
linkType: hard

"node-addon-api@npm:^5.0.0":
version: 5.1.0
resolution: "node-addon-api@npm:5.1.0"
"node-addon-api@npm:^6.0.0":
version: 6.0.0
resolution: "node-addon-api@npm:6.0.0"
dependencies:
node-gyp: latest
checksum: 2508bd2d2981945406243a7bd31362fc7af8b70b8b4d65f869c61731800058fb818cc2fd36c8eac714ddd0e568cc85becf5e165cebbdf7b5024d5151bbc75ea1
checksum: a34a901b9f0d6d201a173e12ed378033e4e0f27f77fd27c225dc7e6f96e88a88e94bd78b2b0404fc95deee20a137f1cbfc92738cbfba38862ed9b6c2e61c1ab2
languageName: node
linkType: hard

Expand Down Expand Up @@ -8814,12 +8825,12 @@ __metadata:
languageName: node
linkType: hard

"react-hook-form@npm:^7.43.7":
version: 7.43.7
resolution: "react-hook-form@npm:7.43.7"
"react-hook-form@npm:^7.43.8":
version: 7.43.8
resolution: "react-hook-form@npm:7.43.8"
peerDependencies:
react: ^16.8.0 || ^17 || ^18
checksum: c1679fc5119f3f910f30424b846f9a05ecbc9cce1c7408e4e8eb907aa5a4366d5228a7b41d818868c85017f2be4e1854a1536ba5c1cddf2c27818bd045df9589
checksum: 1042b68950e1756dd907e7eb904c6efdf04f126a48797b25e8793705d930f7bbff2cc07f0ec7ea4c52272e808a359ae157742c551defa3b3fd0952ff414bd3e3
languageName: node
linkType: hard

Expand Down Expand Up @@ -9342,20 +9353,20 @@ __metadata:
languageName: node
linkType: hard

"sharp@npm:^0.31.3":
version: 0.31.3
resolution: "sharp@npm:0.31.3"
"sharp@npm:^0.32.0":
version: 0.32.0
resolution: "sharp@npm:0.32.0"
dependencies:
color: ^4.2.3
detect-libc: ^2.0.1
node-addon-api: ^5.0.0
node-addon-api: ^6.0.0
node-gyp: latest
prebuild-install: ^7.1.1
semver: ^7.3.8
simple-get: ^4.0.1
tar-fs: ^2.1.1
tunnel-agent: ^0.6.0
checksum: 29fd1dfbc616c6389f53f366cec342b4353d9f2a37e98952ca273db38dca57dfa0f336322d6d763f0fae876042ead22fd86ffe26d70c32ade2458d421db60d04
checksum: 82c6046038f45f1fdeb732cff8be6a8a3fb5eb25f46f4c3ecb4b71363c2c387b52de8c0c5c4674f2400663e467b8a7b93dbc5d70b3f0e145cb45fc27d39c5709
languageName: node
linkType: hard

Expand Down