Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

fix: resolve conflict

shuai42615fa1991a
diff --cc ui/package.json
index 0cb905af,61937d2a..693d491e
--- a/ui/package.json
+++ b/ui/package.json
@@@ -16,11 -16,7 +16,11 @@@
"analyze": "source-map-explorer 'build/static/js/*.js'"
},
"dependencies": {
+ "@codemirror/lang-markdown": "^6.2.4",
+ "@codemirror/language-data": "^6.5.0",
+ "@codemirror/state": "^6.4.1",
+ "@codemirror/view": "^6.26.1",
- "axios": "^0.27.2",
+ "axios": "^0.28.1",
"bootstrap": "^5.3.2",
"bootstrap-icons": "^1.10.5",
"classnames": "^2.3.1",
diff --cc ui/pnpm-lock.yaml
index 532a51cb,d4a6cccb..1c77f143
--- a/ui/pnpm-lock.yaml
+++ b/ui/pnpm-lock.yaml
@@@ -4,21 -8,9 +4,21 @@@ importers
.:
dependencies:
+ '@codemirror/lang-markdown':
+ specifier: ^6.2.4
+ version: 6.2.4
+ '@codemirror/language-data':
+ specifier: ^6.5.0
+ version: 6.5.0(@codemirror/[email protected])
+ '@codemirror/state':
+ specifier: ^6.4.1
+ version: 6.4.1
+ '@codemirror/view':
+ specifier: ^6.26.1
+ version: 6.26.1
axios:
- specifier: ^0.27.2
- version: 0.27.2
+ specifier: ^0.28.1
+ version: 0.28.1
bootstrap:
specifier: ^5.3.2
version: 5.3.2(@popperjs/[email protected])
@@@ -222,6 -214,64 +222,33 @@@
specifier: ^0.8.0
version: 0.8.0
+ src/plugins/captcha-basic:
+ devDependencies:
+ '@typescript-eslint/eslint-plugin':
+ specifier: ^6.0.0
+ version: 6.21.0(@typescript-eslint/[email protected])([email protected])([email protected])
+ '@typescript-eslint/parser':
+ specifier: ^6.0.0
+ '@vitejs/plugin-react-swc':
+ specifier: ^3.3.2
+ version: 3.6.0([email protected])
+ eslint:
+ specifier: ^8.45.0
+ version: 8.57.0
+ eslint-plugin-react-hooks:
+ specifier: ^4.6.0
+ version: 4.6.0([email protected])
+ eslint-plugin-react-refresh:
+ specifier: ^0.4.3
+ version: 0.4.6([email protected])
+ typescript:
+ specifier: ^5.0.2
+ version: 5.4.5
+ vite:
+ specifier: ^4.4.5
+ version: 4.5.3(@types/[email protected])([email protected])
+
- src/plugins/captcha-google-v2:
- dependencies:
- react-google-recaptcha:
- specifier: ^3.1.0
- version: 3.1.0([email protected])
- devDependencies:
- '@typescript-eslint/eslint-plugin':
- specifier: ^6.0.0
- version: 6.21.0(@typescript-eslint/[email protected])([email protected])([email protected])
- '@typescript-eslint/parser':
- specifier: ^6.0.0
- '@vitejs/plugin-react-swc':
- specifier: ^3.3.2
- version: 3.6.0([email protected])
- eslint:
- specifier: ^8.45.0
- version: 8.57.0
- eslint-plugin-react-hooks:
- specifier: ^4.6.0
- version: 4.6.0([email protected])
- eslint-plugin-react-refresh:
- specifier: ^0.4.3
- version: 0.4.6([email protected])
- typescript:
- specifier: ^5.0.2
- version: 5.4.5
- vite:
- specifier: ^4.4.5
- version: 4.5.3(@types/[email protected])([email protected])
-
packages:
/@aashutoshrathi/[email protected]:
@@@ -11905,15 -12171,8 +12299,16 @@@
dependencies:
glob-to-regexp: 0.4.1
graceful-fs: 4.2.11
+ dev: true
+ resolution: {integrity: sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==}
+ engines: {node: '>=10.13.0'}
+ dependencies:
+ glob-to-regexp: 0.4.1
+ graceful-fs: 4.2.11
+ dev: true
+
resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==}
dependencies: