Skip to content

Commit

Permalink
chore(deps/ui): upgrade deps for frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
qwqcode committed Aug 17, 2024
1 parent 0803e23 commit 08f58cd
Show file tree
Hide file tree
Showing 54 changed files with 2,601 additions and 4,013 deletions.
2 changes: 1 addition & 1 deletion .circleci/conditional_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ executors:
- image: cimg/base:stable
node:
docker:
- image: "cimg/node:20.14.0"
- image: "cimg/node:20.16.0"
go:
docker:
- image: cimg/go:1.22.3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9.2.0
version: 9.7.1

- name: Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
version: 9.2.0
version: 9.7.1

- name: Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-cn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
version: 9.2.0
version: 9.7.1

- name: Setup node
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Use pnpm
uses: pnpm/action-setup@v4
with:
version: 9.2.0
version: 9.7.1

- name: Use Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: pnpm/action-setup@v4
with:
version: 9.2.0
version: 9.7.1

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v4
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ docs/swagger/swagger.yaml
docs/**
ui/artalk-sidebar/src/lib/md5.js
ui/artalk/src/lib/detect.ts
**/dist/**
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ cd Artalk

To develop Artalk, both frontend and backend, install the following tools:

- [Node.js](https://nodejs.org/en/) (>= 20.14.0)
- [PNPM](https://pnpm.io/) (>= 9.2.0)
- [Node.js](https://nodejs.org/en/) (>= 20.16.0)
- [PNPM](https://pnpm.io/) (>= 9.7.1)
- [Go](https://golang.org/) (>= 1.22)
- [Docker](https://www.docker.com/) (>= 20.10.0) (optional)
- [Docker Compose](https://docs.docker.com/compose/) (>= 1.29.0) (optional)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ARG SKIP_UI_BUILD=false
RUN set -ex \
&& if [ "$SKIP_UI_BUILD" = "false" ]; then \
apk add --no-cache nodejs npm \
&& npm install -g pnpm@9.2.0 \
&& npm install -g pnpm@9.7.1 \
;fi

RUN set -ex \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.8'
version: "3.8"
services:
artalk:
container_name: artalk
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/develop/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ cd Artalk

为了开发 Artalk 的前端和后端,请安装以下工具:

- [Node.js](https://nodejs.org/en/) (>= 20.14.0)
- [PNPM](https://pnpm.io/) (>= 9.2.0)
- [Node.js](https://nodejs.org/en/) (>= 20.16.0)
- [PNPM](https://pnpm.io/) (>= 9.7.1)
- [Go](https://golang.org/) (>= 1.22)
- [Docker](https://www.docker.com/) (>= 20.10.0)(可选)
- [Docker Compose](https://docs.docker.com/compose/) (>= 1.29.0)(可选)
Expand Down
11 changes: 5 additions & 6 deletions docs/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
"devDependencies": {
"artalk": "workspace:^",
"markdown-it-for-inline": "^2.0.1",
"sass": "^1.76.0",
"vitepress": "1.1.4"
"vitepress": "1.3.2"
},
"dependencies": {
"@artalk/plugin-katex": "^0.1.9",
"@artalk/plugin-lightbox": "^0.2.1",
"katex": "^0.16.10",
"@artalk/plugin-katex": "^0.2.0",
"@artalk/plugin-lightbox": "^0.2.2",
"katex": "^0.16.11",
"lightgallery": "^2.7.2",
"vue": "^3.4.26"
"vue": "^3.4.38"
}
}
9 changes: 3 additions & 6 deletions docs/landing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,11 @@
"normalize.css": "^8.0.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-icons": "5.0.1"
"react-icons": "5.3.0"
},
"devDependencies": {
"@types/react": "^18.3.1",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react-swc": "^3.6.0",
"sass": "^1.76.0",
"typescript": "^5.4.5",
"vite": "^5.2.11"
"@vitejs/plugin-react-swc": "^3.7.0"
}
}
3 changes: 2 additions & 1 deletion docs/landing/src/components/Reveal.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.reveal {
opacity: 0;

@keyframes fadeInUp {
0% {
opacity: 0;
Expand All @@ -10,7 +12,6 @@
transform: translateZ(0);
}
}
opacity: 0;

&.animate {
animation-name: fadeInUp;
Expand Down
6 changes: 3 additions & 3 deletions docs/landing/src/responsive.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ $breakpoints: (sm: 640px, md: 768px, lg: 1024px, xl: 1280px, xxl: 1536px);
transform: translateX(0) !important;

.item {
width: 100%;
padding: 30px 40px;

&:not(:last-child) {
margin-bottom: 40px;
}

width: 100%;
padding: 30px 40px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion docs/swagger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"swagger:build-http-client": "npx swagger-typescript-api -n v2 -p ./swagger.json -o ../../ui/artalk/src/api --responses --sort-types"
},
"devDependencies": {
"@redocly/cli": "1.12.0"
"@redocly/cli": "1.19.0"
}
}
27 changes: 6 additions & 21 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
import path from 'node:path'
import url from 'node:url'
import { fixupPluginRules } from '@eslint/compat'
// eslint-disable-next-line import-x/namespace
import { FlatCompat } from '@eslint/eslintrc'
import pluginCompat from 'eslint-plugin-compat'
import eslintJs from '@eslint/js'
import pluginTS from '@typescript-eslint/eslint-plugin'
import eslintConfigPrettier from 'eslint-config-prettier'
import pluginFunctional from 'eslint-plugin-functional/flat'
import pluginImportX from 'eslint-plugin-import-x'
import pluginReact from 'eslint-plugin-react'
import pluginReactHooks from 'eslint-plugin-react-hooks'
Expand All @@ -20,27 +18,12 @@ import vueParser from 'vue-eslint-parser'
const __dirname = path.dirname(url.fileURLToPath(import.meta.url))
const tsProjects = ['./tsconfig.base.json', './ui/*/tsconfig.json', './docs/*/tsconfig.json']

const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: eslintJs.configs.recommended,
})

export default eslintTs.config(
eslintJs.configs.recommended,
...eslintTs.configs.recommended,
// @ts-expect-error the type of `pluginVue` is not compatible with the latest `eslint` v9 package yet
...pluginVue.configs['flat/recommended'],
// FIXME: TypeError SEE https://github.com/amilajack/eslint-plugin-compat/pull/609#issuecomment-2123734301
// ...compat.extends('plugin:compat/recommended'),
// {
// ...pluginFunctional.configs.recommended,
// // FIXME: https://github.com/eslint-functional/eslint-plugin-functional/issues/766#issuecomment-1904715609
// rules: {
// ...pluginFunctional.configs.recommended.rules,
// 'functional/immutable-data': 'off',
// 'functional/no-return-void': 'off',
// },
// },
pluginCompat.configs['flat/recommended'],

/* Global Ignores */
{
Expand Down Expand Up @@ -87,13 +70,15 @@ export default eslintTs.config(
...pluginImportX.configs.recommended.rules,
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'@typescript-eslint/no-unsafe-declaration-merging': 'off',
'@typescript-eslint/no-unused-expressions': [
'error',
{ allowShortCircuit: true, allowTernary: true },
],
'vue/multi-word-component-names': 'off',
'import-x/no-named-as-default-member': 'off',
'import-x/no-named-as-default': 'off',
'import-x/default': 'off', // fix https://github.com/import-js/eslint-plugin-import/issues/1800
'import-x/order': 'warn',
// 'import-x/no-default-export': 'warn'
},
settings: {
'import-x/parsers': {
Expand Down
66 changes: 30 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "artalk-monorepo",
"private": true,
"homepage": "https://artalk.js.org",
"packageManager": "pnpm@9.2.0",
"packageManager": "pnpm@9.7.1",
"scripts": {
"dev": "pnpm -F artalk dev",
"dev:sidebar": "pnpm -F @artalk/artalk-sidebar dev",
Expand All @@ -21,47 +21,41 @@
"test": "pnpm -F artalk test"
},
"devDependencies": {
"@eslint/compat": "^1.0.3",
"@eslint/js": "^9.4.0",
"@playwright/test": "^1.44.1",
"@rollup/plugin-dynamic-import-vars": "2.1.2",
"@types/eslint__js": "^8.42.3",
"@types/node": "20.14.2",
"@typescript-eslint/eslint-plugin": "7.12.0",
"@vitest/coverage-v8": "^1.6.0",
"autoprefixer": "10.4.19",
"@eslint/compat": "^1.1.1",
"@eslint/js": "^9.9.0",
"@playwright/test": "^1.46.1",
"@types/node": "22.4.0",
"@typescript-eslint/eslint-plugin": "8.1.0",
"@vitest/coverage-v8": "^2.0.5",
"autoprefixer": "10.4.20",
"cross-env": "^7.0.3",
"eslint": "^9.4.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^18.0.0",
"eslint": "^9.9.0",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-compat": "^4.2.0",
"eslint-plugin-functional": "^6.5.1",
"eslint-plugin-import-x": "^0.5.1",
"eslint-plugin-react": "^7.34.2",
"eslint-plugin-compat": "^6.0.0",
"eslint-plugin-import-x": "^3.1.0",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react-hooks": "5.1.0-beta-26f2496093-20240514",
"eslint-plugin-react-refresh": "^0.4.7",
"eslint-plugin-vue": "^9.25.0",
"globals": "^15.4.0",
"jsdom": "^24.1.0",
"postcss": "8.4.38",
"prettier": "3.3.1",
"rollup": "4.18.0",
"sass": "1.77.4",
"stylelint": "^16.6.1",
"terser": "5.31.1",
"tsx": "^4.13.3",
"typescript": "5.4.5",
"typescript-eslint": "^7.12.0",
"vite": "5.2.13",
"vite-plugin-checker": "0.6.4",
"vite-plugin-dts": "3.9.1",
"vite-tsconfig-paths": "4.3.2",
"vitest": "^1.6.0",
"eslint-plugin-react-refresh": "^0.4.9",
"eslint-plugin-vue": "^9.27.0",
"globals": "^15.9.0",
"jsdom": "^24.1.1",
"postcss": "8.4.41",
"prettier": "3.3.3",
"rollup": "4.20.0",
"sass": "1.77.8",
"terser": "5.31.6",
"tsx": "^4.17.0",
"typescript": "5.5.4",
"typescript-eslint": "^8.1.0",
"vite": "5.4.1",
"vite-plugin-checker": "0.7.2",
"vite-plugin-dts": "4.0.3",
"vite-tsconfig-paths": "5.0.1",
"vitest": "^2.0.5",
"vue-eslint-parser": "^9.4.3"
},
"browserslist": [
"supports es6 and supports es6-class and supports es6-generators and supports es6-module-dynamic-import and supports es6-module and supports es6-number and supports es6-string-includes"
">0.5%, maintained node versions, not dead, not op_mini all, last 2 years"
]
}
Loading

0 comments on commit 08f58cd

Please sign in to comment.