Skip to content

Commit

Permalink
Merge branch 'release/1.1.22'
Browse files Browse the repository at this point in the history
  • Loading branch information
nekofar committed Dec 4, 2023
2 parents 70596ba + 00aba1f commit 80d287d
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 66 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Set default charset and space indentation
[*.{js,ts,jsx,tsx}]
charset = utf-8
indent_style = space
indent_size = 2
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to this project will be documented in this file.

## [1.1.22] - 2023-12-04

### Miscellaneous Tasks

- Add `.editorconfig` for consistent coding style

## [1.1.21] - 2023-12-01

### Bug Fixes
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nextjs-lingui-template",
"version": "1.1.21",
"version": "1.1.22",
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -26,15 +26,15 @@
"next": "14.0.3",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-use": "17.4.1",
"react-use": "17.4.2",
"tailwind-merge": "2.0.0",
"tailwindcss": "3.3.5"
},
"devDependencies": {
"@lingui/cli": "4.5.0",
"@lingui/conf": "4.5.0",
"@lingui/conf": "4.6.0",
"@lingui/format-po": "4.5.0",
"@lingui/loader": "4.5.0",
"@lingui/loader": "4.6.0",
"@lingui/macro": "4.5.0",
"@lingui/swc-plugin": "4.0.4",
"@testing-library/jest-dom": "6.1.5",
Expand All @@ -45,7 +45,7 @@
"@types/jest": "29.5.10",
"@types/langs": "2.0.4",
"@types/lint-staged": "13.2.2",
"@types/node": "20.10.1",
"@types/node": "20.10.2",
"@types/react": "18.2.39",
"@types/react-dom": "18.2.17",
"eslint": "8.54.0",
Expand Down
Loading

0 comments on commit 80d287d

Please sign in to comment.