Skip to content

Commit

Permalink
Merge branch 'master' into feat/language-switching
Browse files Browse the repository at this point in the history
  • Loading branch information
marluanespiritusanto authored May 15, 2024
2 parents 606a2a8 + 25700b5 commit 7c95f16
Show file tree
Hide file tree
Showing 7 changed files with 830 additions and 118 deletions.
29 changes: 8 additions & 21 deletions .github/workflows/ci-check-linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,13 @@ jobs:
- name: Checkout Code Repository
uses: actions/[email protected]
with:
# Full git history is needed to get a proper
# list of changed files within `super-linter`
fetch-depth: 0

- name: Lint Code Base
uses: super-linter/super-linter/[email protected]
env:
VALIDATE_ALL_CODEBASE: false
VALIDATE_SHELL_SHFMT: false
VALIDATE_JSCPD: false
VALIDATE_CSS: false
VALIDATE_EDITORCONFIG: false
VALIDATE_MARKDOWN: false
# TODO: hadolint can be activated after this PR is accepted, merged and a new version is tagged https://github.com/github/super-linter/pull/3500
VALIDATE_DOCKERFILE_HADOLINT: false
LINTER_RULES_PATH: /
JAVASCRIPT_DEFAULT_STYLE: prettier
TYPESCRIPT_DEFAULT_STYLE: prettier
TYPESCRIPT_ES_LINTER_RULES: .eslintrc.json
TYPESCRIPT_STANDARD_TSCONFIG_LINTER_RULES: tsconfig.json
LOG_LEVEL: ERROR
DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: pnpm/[email protected]
with:
version: 8

- name: Run linter
run: |
pnpm install
pnpm lint
4 changes: 2 additions & 2 deletions .github/workflows/ci-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:

- name: Install and Build
run: |
pnpm install --frozen-lockfile
pnpm build
pnpm install
pnpm test
env:
NODE_OPTIONS: "--max_old_space_size=4096"
8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"start": "next start",
"lint": "next lint",
"commitlint": "commitlint --edit",
"serve": "node server.js"
"serve": "node server.js",
"test": "vitest"
},
"engines": {
"npm": ">=10.1.0 <11.0.0",
Expand Down Expand Up @@ -50,7 +51,7 @@
"eslint-config-next": "^13.5.6",
"hibp": "^13.0.0",
"negotiator": "^0.6.3",
"next": "^13.5.6",
"next": "^14.1.1",
"next-recaptcha-v3": "^1.3.0",
"react": "^18.2.0",
"react-gtm-module": "^2.0.11",
Expand Down Expand Up @@ -80,6 +81,7 @@
"husky": "^8.0.3",
"install-peers": "^1.0.4",
"lint-staged": "^15.1.0",
"prettier": "^3.0.3"
"prettier": "^3.0.3",
"vitest": "^1.6.0"
}
}
Loading

0 comments on commit 7c95f16

Please sign in to comment.