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

Upgrade dependencies #122

Merged
merged 3 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/Publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
python -m build --sdist --wheel

- name: Upload to PyPI
uses: pypa/gh-action-pypi-publish@release/v1.10
uses: pypa/gh-action-pypi-publish@release/v1.12
with:
packages-dir: scraper/dist/

Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ repos:
hooks:
- id: black
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.0
rev: v0.8.3
hooks:
- id: ruff
- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.385
rev: v1.1.390
hooks:
- id: pyright
name: pyright (system)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-alpine AS zimui
FROM node:22-alpine AS zimui

WORKDIR /src
COPY zimui /src
Expand Down
8 changes: 0 additions & 8 deletions package.json

This file was deleted.

18 changes: 9 additions & 9 deletions scraper/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ dependencies = [
# use zimscraperlib pinned version once content rewriting functions have been released
"zimscraperlib @ git+https://github.com/openzim/python-scraperlib@main",
"requests==2.32.3",
"types-requests==2.32.0.20240914",
"types-requests==2.32.0.20241016",
"kiwixstorage==0.9.0",
"pydantic==2.9.1",
"pydantic==2.10.3",
"schedule==1.2.2",
"beautifulsoup4==4.12.3",
"types-beautifulsoup4==4.12.0.20240907",
"types-beautifulsoup4==4.12.0.20241020",
"lxml==5.3.0",
"tinycss2==1.3.0",
"tinycss2==1.4.0",
"pif==0.8.2",
"backoff==2.2.1",
"joblib==1.4.2",
Expand All @@ -37,12 +37,12 @@ additional-keywords = ["mindouch", "nice", "cxone", "expert"]

[project.optional-dependencies]
scripts = ["invoke==2.2.0"]
lint = ["black==24.8.0", "ruff==0.6.4"]
check = ["pyright==1.1.380"]
test = ["pytest==8.3.3", "coverage==7.6.1"]
lint = ["black==24.10.0", "ruff==0.8.3"]
check = ["pyright==1.1.390"]
test = ["pytest==8.3.4", "coverage==7.6.9"]
dev = [
"pre-commit==3.8.0",
"debugpy==1.8.5",
"pre-commit==4.0.1",
"debugpy==1.8.11",
"mindtouch2zim[scripts]",
"mindtouch2zim[lint]",
"mindtouch2zim[test]",
Expand Down
24 changes: 0 additions & 24 deletions zimui/.eslintrc.cjs

This file was deleted.

2 changes: 1 addition & 1 deletion zimui/.node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.x
22.x
31 changes: 31 additions & 0 deletions zimui/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import pluginVue from 'eslint-plugin-vue'
import vueTsEslintConfig from '@vue/eslint-config-typescript'
import pluginVitest from '@vitest/eslint-plugin'
import pluginCypress from 'eslint-plugin-cypress/flat'
import skipFormatting from '@vue/eslint-config-prettier/skip-formatting'

export default [
{
name: 'app/files-to-lint',
files: ['**/*.{ts,mts,tsx,vue}']
},

{
name: 'app/files-to-ignore',
ignores: ['**/dist/**', '**/dist-ssr/**', '**/coverage/**']
},

...pluginVue.configs['flat/essential'],
...vueTsEslintConfig(),

{
...pluginVitest.configs.recommended,
files: ['src/**/__tests__/*']
},

{
...pluginCypress.configs.recommended,
files: ['cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}', 'cypress/support/**/*.{js,ts,jsx,tsx}']
},
skipFormatting
]
56 changes: 28 additions & 28 deletions zimui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,45 @@
"test:e2e": "start-server-and-test preview http://localhost:4173 'cypress run --e2e'",
"test:e2e:dev": "start-server-and-test 'vite dev --port 4173' http://localhost:4173 'cypress open --e2e'",
"build-only": "vite build",
"type-check": "vue-tsc --build --force",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
"type-check": "vue-tsc --build",
"lint": "eslint . --fix",
"format": "prettier --write src/"
},
"dependencies": {
"@fontsource/roboto": "^5.1.0",
"pinia": "^2.1.7",
"pinia": "^2.2.6",
"resize-observer-polyfill": "^1.5.1",
"vite-plugin-vuetify": "^2.0.4",
"vue": "^3.4.29",
"vue-router": "^4.3.3",
"vuetify": "^3.7.2",
"vue": "^3.5.13",
"vue-router": "^4.4.5",
"vuetify": "^3.7.5",
"webp-hero": "^0.0.2"
},
"devDependencies": {
"@mdi/font": "^7.4.47",
"@pinia/testing": "^0.1.5",
"@rushstack/eslint-patch": "^1.8.0",
"@tsconfig/node20": "^20.1.4",
"@pinia/testing": "^0.1.7",
"@tsconfig/node22": "^22.0.0",
"@types/jsdom": "^21.1.7",
"@types/node": "^20.14.5",
"@vitejs/plugin-legacy": "^5.4.2",
"@vitejs/plugin-vue": "^5.0.5",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@types/node": "^22.9.3",
"@vitejs/plugin-legacy": "^6.0.0",
"@vitejs/plugin-vue": "^5.2.1",
"@vitest/eslint-plugin": "1.1.10",
"@vue/eslint-config-prettier": "^10.1.0",
"@vue/eslint-config-typescript": "^14.1.4",
"@vue/test-utils": "^2.4.6",
"@vue/tsconfig": "^0.5.1",
"cypress": "^13.12.0",
"eslint": "^8.57.0",
"eslint-plugin-cypress": "^3.3.0",
"eslint-plugin-vue": "^9.23.0",
"jsdom": "^24.1.0",
"npm-run-all2": "^6.2.0",
"prettier": "^3.2.5",
"start-server-and-test": "^2.0.4",
"terser": "^5.34.0",
"typescript": "~5.4.0",
"vite": "^5.3.1",
"vitest": "^1.6.0",
"vue-tsc": "^2.0.21"
"@vue/tsconfig": "^0.7.0",
"cypress": "^13.16.1",
"eslint": "^9.17.0",
"eslint-plugin-cypress": "^4.1.0",
"eslint-plugin-vue": "^9.32.0",
"jsdom": "^25.0.1",
"npm-run-all2": "^7.0.1",
"prettier": "^3.4.2",
"start-server-and-test": "^2.0.9",
"terser": "^5.37.0",
"typescript": "~5.7.2",
"vite": "^6.0.3",
"vitest": "^2.1.8",
"vue-tsc": "^2.1.10"
}
}
2 changes: 1 addition & 1 deletion zimui/src/components/HeaderBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const main = useMainStore()
onMounted(async () => {
try {
await main.fetchShared()
} catch (error) {
} catch {
main.setErrorMessage('An unexpected error occured.')
}
})
Expand Down
2 changes: 1 addition & 1 deletion zimui/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "@tsconfig/node20/tsconfig.json",
"extends": "@tsconfig/node22/tsconfig.json",
"include": [
"vite.config.*",
"vitest.config.*",
Expand Down
Loading
Loading