Skip to content

Commit

Permalink
Merge branch 'release/1.1.39'
Browse files Browse the repository at this point in the history
  • Loading branch information
nekofar committed Jul 15, 2024
2 parents 6ec5b54 + 9233e77 commit 62d5344
Show file tree
Hide file tree
Showing 8 changed files with 1,526 additions and 1,525 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,7 @@ updates:
- 'react-dom'
- '@types/react'
- '@types/react-dom'
# List of packages to ignore for specific update types
ignore:
- dependency-name: 'eslint'
update-types: ['version-update:semver-major']
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
# The first step is to check out the repository code
- name: Checking out repository code
uses: actions/checkout@v4.1.4 # Action for checking out a repo.
uses: actions/checkout@v4.1.7 # Action for checking out a repo.
with:
fetch-depth: 0 # Fetches all history for all branches and tags

Expand Down Expand Up @@ -55,15 +55,15 @@ jobs:

steps: # The sequence of tasks that make up a job.
- name: Checking out repository code
uses: actions/checkout@v4.1.4 # Action for checking out a repo.
uses: actions/checkout@v4.1.7 # Action for checking out a repo.

- name: Setup Node.js ${{ matrix.node-version }} Environment
uses: actions/setup-node@v4.0.2 # Action for setting up Node environment.
uses: actions/setup-node@v4.0.3 # Action for setting up Node environment.
with:
node-version: ${{ matrix.node-version }}

- name: Install pnpm package manager
uses: pnpm/action-setup@v3.0.0 # Action for setting up pnpm.
uses: pnpm/action-setup@v4.0.0 # Action for setting up pnpm.
id: pnpm-install
with:
version: ^9
Expand Down Expand Up @@ -110,13 +110,13 @@ jobs:
steps:
# Checkout the repository code
- name: Checkout code
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4.1.7
with:
fetch-depth: 0 # Fetches all history for all branches and tags

# Generate a changelog for the new release using Git
- name: Generate a changelog
uses: orhun/git-cliff-action@v3.0.2
uses: orhun/git-cliff-action@v3.2.0
id: git-cliff
with:
config: cliff.toml # The configuration file for git-cliff
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/git-flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
# Checks out the repository code under $GITHUB_WORKSPACE, so the job can access it
- name: Checkout Repository Code
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4.1.7

# This step uses the Git Flow Action to create PRs based on branch types
- name: Execute Git Flow Action
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
steps:
# Checkout the code.
- name: Checkout code
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4.1.7

# Set up Node.js environment.
- name: Set up Node.js environment
uses: actions/setup-node@v4.0.2
uses: actions/setup-node@v4.0.3

# Install pnpm package manager.
- name: Install pnpm package manager
uses: pnpm/action-setup@v3.0.0
uses: pnpm/action-setup@v4.0.0
with:
version: ^9
run_install: false
Expand Down
3 changes: 0 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

changed_files=$(git diff --name-only --staged | grep -E '\.(js|jsx|ts|tsx|mdx)$') \
&& [ -n "$changed_files" ] \
&& pnpm lingui extract --verbose --overwrite --clean "$changed_files" \
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

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

## [1.1.39] - 2024-07-15

### Miscellaneous Tasks

- Simplify pre-commit hook
- Update prepare script to use husky command only

## [1.1.38] - 2024-04-27

### Miscellaneous Tasks
Expand Down
57 changes: 29 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "nextjs-lingui-template",
"version": "1.1.38",
"version": "1.1.39",
:xa
"private": true,
"scripts": {
"dev": "next dev",
Expand All @@ -10,62 +11,62 @@
"lint": "next lint",
"test": "jest",
"typesync": "pnpx typesync || :",
"prepare": "husky install"
"prepare": "husky"
},
"dependencies": {
"@headlessui/react": "1.7.19",
"@heroicons/react": "2.1.3",
"@lingui/core": "4.10.0",
"@lingui/detect-locale": "4.10.0",
"@lingui/react": "4.10.0",
"@headlessui/react": "2.1.2",
"@heroicons/react": "2.1.5",
"@lingui/core": "4.5.0",
"@lingui/detect-locale": "4.5.0",
"@lingui/react": "4.5.0",
"autoprefixer": "10.4.19",
"clsx": "2.1.1",
"cssnano": "7.0.1",
"cssnano": "7.0.4",
"langs": "2.0.0",
"next": "14.1.4",
"postcss": "8.4.38",
"postcss": "8.4.39",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-use": "17.5.0",
"tailwind-merge": "2.3.0",
"tailwindcss": "3.4.3"
"tailwind-merge": "2.4.0",
"tailwindcss": "3.4.4"
},
"devDependencies": {
"@lingui/cli": "4.10.0",
"@lingui/conf": "4.10.0",
"@lingui/format-po": "4.10.0",
"@lingui/loader": "4.10.0",
"@lingui/macro": "4.10.0",
"@lingui/cli": "4.5.0",
"@lingui/conf": "4.5.0",
"@lingui/format-po": "4.5.0",
"@lingui/loader": "4.5.0",
"@lingui/macro": "4.5.0",
"@lingui/swc-plugin": "4.0.6",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "15.0.5",
"@testing-library/jest-dom": "6.4.6",
"@testing-library/react": "16.0.0",
"@testing-library/user-event": "14.5.2",
"@types/eslint": "8.56.10",
"@types/eslint-config-prettier": "6.11.3",
"@types/jest": "29.5.12",
"@types/langs": "2.0.5",
"@types/lint-staged": "13.3.0",
"@types/node": "20.12.7",
"@types/react": "18.3.1",
"@types/node": "20.14.10",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"eslint": "9.1.1",
"eslint": "8.57.0",
"eslint-config-next": "14.1.4",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-lingui": "0.3.0",
"eslint-plugin-tailwindcss": "3.15.1",
"eslint-plugin-unicorn": "52.0.0",
"eslint-plugin-tailwindcss": "3.17.4",
"eslint-plugin-unicorn": "54.0.0",
"husky": "9.0.11",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"lint-staged": "15.2.2",
"prettier": "3.2.5",
"lint-staged": "15.2.7",
"prettier": "3.3.2",
"prettier-plugin-jsdoc": "1.3.0",
"prettier-plugin-organize-attributes": "1.0.0",
"prettier-plugin-organize-imports": "3.2.4",
"prettier-plugin-tailwindcss": "0.5.14",
"prettier-plugin-organize-imports": "4.0.0",
"prettier-plugin-tailwindcss": "0.6.5",
"serve": "14.2.3",
"typescript": "5.4.5"
"typescript": "5.5.3"
},
"resolutions": {
"@babel/traverse": ">=7.23.2"
Expand Down
Loading

0 comments on commit 62d5344

Please sign in to comment.