From 4197795bd8ab3326cd13157f484bd0c00630613f Mon Sep 17 00:00:00 2001 From: yansongda Date: Sun, 29 Oct 2023 22:41:37 +0800 Subject: [PATCH 1/3] docs: update --- .../components/Docs/AsideOutlineAfter.vue | 52 ++++ .../components/Docs/Donate/Companies.vue | 58 ++--- .../theme/components/Docs/Donate/People.vue | 86 +++--- web/.vitepress/theme/index.ts | 4 +- web/package.json | 10 +- web/pnpm-lock.yaml | 244 ++++++++++-------- 6 files changed, 255 insertions(+), 199 deletions(-) create mode 100644 web/.vitepress/theme/components/Docs/AsideOutlineAfter.vue diff --git a/web/.vitepress/theme/components/Docs/AsideOutlineAfter.vue b/web/.vitepress/theme/components/Docs/AsideOutlineAfter.vue new file mode 100644 index 000000000..ee7ced8d0 --- /dev/null +++ b/web/.vitepress/theme/components/Docs/AsideOutlineAfter.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/web/.vitepress/theme/components/Docs/Donate/Companies.vue b/web/.vitepress/theme/components/Docs/Donate/Companies.vue index 71e5f7681..c427450bc 100644 --- a/web/.vitepress/theme/components/Docs/Donate/Companies.vue +++ b/web/.vitepress/theme/components/Docs/Donate/Companies.vue @@ -14,47 +14,39 @@ \ No newline at end of file + diff --git a/web/.vitepress/theme/components/Docs/Donate/People.vue b/web/.vitepress/theme/components/Docs/Donate/People.vue index 963ad38fb..d77776373 100644 --- a/web/.vitepress/theme/components/Docs/Donate/People.vue +++ b/web/.vitepress/theme/components/Docs/Donate/People.vue @@ -25,65 +25,57 @@ \ No newline at end of file + diff --git a/web/.vitepress/theme/index.ts b/web/.vitepress/theme/index.ts index 62a14cbbd..d3b79e0d9 100644 --- a/web/.vitepress/theme/index.ts +++ b/web/.vitepress/theme/index.ts @@ -2,13 +2,15 @@ import { h } from 'vue' import DefaultTheme from 'vitepress/theme' import HomePrimary from '@components/Home/Primary.vue' import HomeAuthorize from '@components/Home/Authorize.vue' +import AsideOutlineAfter from '@components/Docs/AsideOutlineAfter.vue' export default { ...DefaultTheme, Layout() { return h(DefaultTheme.Layout, null, { 'home-hero-before': () => h(HomePrimary), - 'home-features-after': () => h(HomeAuthorize) + 'home-features-after': () => h(HomeAuthorize), + 'aside-outline-after': () => h(AsideOutlineAfter) }) } } diff --git a/web/package.json b/web/package.json index 400e1577c..20d98c3a3 100644 --- a/web/package.json +++ b/web/package.json @@ -6,12 +6,12 @@ "web:serve": "vitepress serve" }, "devDependencies": { - "@types/node": "^20.8.4", + "@types/node": "^20.8.9", "fast-glob": "^3.3.1", - "sass": "^1.69.1", - "vite": "^4.4.11", - "vitepress": "1.0.0-rc.20", - "vue": "^3.3.4" + "sass": "^1.69.5", + "vite": "^4.5.0", + "vitepress": "1.0.0-rc.24", + "vue": "^3.3.7" }, "pnpm": { "peerDependencyRules": { diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 8d7493a98..0ceb67f08 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -6,23 +6,23 @@ settings: devDependencies: '@types/node': - specifier: ^20.8.4 - version: 20.8.4 + specifier: ^20.8.9 + version: 20.8.9 fast-glob: specifier: ^3.3.1 version: 3.3.1 sass: - specifier: ^1.69.1 - version: 1.69.1 + specifier: ^1.69.5 + version: 1.69.5 vite: - specifier: ^4.4.11 - version: 4.4.11(@types/node@20.8.4)(sass@1.69.1) + specifier: ^4.5.0 + version: 4.5.0(@types/node@20.8.9)(sass@1.69.5) vitepress: - specifier: 1.0.0-rc.20 - version: 1.0.0-rc.20(@types/node@20.8.4)(sass@1.69.1) + specifier: 1.0.0-rc.24 + version: 1.0.0-rc.24(@types/node@20.8.9)(sass@1.69.5) vue: - specifier: ^3.3.4 - version: 3.3.4 + specifier: ^3.3.7 + version: 3.3.7 packages: @@ -458,131 +458,142 @@ packages: fastq: 1.15.0 dev: true - /@types/linkify-it@3.0.3: - resolution: {integrity: sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g==} + /@types/linkify-it@3.0.4: + resolution: {integrity: sha512-hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ==} dev: true - /@types/markdown-it@13.0.2: - resolution: {integrity: sha512-Tla7hH9oeXHOlJyBFdoqV61xWE9FZf/y2g+gFVwQ2vE1/eBzjUno5JCd3Hdb5oATve5OF6xNjZ/4VIZhVVx+hA==} + /@types/markdown-it@13.0.5: + resolution: {integrity: sha512-QhJP7hkq3FCrFNx0szMNCT/79CXfcEgUIA3jc5GBfeXqoKsk3R8JZm2wRXJ2DiyjbPE4VMFOSDemLFcUTZmHEQ==} dependencies: - '@types/linkify-it': 3.0.3 - '@types/mdurl': 1.0.3 + '@types/linkify-it': 3.0.4 + '@types/mdurl': 1.0.4 dev: true - /@types/mdurl@1.0.3: - resolution: {integrity: sha512-T5k6kTXak79gwmIOaDF2UUQXFbnBE0zBUzF20pz7wDYu0RQMzWg+Ml/Pz50214NsFHBITkoi5VtdjFZnJ2ijjA==} + /@types/mdurl@1.0.4: + resolution: {integrity: sha512-ARVxjAEX5TARFRzpDRVC6cEk0hUIXCCwaMhz8y7S1/PxU6zZS1UMjyobz7q4w/D/R552r4++EhwmXK1N2rAy0A==} dev: true - /@types/node@20.8.4: - resolution: {integrity: sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==} + /@types/node@20.8.9: + resolution: {integrity: sha512-UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg==} dependencies: - undici-types: 5.25.3 + undici-types: 5.26.5 dev: true /@types/web-bluetooth@0.0.18: resolution: {integrity: sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw==} dev: true - /@vue/compiler-core@3.3.4: - resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} + /@vitejs/plugin-vue@4.3.1(vite@4.5.0)(vue@3.3.7): + resolution: {integrity: sha512-tUBEtWcF7wFtII7ayNiLNDTCE1X1afySEo+XNVMNkFXaThENyCowIEX095QqbJZGTgoOcSVDJGlnde2NG4jtbQ==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: ^4.0.0 + vue: ^3.2.25 + dependencies: + vite: 4.5.0(@types/node@20.8.9)(sass@1.69.5) + vue: 3.3.7 + dev: true + + /@vue/compiler-core@3.3.7: + resolution: {integrity: sha512-pACdY6YnTNVLXsB86YD8OF9ihwpolzhhtdLVHhBL6do/ykr6kKXNYABRtNMGrsQXpEXXyAdwvWWkuTbs4MFtPQ==} dependencies: '@babel/parser': 7.23.0 - '@vue/shared': 3.3.4 + '@vue/shared': 3.3.7 estree-walker: 2.0.2 source-map-js: 1.0.2 dev: true - /@vue/compiler-dom@3.3.4: - resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} + /@vue/compiler-dom@3.3.7: + resolution: {integrity: sha512-0LwkyJjnUPssXv/d1vNJ0PKfBlDoQs7n81CbO6Q0zdL7H1EzqYRrTVXDqdBVqro0aJjo/FOa1qBAPVI4PGSHBw==} dependencies: - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/compiler-core': 3.3.7 + '@vue/shared': 3.3.7 dev: true - /@vue/compiler-sfc@3.3.4: - resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==} + /@vue/compiler-sfc@3.3.7: + resolution: {integrity: sha512-7pfldWy/J75U/ZyYIXRVqvLRw3vmfxDo2YLMwVtWVNew8Sm8d6wodM+OYFq4ll/UxfqVr0XKiVwti32PCrruAw==} dependencies: '@babel/parser': 7.23.0 - '@vue/compiler-core': 3.3.4 - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-ssr': 3.3.4 - '@vue/reactivity-transform': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/compiler-core': 3.3.7 + '@vue/compiler-dom': 3.3.7 + '@vue/compiler-ssr': 3.3.7 + '@vue/reactivity-transform': 3.3.7 + '@vue/shared': 3.3.7 estree-walker: 2.0.2 - magic-string: 0.30.4 + magic-string: 0.30.5 postcss: 8.4.31 source-map-js: 1.0.2 dev: true - /@vue/compiler-ssr@3.3.4: - resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==} + /@vue/compiler-ssr@3.3.7: + resolution: {integrity: sha512-TxOfNVVeH3zgBc82kcUv+emNHo+vKnlRrkv8YvQU5+Y5LJGJwSNzcmLUoxD/dNzv0bhQ/F0s+InlgV0NrApJZg==} dependencies: - '@vue/compiler-dom': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/compiler-dom': 3.3.7 + '@vue/shared': 3.3.7 dev: true - /@vue/devtools-api@6.5.0: - resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==} + /@vue/devtools-api@6.5.1: + resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} dev: true - /@vue/reactivity-transform@3.3.4: - resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} + /@vue/reactivity-transform@3.3.7: + resolution: {integrity: sha512-APhRmLVbgE1VPGtoLQoWBJEaQk4V8JUsqrQihImVqKT+8U6Qi3t5ATcg4Y9wGAPb3kIhetpufyZ1RhwbZCIdDA==} dependencies: '@babel/parser': 7.23.0 - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/compiler-core': 3.3.7 + '@vue/shared': 3.3.7 estree-walker: 2.0.2 - magic-string: 0.30.4 + magic-string: 0.30.5 dev: true - /@vue/reactivity@3.3.4: - resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} + /@vue/reactivity@3.3.7: + resolution: {integrity: sha512-cZNVjWiw00708WqT0zRpyAgduG79dScKEPYJXq2xj/aMtk3SKvL3FBt2QKUlh6EHBJ1m8RhBY+ikBUzwc7/khg==} dependencies: - '@vue/shared': 3.3.4 + '@vue/shared': 3.3.7 dev: true - /@vue/runtime-core@3.3.4: - resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==} + /@vue/runtime-core@3.3.7: + resolution: {integrity: sha512-LHq9du3ubLZFdK/BP0Ysy3zhHqRfBn80Uc+T5Hz3maFJBGhci1MafccnL3rpd5/3wVfRHAe6c+PnlO2PAavPTQ==} dependencies: - '@vue/reactivity': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/reactivity': 3.3.7 + '@vue/shared': 3.3.7 dev: true - /@vue/runtime-dom@3.3.4: - resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==} + /@vue/runtime-dom@3.3.7: + resolution: {integrity: sha512-PFQU1oeJxikdDmrfoNQay5nD4tcPNYixUBruZzVX/l0eyZvFKElZUjW4KctCcs52nnpMGO6UDK+jF5oV4GT5Lw==} dependencies: - '@vue/runtime-core': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/runtime-core': 3.3.7 + '@vue/shared': 3.3.7 csstype: 3.1.2 dev: true - /@vue/server-renderer@3.3.4(vue@3.3.4): - resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==} + /@vue/server-renderer@3.3.7(vue@3.3.7): + resolution: {integrity: sha512-UlpKDInd1hIZiNuVVVvLgxpfnSouxKQOSE2bOfQpBuGwxRV/JqqTCyyjXUWiwtVMyeRaZhOYYqntxElk8FhBhw==} peerDependencies: - vue: 3.3.4 + vue: 3.3.7 dependencies: - '@vue/compiler-ssr': 3.3.4 - '@vue/shared': 3.3.4 - vue: 3.3.4 + '@vue/compiler-ssr': 3.3.7 + '@vue/shared': 3.3.7 + vue: 3.3.7 dev: true - /@vue/shared@3.3.4: - resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} + /@vue/shared@3.3.7: + resolution: {integrity: sha512-N/tbkINRUDExgcPTBvxNkvHGu504k8lzlNQRITVnm6YjOjwa4r0nnbd4Jb01sNpur5hAllyRJzSK5PvB9PPwRg==} dev: true - /@vueuse/core@10.5.0(vue@3.3.4): + /@vueuse/core@10.5.0(vue@3.3.7): resolution: {integrity: sha512-z/tI2eSvxwLRjOhDm0h/SXAjNm8N5ld6/SC/JQs6o6kpJ6Ya50LnEL8g5hoYu005i28L0zqB5L5yAl8Jl26K3A==} dependencies: '@types/web-bluetooth': 0.0.18 '@vueuse/metadata': 10.5.0 - '@vueuse/shared': 10.5.0(vue@3.3.4) - vue-demi: 0.14.6(vue@3.3.4) + '@vueuse/shared': 10.5.0(vue@3.3.7) + vue-demi: 0.14.6(vue@3.3.7) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.5.0(focus-trap@7.5.3)(vue@3.3.4): + /@vueuse/integrations@10.5.0(focus-trap@7.5.4)(vue@3.3.7): resolution: {integrity: sha512-fm5sXLCK0Ww3rRnzqnCQRmfjDURaI4xMsx+T+cec0ngQqHx/JgUtm8G0vRjwtonIeTBsH1Q8L3SucE+7K7upJQ==} peerDependencies: async-validator: '*' @@ -623,10 +634,10 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.5.0(vue@3.3.4) - '@vueuse/shared': 10.5.0(vue@3.3.4) - focus-trap: 7.5.3 - vue-demi: 0.14.6(vue@3.3.4) + '@vueuse/core': 10.5.0(vue@3.3.7) + '@vueuse/shared': 10.5.0(vue@3.3.7) + focus-trap: 7.5.4 + vue-demi: 0.14.6(vue@3.3.7) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -636,10 +647,10 @@ packages: resolution: {integrity: sha512-fEbElR+MaIYyCkeM0SzWkdoMtOpIwO72x8WsZHRE7IggiOlILttqttM69AS13nrDxosnDBYdyy3C5mR1LCxHsw==} dev: true - /@vueuse/shared@10.5.0(vue@3.3.4): + /@vueuse/shared@10.5.0(vue@3.3.7): resolution: {integrity: sha512-18iyxbbHYLst9MqU1X1QNdMHIjks6wC7XTVf0KNOv5es/Ms6gjVFCAAWTVP2JStuGqydg3DT+ExpFORUEi9yhg==} dependencies: - vue-demi: 0.14.6(vue@3.3.4) + vue-demi: 0.14.6(vue@3.3.7) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -765,8 +776,8 @@ packages: to-regex-range: 5.0.1 dev: true - /focus-trap@7.5.3: - resolution: {integrity: sha512-7UsT/eSJcTPF0aZp73u7hBRTABz26knRRTJfoTGFCQD5mUImLIIOwWWCrtoQdmWa7dykBi6H+Cp5i3S/kvsMeA==} + /focus-trap@7.5.4: + resolution: {integrity: sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==} dependencies: tabbable: 6.2.0 dev: true @@ -818,8 +829,8 @@ packages: resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} dev: true - /magic-string@0.30.4: - resolution: {integrity: sha512-Q/TKtsC5BPm0kGqgBIF9oXAs/xEf2vRKiIB4wCRQTJOQIByZ1d+NnUOotvJOvNpi5RNIgVOMC3pOuaP1ZTDlVg==} + /magic-string@0.30.5: + resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -842,8 +853,8 @@ packages: picomatch: 2.3.1 dev: true - /minisearch@6.1.0: - resolution: {integrity: sha512-PNxA/X8pWk+TiqPbsoIYH0GQ5Di7m6326/lwU/S4mlo4wGQddIcf/V//1f9TB0V4j59b57b+HZxt8h3iMROGvg==} + /minisearch@6.2.0: + resolution: {integrity: sha512-BECkorDF1TY2rGKt9XHdSeP9TP29yUbrAaCh/C03wpyf1vx3uYcP/+8XlMcpTkgoU0rBVnHMAOaP83Rc9Tm+TQ==} dev: true /nanoid@3.3.6: @@ -909,8 +920,8 @@ packages: queue-microtask: 1.2.3 dev: true - /sass@1.69.1: - resolution: {integrity: sha512-nc969GvTVz38oqKgYYVHM/Iq7Yl33IILy5uqaH2CWSiSUmRCvw+UR7tA3845Sp4BD5ykCUimvrT3k1EjTwpVUA==} + /sass@1.69.5: + resolution: {integrity: sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==} engines: {node: '>=14.0.0'} hasBin: true dependencies: @@ -919,8 +930,8 @@ packages: source-map-js: 1.0.2 dev: true - /shiki@0.14.4: - resolution: {integrity: sha512-IXCRip2IQzKwxArNNq1S+On4KPML3Yyn8Zzs/xRgcgOWIr8ntIK3IKzjFPfjy/7kt9ZMjc+FItfqHRBg8b6tNQ==} + /shiki@0.14.5: + resolution: {integrity: sha512-1gCAYOcmCFONmErGTrS1fjzJLA7MGZmKzrBNX7apqSwhyITJg2O102uFzXUeBxNnEkDA9vHIKLyeKq0V083vIw==} dependencies: ansi-sequence-parser: 1.1.1 jsonc-parser: 3.2.0 @@ -949,12 +960,12 @@ packages: is-number: 7.0.0 dev: true - /undici-types@5.25.3: - resolution: {integrity: sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==} + /undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} dev: true - /vite@4.4.11(@types/node@20.8.4)(sass@1.69.1): - resolution: {integrity: sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==} + /vite@4.5.0(@types/node@20.8.9)(sass@1.69.5): + resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -981,21 +992,21 @@ packages: terser: optional: true dependencies: - '@types/node': 20.8.4 + '@types/node': 20.8.9 esbuild: 0.18.20 postcss: 8.4.31 rollup: 3.29.4 - sass: 1.69.1 + sass: 1.69.5 optionalDependencies: fsevents: 2.3.3 dev: true - /vitepress@1.0.0-rc.20(@types/node@20.8.4)(sass@1.69.1): - resolution: {integrity: sha512-CykMUJ8JLxLcGWek0ew3wln4RYbsOd1+0YzXITTpajggpynm2S331TNkJVOkHrMRc6GYe3y4pS40GfgcW0ZwAw==} + /vitepress@1.0.0-rc.24(@types/node@20.8.9)(sass@1.69.5): + resolution: {integrity: sha512-RpnL8cnOGwiRlBbrYQUm9sYkJbtyOt/wYXk2diTcokY4yvks/5lq9LuSt+MURWB6ZqwpSNHvTmxgaSfLoG0/OA==} hasBin: true peerDependencies: markdown-it-mathjax3: ^4.3.2 - postcss: ^8.4.30 + postcss: ^8.4.31 peerDependenciesMeta: markdown-it-mathjax3: optional: true @@ -1004,16 +1015,17 @@ packages: dependencies: '@docsearch/css': 3.5.2 '@docsearch/js': 3.5.2 - '@types/markdown-it': 13.0.2 - '@vue/devtools-api': 6.5.0 - '@vueuse/core': 10.5.0(vue@3.3.4) - '@vueuse/integrations': 10.5.0(focus-trap@7.5.3)(vue@3.3.4) - focus-trap: 7.5.3 + '@types/markdown-it': 13.0.5 + '@vitejs/plugin-vue': 4.3.1(vite@4.5.0)(vue@3.3.7) + '@vue/devtools-api': 6.5.1 + '@vueuse/core': 10.5.0(vue@3.3.7) + '@vueuse/integrations': 10.5.0(focus-trap@7.5.4)(vue@3.3.7) + focus-trap: 7.5.4 mark.js: 8.11.1 - minisearch: 6.1.0 - shiki: 0.14.4 - vite: 4.4.11(@types/node@20.8.4)(sass@1.69.1) - vue: 3.3.4 + minisearch: 6.2.0 + shiki: 0.14.5 + vite: 4.5.0(@types/node@20.8.9)(sass@1.69.5) + vue: 3.3.7 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -1038,6 +1050,7 @@ packages: - stylus - sugarss - terser + - typescript - universal-cookie dev: true @@ -1049,7 +1062,7 @@ packages: resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==} dev: true - /vue-demi@0.14.6(vue@3.3.4): + /vue-demi@0.14.6(vue@3.3.7): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true @@ -1061,15 +1074,20 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.3.4 + vue: 3.3.7 dev: true - /vue@3.3.4: - resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==} + /vue@3.3.7: + resolution: {integrity: sha512-YEMDia1ZTv1TeBbnu6VybatmSteGOS3A3YgfINOfraCbf85wdKHzscD6HSS/vB4GAtI7sa1XPX7HcQaJ1l24zA==} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true dependencies: - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-sfc': 3.3.4 - '@vue/runtime-dom': 3.3.4 - '@vue/server-renderer': 3.3.4(vue@3.3.4) - '@vue/shared': 3.3.4 + '@vue/compiler-dom': 3.3.7 + '@vue/compiler-sfc': 3.3.7 + '@vue/runtime-dom': 3.3.7 + '@vue/server-renderer': 3.3.7(vue@3.3.7) + '@vue/shared': 3.3.7 dev: true From 023cc9aa6d91fde7bb480fb33097525638cf3a4f Mon Sep 17 00:00:00 2001 From: yansongda Date: Sun, 29 Oct 2023 22:45:04 +0800 Subject: [PATCH 2/3] docs: update --- src/Contract/ProviderInterface.php | 10 +++++----- src/Event/CallbackReceived.php | 4 ++-- src/Pay.php | 10 +++++----- src/Plugin/Wechat/LaunchPlugin.php | 2 +- src/Provider/AbstractProvider.php | 4 ++-- src/Provider/Alipay.php | 8 ++++---- src/Provider/Unipay.php | 8 ++++---- src/Provider/Wechat.php | 8 ++++---- src/Rocket.php | 6 +++--- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Contract/ProviderInterface.php b/src/Contract/ProviderInterface.php index 2d2b2c943..8542d5a78 100644 --- a/src/Contract/ProviderInterface.php +++ b/src/Contract/ProviderInterface.php @@ -19,15 +19,15 @@ interface ProviderInterface * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function pay(array $plugins, array $params): Collection|MessageInterface|array|null; + public function pay(array $plugins, array $params): null|array|Collection|MessageInterface; - public function find(array|string $order): Collection|array; + public function find(array|string $order): array|Collection; - public function cancel(array|string $order): array|Collection|null; + public function cancel(array|string $order): null|array|Collection; - public function close(array|string $order): array|Collection|null; + public function close(array|string $order): null|array|Collection; - public function refund(array $order): Collection|array; + public function refund(array $order): array|Collection; public function callback(null|array|ServerRequestInterface $contents = null, ?array $params = null): Collection; diff --git a/src/Event/CallbackReceived.php b/src/Event/CallbackReceived.php index d62017b68..8c0e41522 100755 --- a/src/Event/CallbackReceived.php +++ b/src/Event/CallbackReceived.php @@ -13,9 +13,9 @@ class CallbackReceived extends Event public ?array $params = null; - public ServerRequestInterface|array|null $contents; + public null|array|ServerRequestInterface $contents; - public function __construct(string $provider, ServerRequestInterface|array|null $contents, ?array $params = null, ?Rocket $rocket = null) + public function __construct(string $provider, null|array|ServerRequestInterface $contents, ?array $params = null, ?Rocket $rocket = null) { $this->provider = $provider; $this->contents = $contents; diff --git a/src/Pay.php b/src/Pay.php index c98bda85f..a738a6347 100644 --- a/src/Pay.php +++ b/src/Pay.php @@ -71,12 +71,12 @@ class Pay HttpServiceProvider::class, ]; - private static Closure|null|ContainerInterface $container = null; + private static null|Closure|ContainerInterface $container = null; /** * @throws ContainerException */ - private function __construct(array $config, ContainerInterface|Closure $container = null) + private function __construct(array $config, Closure|ContainerInterface $container = null) { $this->registerServices($config, $container); @@ -102,7 +102,7 @@ public static function __callStatic(string $service, array $config) /** * @throws ContainerException */ - public static function config(array $config = [], ContainerInterface|Closure $container = null): bool + public static function config(array $config = [], Closure|ContainerInterface $container = null): bool { if (self::hasContainer() && !($config['_force'] ?? false)) { return false; @@ -192,7 +192,7 @@ public static function has(string $service): bool return Pay::getContainer()->has($service); } - public static function setContainer(ContainerInterface|Closure|null $container): void + public static function setContainer(null|Closure|ContainerInterface $container): void { self::$container = $container; } @@ -238,7 +238,7 @@ public static function registerService(string $service, mixed $data): void /** * @throws ContainerException */ - private function registerServices(array $config, ContainerInterface|Closure $container = null): void + private function registerServices(array $config, Closure|ContainerInterface $container = null): void { foreach (array_merge($this->coreService, $this->service) as $service) { self::registerService($service, ContainerServiceProvider::class == $service ? $container : $config); diff --git a/src/Plugin/Wechat/LaunchPlugin.php b/src/Plugin/Wechat/LaunchPlugin.php index b3d176eee..afdd92fe1 100644 --- a/src/Plugin/Wechat/LaunchPlugin.php +++ b/src/Plugin/Wechat/LaunchPlugin.php @@ -51,7 +51,7 @@ public function assembly(Rocket $rocket, Closure $next): Rocket /** * @throws InvalidResponseException */ - protected function validateResponse(Rocket $rocket): Collection|MessageInterface|array|null + protected function validateResponse(Rocket $rocket): null|array|Collection|MessageInterface { $response = $rocket->getDestination(); diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php index 70289209b..d4b465b99 100644 --- a/src/Provider/AbstractProvider.php +++ b/src/Provider/AbstractProvider.php @@ -34,7 +34,7 @@ abstract class AbstractProvider implements ProviderInterface * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function call(string $plugin, array $params = []): Collection|MessageInterface|null + public function call(string $plugin, array $params = []): null|Collection|MessageInterface { if (!class_exists($plugin) || !in_array(ShortcutInterface::class, class_implements($plugin))) { throw new InvalidParamsException(Exception::SHORTCUT_NOT_FOUND, "[{$plugin}] is not incompatible"); @@ -56,7 +56,7 @@ public function call(string $plugin, array $params = []): Collection|MessageInte * @throws ContainerException * @throws InvalidParamsException */ - public function pay(array $plugins, array $params): Collection|MessageInterface|null + public function pay(array $plugins, array $params): null|Collection|MessageInterface { Logger::info('[AbstractProvider] 即将进行 pay 操作', func_get_args()); diff --git a/src/Provider/Alipay.php b/src/Provider/Alipay.php index 84116a201..e2e91e7c4 100644 --- a/src/Provider/Alipay.php +++ b/src/Provider/Alipay.php @@ -57,7 +57,7 @@ public function __call(string $shortcut, array $params): null|Collection|Message * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function find(array|string $order): Collection|array + public function find(array|string $order): array|Collection { $order = is_array($order) ? $order : ['out_trade_no' => $order]; @@ -71,7 +71,7 @@ public function find(array|string $order): Collection|array * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function cancel(array|string $order): Collection|array|null + public function cancel(array|string $order): null|array|Collection { $order = is_array($order) ? $order : ['out_trade_no' => $order]; @@ -85,7 +85,7 @@ public function cancel(array|string $order): Collection|array|null * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function close(array|string $order): Collection|array|null + public function close(array|string $order): null|array|Collection { $order = is_array($order) ? $order : ['out_trade_no' => $order]; @@ -99,7 +99,7 @@ public function close(array|string $order): Collection|array|null * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function refund(array $order): Collection|array + public function refund(array $order): array|Collection { Event::dispatch(new Event\MethodCalled('alipay', __METHOD__, $order, null)); diff --git a/src/Provider/Unipay.php b/src/Provider/Unipay.php index 5f5724957..eea2dd76c 100644 --- a/src/Provider/Unipay.php +++ b/src/Provider/Unipay.php @@ -52,7 +52,7 @@ public function __call(string $shortcut, array $params): null|Collection|Message * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function find(array|string $order): Collection|array + public function find(array|string $order): array|Collection { if (!is_array($order)) { throw new InvalidParamsException(Exception::UNIPAY_FIND_STRING_NOT_SUPPORTED); @@ -68,7 +68,7 @@ public function find(array|string $order): Collection|array * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function cancel(array|string $order): Collection|array|null + public function cancel(array|string $order): null|array|Collection { if (!is_array($order)) { throw new InvalidParamsException(Exception::UNIPAY_CANCEL_STRING_NOT_SUPPORTED); @@ -82,7 +82,7 @@ public function cancel(array|string $order): Collection|array|null /** * @throws InvalidParamsException */ - public function close(array|string $order): Collection|array|null + public function close(array|string $order): null|array|Collection { throw new InvalidParamsException(Exception::METHOD_NOT_SUPPORTED, 'Unipay does not support close api'); } @@ -92,7 +92,7 @@ public function close(array|string $order): Collection|array|null * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function refund(array $order): Collection|array + public function refund(array $order): array|Collection { Event::dispatch(new Event\MethodCalled('unipay', __METHOD__, $order, null)); diff --git a/src/Provider/Wechat.php b/src/Provider/Wechat.php index 7866e0536..32fb56cd9 100644 --- a/src/Provider/Wechat.php +++ b/src/Provider/Wechat.php @@ -64,7 +64,7 @@ public function __call(string $shortcut, array $params): null|Collection|Message * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function find(array|string $order): Collection|array + public function find(array|string $order): array|Collection { $order = is_array($order) ? $order : ['transaction_id' => $order]; @@ -76,7 +76,7 @@ public function find(array|string $order): Collection|array /** * @throws InvalidParamsException */ - public function cancel(array|string $order): null|Collection|array + public function cancel(array|string $order): null|array|Collection { throw new InvalidParamsException(Exception::METHOD_NOT_SUPPORTED, 'Wechat does not support cancel api'); } @@ -86,7 +86,7 @@ public function cancel(array|string $order): null|Collection|array * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function close(array|string $order): null|Collection|array + public function close(array|string $order): null|array|Collection { $order = is_array($order) ? $order : ['out_trade_no' => $order]; @@ -102,7 +102,7 @@ public function close(array|string $order): null|Collection|array * @throws InvalidParamsException * @throws ServiceNotFoundException */ - public function refund(array $order): Collection|array + public function refund(array $order): array|Collection { Event::dispatch(new Event\MethodCalled('wechat', __METHOD__, $order, null)); diff --git a/src/Rocket.php b/src/Rocket.php index 22c3bec34..6ecc3679d 100644 --- a/src/Rocket.php +++ b/src/Rocket.php @@ -32,7 +32,7 @@ class Rocket implements JsonSerializableInterface, ArrayAccess private string $direction = DirectionInterface::class; - private null|MessageInterface|Collection $destination = null; + private null|Collection|MessageInterface $destination = null; private null|RequestInterface|ResponseInterface $destinationOrigin = null; @@ -114,12 +114,12 @@ public function setDirection(string $direction): Rocket return $this; } - public function getDestination(): Collection|MessageInterface|null + public function getDestination(): null|Collection|MessageInterface { return $this->destination; } - public function setDestination(Collection|MessageInterface|null $destination): Rocket + public function setDestination(null|Collection|MessageInterface $destination): Rocket { $this->destination = $destination; From ceb72003ebc7df83d6d189886cfcea4c8584565c Mon Sep 17 00:00:00 2001 From: yansongda Date: Sun, 29 Oct 2023 22:50:27 +0800 Subject: [PATCH 3/3] update --- web/docs/v3/index.md | 4 +--- web/docs/v3/others/faq.md | 2 +- web/docs/v3/quick-start/install.md | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web/docs/v3/index.md b/web/docs/v3/index.md index 7bdc085d8..0043c1129 100644 --- a/web/docs/v3/index.md +++ b/web/docs/v3/index.md @@ -18,8 +18,6 @@ hyperf 扩展包请 [传送至这里](https://github.com/yansongda/hyperf-pay) laravel 扩展包请 [传送至这里](https://github.com/yansongda/laravel-pay) -yii 扩展包请 [传送至这里](https://github.com/guanguans/yii-pay) - ## 特点 - 多租户支持 @@ -36,7 +34,7 @@ yii 扩展包请 [传送至这里](https://github.com/guanguans/yii-pay) - 符合 PSR2、PSR3、PSR4、PSR7、PSR11、PSR14、PSR18 等各项标准，你可以各种方便的与你的框架集成 ## 运行环境 -- PHP 7.3+ +- PHP 8.0+ - composer ## 版本支持 diff --git a/web/docs/v3/others/faq.md b/web/docs/v3/others/faq.md index 15de7f636..d681ce436 100644 --- a/web/docs/v3/others/faq.md +++ b/web/docs/v3/others/faq.md @@ -18,7 +18,7 @@ 请参考 [https://github.com/yansongda/pay/issues/16](https://github.com/yansongda/pay/issues/16) -4. 是否支持其他支付平台？比如：银联、京东。 +4. 是否支持其他支付平台？比如：京东。 由于使用限制，暂不支持。 diff --git a/web/docs/v3/quick-start/install.md b/web/docs/v3/quick-start/install.md index 94e9980a6..315ea907e 100644 --- a/web/docs/v3/quick-start/install.md +++ b/web/docs/v3/quick-start/install.md @@ -21,7 +21,7 @@ composer require guzzlehttp/guzzle:^7.0 # 默认情况下，此包框架已自 ```shell composer require yansongda/pay:~3.5.0 -vvv composer require guzzlehttp/guzzle:^7.0 -composer require hyperf/pimple:~2.2.0 +composer require hyperf/pimple:~2.2.0 # 或者 composer require illuminate/container ``` ## 详细安装介绍