Skip to content

Commit

Permalink
Merge branch 'release/v0.1.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
Luphia1984 committed Jun 28, 2024
2 parents 06a32f2 + 9587122 commit 28a15e9
Show file tree
Hide file tree
Showing 257 changed files with 34,515 additions and 10,987 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ module.exports = {
'object-curly-newline': 'off',
'react/jsx-props-no-spreading': 'off',
'no-console': 'error',
'no-restricted-imports': ['error', { patterns: ['..*'] }],
'tailwindcss/no-contradicting-classname': 'error',
'tailwindcss/classnames-order': 'off',
'tailwindcss/enforces-negative-arbitrary-values': 'error',
Expand Down Expand Up @@ -90,6 +91,7 @@ module.exports = {
'object-curly-newline': 'off',
'react/jsx-props-no-spreading': 'off',
'no-console': 'error',
'no-restricted-imports': ['error', { patterns: ['..*'] }],
'tailwindcss/no-contradicting-classname': 'error',
'tailwindcss/classnames-order': 'off',
'tailwindcss/enforces-negative-arbitrary-values': 'error',
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ jobs:
# The database URL to connect to the PostgreSQL database
DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres

- name: Build next.js service
run: npm run build

- name: Run unit tests
run: npm run test
env:
# The database URL to connect to the PostgreSQL database
DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres

- name: Build next.js service
run: npm run build
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,3 @@ next-env.d.ts

# backup
*.backup

# migrations
prisma/migrations/
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iSunFA",
"version": "0.1.5",
"version": "0.1.6+1",
"private": false,
"scripts": {
"dev": "next dev",
Expand All @@ -12,7 +12,8 @@
"check-format": "prettier --ignore-path .gitignore --list-different \"**/*.+(js|jsx|ts|tsx|json)\"",
"format": "prettier --ignore-path .gitignore --write \"**/*.+(js|jsx|ts|tsx|json)\"",
"validate": "npm run test && npm run check-format && npm run lint",
"production": "next start -p 80"
"production": "next start -p 80",
"update-version": "ts-node -r tsconfig-paths/register --compiler-options '{\"module\":\"CommonJS\"}' scripts/update_version.ts && git add ."
},
"dependencies": {
"@google-cloud/storage": "^7.11.1",
Expand All @@ -26,7 +27,7 @@
"dotenv": "^16.4.5",
"eslint-config-airbnb": "^19.0.4",
"formidable": "^3.5.1",
"i18next": "^23.7.16",
"i18next": "^23.11.5",
"jest-mock-extended": "^3.0.7",
"lodash-es": "^4.17.21",
"next": "^14.2.3",
Expand All @@ -37,7 +38,7 @@
"react": "^18",
"react-apexcharts": "^1.4.1",
"react-dom": "^18",
"react-i18next": "^14.0.0",
"react-i18next": "^14.1.2",
"react-icons": "^5.0.1",
"react-pdf": "^8.0.2",
"react-toastify": "^10.0.5",
Expand Down Expand Up @@ -80,13 +81,13 @@
},
"husky": {
"hooks": {
"pre-commit": "npm run test && lint-staged"
"pre-commit": "npm run test && lint-staged && npm run update-version"
}
},
"engines": {
"node": ">=18.17.1"
},
"prisma": {
"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
"seed": "ts-node -r tsconfig-paths/register --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
}
}
}
Loading

0 comments on commit 28a15e9

Please sign in to comment.