This commit is contained in:
SevicheCC 2024-10-29 02:36:58 +08:00
parent f89931db5e
commit ec77b7991c
Signed by untrusted user who does not match committer: SevicheCC
GPG key ID: C577000000000000
3 changed files with 231 additions and 89 deletions

View file

@ -34,19 +34,19 @@ importers:
version: 1.1.4 version: 1.1.4
'@sveltejs/adapter-netlify': '@sveltejs/adapter-netlify':
specifier: ^2.0.7 specifier: ^2.0.7
version: 2.0.7(@sveltejs/kit@1.19.0) version: 2.0.7(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))
'@sveltejs/adapter-static': '@sveltejs/adapter-static':
specifier: ^2.0.2 specifier: ^2.0.2
version: 2.0.2(@sveltejs/kit@1.19.0) version: 2.0.2(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))
'@sveltejs/adapter-vercel': '@sveltejs/adapter-vercel':
specifier: 2.4.3 specifier: 2.4.3
version: 2.4.3(@sveltejs/kit@1.19.0) version: 2.4.3(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))
'@sveltejs/kit': '@sveltejs/kit':
specifier: ^1.19.0 specifier: ^1.19.0
version: 1.19.0(svelte@3.59.1)(vite@4.3.9) version: 1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
'@tailwindcss/typography': '@tailwindcss/typography':
specifier: ^0.5.9 specifier: ^0.5.9
version: 0.5.9(tailwindcss@3.3.2) version: 0.5.9(tailwindcss@3.3.2(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)))
'@types/node': '@types/node':
specifier: ^20.2.5 specifier: ^20.2.5
version: 20.2.5 version: 20.2.5
@ -55,7 +55,7 @@ importers:
version: 2.0.6 version: 2.0.6
'@typescript-eslint/eslint-plugin': '@typescript-eslint/eslint-plugin':
specifier: ^5.59.7 specifier: ^5.59.7
version: 5.59.7(@typescript-eslint/parser@5.59.7)(eslint@8.41.0)(typescript@5.0.4) version: 5.59.7(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint@8.41.0)(typescript@5.0.4)
'@typescript-eslint/parser': '@typescript-eslint/parser':
specifier: ^5.59.7 specifier: ^5.59.7
version: 5.59.7(eslint@8.41.0)(typescript@5.0.4) version: 5.59.7(eslint@8.41.0)(typescript@5.0.4)
@ -64,7 +64,7 @@ importers:
version: 0.51.13 version: 0.51.13
'@vite-pwa/sveltekit': '@vite-pwa/sveltekit':
specifier: ^0.1.3 specifier: ^0.1.3
version: 0.1.3(@sveltejs/kit@1.19.0)(vite-plugin-pwa@0.14.7) version: 0.1.3(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))(vite-plugin-pwa@0.14.7(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))(workbox-build@6.6.0)(workbox-window@6.6.0))
chalk: chalk:
specifier: ^5.2.0 specifier: ^5.2.0
version: 5.2.0 version: 5.2.0
@ -76,7 +76,7 @@ importers:
version: 7.0.3 version: 7.0.3
daisyui: daisyui:
specifier: ^2.51.6 specifier: ^2.51.6
version: 2.51.6(autoprefixer@10.4.14)(postcss@8.4.23) version: 2.51.6(autoprefixer@10.4.14(postcss@8.4.23))(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4))
eslint: eslint:
specifier: ^8.41.0 specifier: ^8.41.0
version: 8.41.0 version: 8.41.0
@ -103,7 +103,7 @@ importers:
version: 0.10.6(svelte@3.59.1) version: 0.10.6(svelte@3.59.1)
netlify-cli: netlify-cli:
specifier: ^16.3.1 specifier: ^16.3.1
version: 16.3.1(@types/node@20.2.5) version: 16.3.1(@types/node@20.2.5)(picomatch@2.3.1)
npm-run-all: npm-run-all:
specifier: ^4.1.5 specifier: ^4.1.5
version: 4.1.5 version: 4.1.5
@ -151,10 +151,10 @@ importers:
version: 0.1.7 version: 0.1.7
svelte-check: svelte-check:
specifier: ^3.4.3 specifier: ^3.4.3
version: 3.4.3(@babel/core@7.22.1)(postcss@8.4.23)(svelte@3.59.1) version: 3.4.3(@babel/core@7.22.1)(postcss-load-config@4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)))(postcss@8.4.23)(svelte@3.59.1)
svelte-preprocess: svelte-preprocess:
specifier: ^5.0.4 specifier: ^5.0.4
version: 5.0.4(@babel/core@7.22.1)(postcss@8.4.23)(svelte@3.59.1)(typescript@5.0.4) version: 5.0.4(@babel/core@7.22.1)(postcss-load-config@4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)))(postcss@8.4.23)(svelte@3.59.1)(typescript@5.0.4)
svelte-typeahead: svelte-typeahead:
specifier: ^4.4.1 specifier: ^4.4.1
version: 4.4.1 version: 4.4.1
@ -163,7 +163,7 @@ importers:
version: 0.0.12 version: 0.0.12
tailwindcss: tailwindcss:
specifier: ^3.3.2 specifier: ^3.3.2
version: 3.3.2 version: 3.3.2(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4))
tslib: tslib:
specifier: ^2.5.2 specifier: ^2.5.2
version: 2.5.2 version: 2.5.2
@ -175,16 +175,16 @@ importers:
version: 4.1.2 version: 4.1.2
unocss: unocss:
specifier: ^0.51.13 specifier: ^0.51.13
version: 0.51.13(postcss@8.4.23)(rollup@3.23.0)(vite@4.3.9) version: 0.51.13(postcss@8.4.23)(rollup@3.23.0)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
vite: vite:
specifier: ^4.3.9 specifier: ^4.3.9
version: 4.3.9(@types/node@20.2.5) version: 4.3.9(@types/node@20.2.5)(terser@5.17.6)
vite-imagetools: vite-imagetools:
specifier: ^4.0.19 specifier: ^4.0.19
version: 4.0.19(rollup@3.23.0) version: 4.0.19(rollup@3.23.0)
vite-plugin-pwa: vite-plugin-pwa:
specifier: ^0.14.7 specifier: ^0.14.7
version: 0.14.7(vite@4.3.9)(workbox-build@6.6.0)(workbox-window@6.6.0) version: 0.14.7(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))(workbox-build@6.6.0)(workbox-window@6.6.0)
workbox-build: workbox-build:
specifier: ^6.6.0 specifier: ^6.6.0
version: 6.6.0 version: 6.6.0
@ -8055,7 +8055,7 @@ snapshots:
yaml: 2.3.1 yaml: 2.3.1
yargs: 17.7.2 yargs: 17.7.2
'@netlify/build@29.20.13(@types/node@20.2.5)(debug@4.3.4)': '@netlify/build@29.20.13(@types/node@20.2.5)(debug@4.3.4)(picomatch@2.3.1)':
dependencies: dependencies:
'@bugsnag/js': 7.20.2 '@bugsnag/js': 7.20.2
'@honeycombio/opentelemetry-node': 0.4.0(debug@4.3.4)(supports-color@9.3.1) '@honeycombio/opentelemetry-node': 0.4.0(debug@4.3.4)(supports-color@9.3.1)
@ -8074,7 +8074,7 @@ snapshots:
chalk: 5.2.0 chalk: 5.2.0
clean-stack: 4.2.0 clean-stack: 4.2.0
execa: 6.1.0 execa: 6.1.0
fdir: 6.1.0 fdir: 6.1.0(picomatch@2.3.1)
figures: 5.0.0 figures: 5.0.0
filter-obj: 5.1.0 filter-obj: 5.1.0
got: 12.6.1 got: 12.6.1
@ -8745,6 +8745,7 @@ snapshots:
dependencies: dependencies:
'@rollup/pluginutils': 5.0.2(rollup@3.23.0) '@rollup/pluginutils': 5.0.2(rollup@3.23.0)
magic-string: 0.27.0 magic-string: 0.27.0
optionalDependencies:
rollup: 3.23.0 rollup: 3.23.0
'@rollup/pluginutils@3.1.0(rollup@2.79.1)': '@rollup/pluginutils@3.1.0(rollup@2.79.1)':
@ -8764,11 +8765,13 @@ snapshots:
'@types/estree': 1.0.1 '@types/estree': 1.0.1
estree-walker: 2.0.2 estree-walker: 2.0.2
picomatch: 2.3.1 picomatch: 2.3.1
optionalDependencies:
rollup: 3.23.0 rollup: 3.23.0
'@samverschueren/stream-to-observable@0.3.1(rxjs@6.6.7)': '@samverschueren/stream-to-observable@0.3.1(rxjs@6.6.7)':
dependencies: dependencies:
any-observable: 0.3.0(rxjs@6.6.7) any-observable: 0.3.0(rxjs@6.6.7)
optionalDependencies:
rxjs: 6.6.7 rxjs: 6.6.7
transitivePeerDependencies: transitivePeerDependencies:
- zenObservable - zenObservable
@ -8791,29 +8794,29 @@ snapshots:
magic-string: 0.25.9 magic-string: 0.25.9
string.prototype.matchall: 4.0.8 string.prototype.matchall: 4.0.8
'@sveltejs/adapter-netlify@2.0.7(@sveltejs/kit@1.19.0)': '@sveltejs/adapter-netlify@2.0.7(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))':
dependencies: dependencies:
'@iarna/toml': 2.2.5 '@iarna/toml': 2.2.5
'@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9) '@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
esbuild: 0.17.19 esbuild: 0.17.19
set-cookie-parser: 2.6.0 set-cookie-parser: 2.6.0
'@sveltejs/adapter-static@2.0.2(@sveltejs/kit@1.19.0)': '@sveltejs/adapter-static@2.0.2(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))':
dependencies: dependencies:
'@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9) '@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
'@sveltejs/adapter-vercel@2.4.3(@sveltejs/kit@1.19.0)': '@sveltejs/adapter-vercel@2.4.3(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))':
dependencies: dependencies:
'@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9) '@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
'@vercel/nft': 0.22.6 '@vercel/nft': 0.22.6
esbuild: 0.17.19 esbuild: 0.17.19
transitivePeerDependencies: transitivePeerDependencies:
- encoding - encoding
- supports-color - supports-color
'@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9)': '@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))':
dependencies: dependencies:
'@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.59.1)(vite@4.3.9) '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
'@types/cookie': 0.5.1 '@types/cookie': 0.5.1
cookie: 0.5.0 cookie: 0.5.0
devalue: 4.3.2 devalue: 4.3.2
@ -8827,30 +8830,30 @@ snapshots:
svelte: 3.59.1 svelte: 3.59.1
tiny-glob: 0.2.9 tiny-glob: 0.2.9
undici: 5.22.1 undici: 5.22.1
vite: 4.3.9(@types/node@20.2.5) vite: 4.3.9(@types/node@20.2.5)(terser@5.17.6)
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.59.1)(vite@4.3.9)': '@sveltejs/vite-plugin-svelte-inspector@1.0.2(@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))':
dependencies: dependencies:
'@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.59.1)(vite@4.3.9) '@sveltejs/vite-plugin-svelte': 2.4.1(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
debug: 4.3.4(supports-color@9.3.1) debug: 4.3.4(supports-color@9.3.1)
svelte: 3.59.1 svelte: 3.59.1
vite: 4.3.9(@types/node@20.2.5) vite: 4.3.9(@types/node@20.2.5)(terser@5.17.6)
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.59.1)(vite@4.3.9)': '@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))':
dependencies: dependencies:
'@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1)(svelte@3.59.1)(vite@4.3.9) '@sveltejs/vite-plugin-svelte-inspector': 1.0.2(@sveltejs/vite-plugin-svelte@2.4.1(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
debug: 4.3.4(supports-color@9.3.1) debug: 4.3.4(supports-color@9.3.1)
deepmerge: 4.3.1 deepmerge: 4.3.1
kleur: 4.1.5 kleur: 4.1.5
magic-string: 0.30.0 magic-string: 0.30.0
svelte: 3.59.1 svelte: 3.59.1
svelte-hmr: 0.15.1(svelte@3.59.1) svelte-hmr: 0.15.1(svelte@3.59.1)
vite: 4.3.9(@types/node@20.2.5) vite: 4.3.9(@types/node@20.2.5)(terser@5.17.6)
vitefu: 0.2.4(vite@4.3.9) vitefu: 0.2.4(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -8858,13 +8861,13 @@ snapshots:
dependencies: dependencies:
defer-to-connect: 2.0.1 defer-to-connect: 2.0.1
'@tailwindcss/typography@0.5.9(tailwindcss@3.3.2)': '@tailwindcss/typography@0.5.9(tailwindcss@3.3.2(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)))':
dependencies: dependencies:
lodash.castarray: 4.4.0 lodash.castarray: 4.4.0
lodash.isplainobject: 4.0.6 lodash.isplainobject: 4.0.6
lodash.merge: 4.6.2 lodash.merge: 4.6.2
postcss-selector-parser: 6.0.10 postcss-selector-parser: 6.0.10
tailwindcss: 3.3.2 tailwindcss: 3.3.2(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4))
'@tokenizer/token@0.3.0': {} '@tokenizer/token@0.3.0': {}
@ -8947,7 +8950,7 @@ snapshots:
'@types/node': 20.2.5 '@types/node': 20.2.5
optional: true optional: true
'@typescript-eslint/eslint-plugin@5.59.7(@typescript-eslint/parser@5.59.7)(eslint@8.41.0)(typescript@5.0.4)': '@typescript-eslint/eslint-plugin@5.59.7(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint@8.41.0)(typescript@5.0.4)':
dependencies: dependencies:
'@eslint-community/regexpp': 4.5.1 '@eslint-community/regexpp': 4.5.1
'@typescript-eslint/parser': 5.59.7(eslint@8.41.0)(typescript@5.0.4) '@typescript-eslint/parser': 5.59.7(eslint@8.41.0)(typescript@5.0.4)
@ -8961,6 +8964,7 @@ snapshots:
natural-compare-lite: 1.4.0 natural-compare-lite: 1.4.0
semver: 7.5.1 semver: 7.5.1
tsutils: 3.21.0(typescript@5.0.4) tsutils: 3.21.0(typescript@5.0.4)
optionalDependencies:
typescript: 5.0.4 typescript: 5.0.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -8972,6 +8976,7 @@ snapshots:
'@typescript-eslint/typescript-estree': 5.59.7(supports-color@9.3.1)(typescript@5.0.4) '@typescript-eslint/typescript-estree': 5.59.7(supports-color@9.3.1)(typescript@5.0.4)
debug: 4.3.4(supports-color@9.3.1) debug: 4.3.4(supports-color@9.3.1)
eslint: 8.41.0 eslint: 8.41.0
optionalDependencies:
typescript: 5.0.4 typescript: 5.0.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -8988,6 +8993,7 @@ snapshots:
debug: 4.3.4(supports-color@9.3.1) debug: 4.3.4(supports-color@9.3.1)
eslint: 8.41.0 eslint: 8.41.0
tsutils: 3.21.0(typescript@5.0.4) tsutils: 3.21.0(typescript@5.0.4)
optionalDependencies:
typescript: 5.0.4 typescript: 5.0.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -9003,6 +9009,7 @@ snapshots:
is-glob: 4.0.3 is-glob: 4.0.3
semver: 7.5.1 semver: 7.5.1
tsutils: 3.21.0(typescript@5.0.4) tsutils: 3.21.0(typescript@5.0.4)
optionalDependencies:
typescript: 5.0.4 typescript: 5.0.4
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
@ -9047,11 +9054,11 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@unocss/astro@0.51.13(rollup@3.23.0)(vite@4.3.9)': '@unocss/astro@0.51.13(rollup@3.23.0)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))':
dependencies: dependencies:
'@unocss/core': 0.51.13 '@unocss/core': 0.51.13
'@unocss/reset': 0.51.13 '@unocss/reset': 0.51.13
'@unocss/vite': 0.51.13(rollup@3.23.0)(vite@4.3.9) '@unocss/vite': 0.51.13(rollup@3.23.0)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
transitivePeerDependencies: transitivePeerDependencies:
- rollup - rollup
- vite - vite
@ -9168,7 +9175,7 @@ snapshots:
dependencies: dependencies:
'@unocss/core': 0.51.13 '@unocss/core': 0.51.13
'@unocss/vite@0.51.13(rollup@3.23.0)(vite@4.3.9)': '@unocss/vite@0.51.13(rollup@3.23.0)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))':
dependencies: dependencies:
'@ampproject/remapping': 2.2.1 '@ampproject/remapping': 2.2.1
'@rollup/pluginutils': 5.0.2(rollup@3.23.0) '@rollup/pluginutils': 5.0.2(rollup@3.23.0)
@ -9180,7 +9187,7 @@ snapshots:
chokidar: 3.5.3 chokidar: 3.5.3
fast-glob: 3.2.12 fast-glob: 3.2.12
magic-string: 0.30.0 magic-string: 0.30.0
vite: 4.3.9(@types/node@20.2.5) vite: 4.3.9(@types/node@20.2.5)(terser@5.17.6)
transitivePeerDependencies: transitivePeerDependencies:
- rollup - rollup
@ -9218,10 +9225,10 @@ snapshots:
- encoding - encoding
- supports-color - supports-color
'@vite-pwa/sveltekit@0.1.3(@sveltejs/kit@1.19.0)(vite-plugin-pwa@0.14.7)': '@vite-pwa/sveltekit@0.1.3(@sveltejs/kit@1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)))(vite-plugin-pwa@0.14.7(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))(workbox-build@6.6.0)(workbox-window@6.6.0))':
dependencies: dependencies:
'@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9) '@sveltejs/kit': 1.19.0(svelte@3.59.1)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
vite-plugin-pwa: 0.14.7(vite@4.3.9)(workbox-build@6.6.0)(workbox-window@6.6.0) vite-plugin-pwa: 0.14.7(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))(workbox-build@6.6.0)(workbox-window@6.6.0)
'@xhmikosr/archive-type@6.0.1': '@xhmikosr/archive-type@6.0.1':
dependencies: dependencies:
@ -9313,7 +9320,7 @@ snapshots:
ajv: 8.12.0 ajv: 8.12.0
ajv-formats@2.1.1(ajv@8.12.0): ajv-formats@2.1.1(ajv@8.12.0):
dependencies: optionalDependencies:
ajv: 8.12.0 ajv: 8.12.0
ajv@6.12.6: ajv@6.12.6:
@ -9390,7 +9397,7 @@ snapshots:
entities: 2.2.0 entities: 2.2.0
any-observable@0.3.0(rxjs@6.6.7): any-observable@0.3.0(rxjs@6.6.7):
dependencies: optionalDependencies:
rxjs: 6.6.7 rxjs: 6.6.7
any-promise@1.3.0: {} any-promise@1.3.0: {}
@ -10084,14 +10091,14 @@ snapshots:
cyclist@1.0.1: {} cyclist@1.0.1: {}
daisyui@2.51.6(autoprefixer@10.4.14)(postcss@8.4.23): daisyui@2.51.6(autoprefixer@10.4.14(postcss@8.4.23))(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)):
dependencies: dependencies:
autoprefixer: 10.4.14(postcss@8.4.23) autoprefixer: 10.4.14(postcss@8.4.23)
color: 4.2.3 color: 4.2.3
css-selector-tokenizer: 0.8.0 css-selector-tokenizer: 0.8.0
postcss: 8.4.23 postcss: 8.4.23
postcss-js: 4.0.1(postcss@8.4.23) postcss-js: 4.0.1(postcss@8.4.23)
tailwindcss: 3.3.2 tailwindcss: 3.3.2(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4))
transitivePeerDependencies: transitivePeerDependencies:
- ts-node - ts-node
@ -10110,6 +10117,7 @@ snapshots:
debug@4.3.4(supports-color@9.3.1): debug@4.3.4(supports-color@9.3.1):
dependencies: dependencies:
ms: 2.1.2 ms: 2.1.2
optionalDependencies:
supports-color: 9.3.1 supports-color: 9.3.1
decache@4.6.2: decache@4.6.2:
@ -10736,7 +10744,9 @@ snapshots:
dependencies: dependencies:
pend: 1.2.0 pend: 1.2.0
fdir@6.1.0: {} fdir@6.1.0(picomatch@2.3.1):
optionalDependencies:
picomatch: 2.3.1
fecha@4.2.3: {} fecha@4.2.3: {}
@ -10868,7 +10878,7 @@ snapshots:
from2: 2.3.0 from2: 2.3.0
follow-redirects@1.15.2(debug@4.3.4): follow-redirects@1.15.2(debug@4.3.4):
dependencies: optionalDependencies:
debug: 4.3.4(supports-color@9.3.1) debug: 4.3.4(supports-color@9.3.1)
for-each@0.3.3: for-each@0.3.3:
@ -12290,11 +12300,11 @@ snapshots:
nested-error-stacks@2.1.1: {} nested-error-stacks@2.1.1: {}
netlify-cli@16.3.1(@types/node@20.2.5): netlify-cli@16.3.1(@types/node@20.2.5)(picomatch@2.3.1):
dependencies: dependencies:
'@bugsnag/js': 7.20.2 '@bugsnag/js': 7.20.2
'@fastify/static': 6.10.2 '@fastify/static': 6.10.2
'@netlify/build': 29.20.13(@types/node@20.2.5)(debug@4.3.4) '@netlify/build': 29.20.13(@types/node@20.2.5)(debug@4.3.4)(picomatch@2.3.1)
'@netlify/build-info': 7.8.0 '@netlify/build-info': 7.8.0
'@netlify/config': 20.8.1 '@netlify/config': 20.8.1
'@netlify/edge-bundler': 8.19.1 '@netlify/edge-bundler': 8.19.1
@ -12854,11 +12864,13 @@ snapshots:
lightningcss: 1.20.0 lightningcss: 1.20.0
postcss: 8.4.23 postcss: 8.4.23
postcss-load-config@4.0.1(postcss@8.4.23): postcss-load-config@4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)):
dependencies: dependencies:
lilconfig: 2.1.0 lilconfig: 2.1.0
postcss: 8.4.23
yaml: 2.3.1 yaml: 2.3.1
optionalDependencies:
postcss: 8.4.23
ts-node: 10.9.1(@types/node@20.2.5)(typescript@5.0.4)
postcss-nested@6.0.1(postcss@8.4.23): postcss-nested@6.0.1(postcss@8.4.23):
dependencies: dependencies:
@ -13791,7 +13803,7 @@ snapshots:
svelte-bricks@0.1.7: {} svelte-bricks@0.1.7: {}
svelte-check@3.4.3(@babel/core@7.22.1)(postcss@8.4.23)(svelte@3.59.1): svelte-check@3.4.3(@babel/core@7.22.1)(postcss-load-config@4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)))(postcss@8.4.23)(svelte@3.59.1):
dependencies: dependencies:
'@jridgewell/trace-mapping': 0.3.18 '@jridgewell/trace-mapping': 0.3.18
chokidar: 3.5.3 chokidar: 3.5.3
@ -13800,7 +13812,7 @@ snapshots:
picocolors: 1.0.0 picocolors: 1.0.0
sade: 1.8.1 sade: 1.8.1
svelte: 3.59.1 svelte: 3.59.1
svelte-preprocess: 5.0.4(@babel/core@7.22.1)(postcss@8.4.23)(svelte@3.59.1)(typescript@5.0.4) svelte-preprocess: 5.0.4(@babel/core@7.22.1)(postcss-load-config@4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)))(postcss@8.4.23)(svelte@3.59.1)(typescript@5.0.4)
typescript: 5.0.4 typescript: 5.0.4
transitivePeerDependencies: transitivePeerDependencies:
- '@babel/core' - '@babel/core'
@ -13817,16 +13829,18 @@ snapshots:
dependencies: dependencies:
svelte: 3.59.1 svelte: 3.59.1
svelte-preprocess@5.0.4(@babel/core@7.22.1)(postcss@8.4.23)(svelte@3.59.1)(typescript@5.0.4): svelte-preprocess@5.0.4(@babel/core@7.22.1)(postcss-load-config@4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)))(postcss@8.4.23)(svelte@3.59.1)(typescript@5.0.4):
dependencies: dependencies:
'@babel/core': 7.22.1
'@types/pug': 2.0.6 '@types/pug': 2.0.6
detect-indent: 6.1.0 detect-indent: 6.1.0
magic-string: 0.27.0 magic-string: 0.27.0
postcss: 8.4.23
sorcery: 0.11.0 sorcery: 0.11.0
strip-indent: 3.0.0 strip-indent: 3.0.0
svelte: 3.59.1 svelte: 3.59.1
optionalDependencies:
'@babel/core': 7.22.1
postcss: 8.4.23
postcss-load-config: 4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4))
typescript: 5.0.4 typescript: 5.0.4
svelte-search@1.1.0: {} svelte-search@1.1.0: {}
@ -13853,7 +13867,7 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
tailwindcss@3.3.2: tailwindcss@3.3.2(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4)):
dependencies: dependencies:
'@alloc/quick-lru': 5.2.0 '@alloc/quick-lru': 5.2.0
arg: 5.0.2 arg: 5.0.2
@ -13872,7 +13886,7 @@ snapshots:
postcss: 8.4.23 postcss: 8.4.23
postcss-import: 15.1.0(postcss@8.4.23) postcss-import: 15.1.0(postcss@8.4.23)
postcss-js: 4.0.1(postcss@8.4.23) postcss-js: 4.0.1(postcss@8.4.23)
postcss-load-config: 4.0.1(postcss@8.4.23) postcss-load-config: 4.0.1(postcss@8.4.23)(ts-node@10.9.1(@types/node@20.2.5)(typescript@5.0.4))
postcss-nested: 6.0.1(postcss@8.4.23) postcss-nested: 6.0.1(postcss@8.4.23)
postcss-selector-parser: 6.0.13 postcss-selector-parser: 6.0.13
postcss-value-parser: 4.2.0 postcss-value-parser: 4.2.0
@ -14225,9 +14239,9 @@ snapshots:
dependencies: dependencies:
normalize-path: 2.1.1 normalize-path: 2.1.1
unocss@0.51.13(postcss@8.4.23)(rollup@3.23.0)(vite@4.3.9): unocss@0.51.13(postcss@8.4.23)(rollup@3.23.0)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)):
dependencies: dependencies:
'@unocss/astro': 0.51.13(rollup@3.23.0)(vite@4.3.9) '@unocss/astro': 0.51.13(rollup@3.23.0)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
'@unocss/cli': 0.51.13(rollup@3.23.0) '@unocss/cli': 0.51.13(rollup@3.23.0)
'@unocss/core': 0.51.13 '@unocss/core': 0.51.13
'@unocss/extractor-arbitrary-variants': 0.51.13 '@unocss/extractor-arbitrary-variants': 0.51.13
@ -14246,7 +14260,7 @@ snapshots:
'@unocss/transformer-compile-class': 0.51.13 '@unocss/transformer-compile-class': 0.51.13
'@unocss/transformer-directives': 0.51.13 '@unocss/transformer-directives': 0.51.13
'@unocss/transformer-variant-group': 0.51.13 '@unocss/transformer-variant-group': 0.51.13
'@unocss/vite': 0.51.13(rollup@3.23.0)(vite@4.3.9) '@unocss/vite': 0.51.13(rollup@3.23.0)(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))
transitivePeerDependencies: transitivePeerDependencies:
- postcss - postcss
- rollup - rollup
@ -14349,31 +14363,32 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- rollup - rollup
vite-plugin-pwa@0.14.7(vite@4.3.9)(workbox-build@6.6.0)(workbox-window@6.6.0): vite-plugin-pwa@0.14.7(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6))(workbox-build@6.6.0)(workbox-window@6.6.0):
dependencies: dependencies:
'@rollup/plugin-replace': 5.0.2(rollup@3.23.0) '@rollup/plugin-replace': 5.0.2(rollup@3.23.0)
debug: 4.3.4(supports-color@9.3.1) debug: 4.3.4(supports-color@9.3.1)
fast-glob: 3.2.12 fast-glob: 3.2.12
pretty-bytes: 6.1.0 pretty-bytes: 6.1.0
rollup: 3.23.0 rollup: 3.23.0
vite: 4.3.9(@types/node@20.2.5) vite: 4.3.9(@types/node@20.2.5)(terser@5.17.6)
workbox-build: 6.6.0 workbox-build: 6.6.0
workbox-window: 6.6.0 workbox-window: 6.6.0
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
vite@4.3.9(@types/node@20.2.5): vite@4.3.9(@types/node@20.2.5)(terser@5.17.6):
dependencies: dependencies:
'@types/node': 20.2.5
esbuild: 0.17.19 esbuild: 0.17.19
postcss: 8.4.23 postcss: 8.4.23
rollup: 3.23.0 rollup: 3.23.0
optionalDependencies: optionalDependencies:
'@types/node': 20.2.5
fsevents: 2.3.2 fsevents: 2.3.2
terser: 5.17.6
vitefu@0.2.4(vite@4.3.9): vitefu@0.2.4(vite@4.3.9(@types/node@20.2.5)(terser@5.17.6)):
dependencies: optionalDependencies:
vite: 4.3.9(@types/node@20.2.5) vite: 4.3.9(@types/node@20.2.5)(terser@5.17.6)
vscode-oniguruma@1.7.0: {} vscode-oniguruma@1.7.0: {}

View file

@ -42,24 +42,29 @@ tags:
- 一般不在`main` 或`master` 修改代码,而是开一个 branch确定好后再 merge - 一般不在`main` 或`master` 修改代码,而是开一个 branch确定好后再 merge
- 下载叫做 pull上传是 push - 下载叫做 pull上传是 push
| 命令 | 作用 | | 命令 | 作用 |
| :----------------------------------------------------------- | ------------------------------------------------- | | :------------------------------------------------------------- | -------------------------------------------------- |
| `git config --global user.name 名字` | 设置名字 | | `git config --global user.name "名字"` | 设置全局用户名 |
| `git config --global user.email 邮箱` | 设置邮件 | | `git config --global user.email "邮箱"` | 设置全局邮箱 |
| `git init` | 初始化 | | `git init` | 初始化仓库 |
| `git add -A` | 追踪所有文件(除了 gitignore 里面的),也可以单独加 | | `git add -A` | 追踪所有文件(除了.gitignore里的也可以单独添加 |
| `git commit -m` | m 代表信息,后面要写 commit 相关信息 | | `git commit -m "提交信息"` | 提交更改,-m 后跟提交信息 |
| `git status` | 查看 git 状态/信息 | | `git status` | 查看仓库状态 |
| `git log` | 查看 commit 日志,按 Q 才可以退出 | | `git log` | 查看提交日志,按 Q 退出 |
| `git reset hard (commit的id` | 回到特定版本 | | `git reset --hard <commit_id>` | 回到特定版本 |
| `git reset hard --HEAD` | 返回上一次改动 (还没有 commit) | | `git reset --hard HEAD^` | 返回上一次改动还没有commit |
| `git branch` | 列出现在有的 branch,按 Q 退出 | | `git branch` | 列出所有分支,按 Q 退出 |
| `git branch branch'name)` | 创建新 branch | | `git branch <branch_name>` | 创建新分支 |
| `git merge branch'name)` | 合并 branch 到 main | | `git merge <branch_name>` | 将指定分支合并到当前分支 |
| `git checkout (branch's name)` | 切换 branch | | `git checkout -b <new_branch>` | 创建新分支并切换到该分支 |
| `git remote add origin https://github.com/用户名/仓库名.git` | 链接到 remote repo | | `git checkout <branch_name>` | 切换到指定分支 |
| `git pull` | 拉更新 | | `git remote add origin https://github.com/username/repo.git` | 添加远程仓库 |
| `git push origin (branch'name)` | push 到 remote repo | | `git pull` | 从远程仓库拉取更新 |
| `git push origin <branch_name>` | 推送指定分支到远程仓库 |
| `git config --global push.default current` | 设置推送默认行为为推送当前分支到同名远程分支 [^1] |
| `git commit --amend --author="Name <email@example.com>"` | 修改最近一次提交的作者信息 |
| `git config --global push.autoSetupRemote true` | 自动设置远程跟踪分支 |
| `git config --global http.proxy http://proxy.example.com:8080` | 设置全局 HTTP 代理[^2] |
## 常见问题 ## 常见问题

View file

@ -0,0 +1,122 @@
---
title: Git使用随记
created: 2024-10-28
summary: git alias,git add -A,git add .
tags:
- Git
---
## 最近常用Alias
### git random
功能:在制定的某个时间段内随机提交,并且每次提交都要比前次提交时间晚,适用于 MacOS、Linux其他系统未经验证。
比如说今晚22:00到明天3:00之间
```bash
git config --global alias.random '!f() {
# 获取最后一次提交的时间戳
last_commit_time=$(git log -1 --format=%ct 2>/dev/null)
# 如果没有之前的提交,使用当前时间作为基准
if [ -z "$last_commit_time" ]; then
last_commit_time=$(date +%s)
fi
# 计算下一个可用的时间戳(最后提交时间 + 1分钟
next_available_time=$((last_commit_time + 60))
# 获取今天 22:00 的时间戳
if [[ "$OSTYPE" == "darwin"* ]]; then
# MacOS
today=$(date -v22H -v00M -v00S +%s)
tomorrow=$(date -v+1d -v02H -v59M -v59S +%s)
else
# Linux
today=$(date -d "$(date +%Y-%m-%d) 22:00:00" +%s)
tomorrow=$(date -d "$(date -d tomorrow +%Y-%m-%d) 02:59:59" +%s)
fi
# 确保下一个可用时间在今天 22:00 到明天 02:59 之间
if [ $next_available_time -lt $today ]; then
next_available_time=$today
elif [ $next_available_time -gt $tomorrow ]; then
next_available_time=$tomorrow
fi
# 在下一个可用时间和明天 02:59 之间随机选择一个时间
if [[ "$OSTYPE" == "darwin"* ]]; then
# MacOS
random_time=$(jot -r 1 $next_available_time $tomorrow)
FISH_DATE=$(date -r $random_time "+%Y-%m-%d %H:%M:%S")
else
# Linux
random_time=$(shuf -i $next_available_time-$tomorrow -n 1)
FISH_DATE=$(date -d "@$random_time" "+%Y-%m-%d %H:%M:%S")
fi
# 如果没有提供提交信息,使用默认信息
commit_message=${1:-"Random commit at $FISH_DATE"}
# 设置环境变量并提交
GIT_AUTHOR_DATE="$FISH_DATE" \
GIT_COMMITTER_DATE="$FISH_DATE" \
git commit -m "$commit_message"
}; f'
```
### git add -A + git commit -m "" 合并,快速提交
设置:
```bash
git config --global alias.fast '!git add -A && git commit -m'
```
使用:
```bash
git fast "Your commit message here"
```
### undo
撤销最后一次commit但保留所有更改
设置:
```bash
git config --global alias.undo 'reset --soft HEAD^'
```
使用:
```bash
git undo
```
### cancel
完全撤销最后一次commit丢弃所有更改
设置:
```bash
git config --global alias.cancel 'reset --hard HEAD^'
```
使用:
```bash
git cancel
```
### `git add -A``git add .` 的区别
一年多前和朋友讨论过这个问题,但是我没太理解,我一直用的是 git add -A。最近突然懂了因为`.` 表示的是当前目录,所以 `git add .` 只会添加当前目录以及其子目录下的改动(类似于相对路径);而 A 表示 All所以 `git add -A `会添加整个工作区的变动,不管在哪个目录执行。
不过如果在根目录下执行,这两个命令就是等价的。
### Git 学习资料
按推荐程度排序:
- [Learn Git Branching](https://learngitbranching.js.org/):既有图形可视化,又有跟使用场景贴近的练习,文字讲解也很清晰,但个人建议阅读繁体版本。
- [Oh My Git!](https://ohmygit.org/): 游戏化的教程,很有意思,但还是有点抽象,跟实际场景不是特别贴切。
- [gitchat](https://wkevin.github.io/GitChat/gitchat.html#round-1-%E8%B5%B7%E6%AD%A5): 风趣易懂的文字教程
- [Learn Git with Bitbucket Cloud | Atlassian Git Tutorial](https://www.atlassian.com/git/tutorials/learn-git-with-bitbucket-cloud)
- [Pro Git 第二版(中文版) · 看云](https://www.kancloud.cn/kancloud/progit)
## Commit 规范
- [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
借此机会,我对之前的文章:[Git · 常用操作笔记](https://seviche.cc/2022-05-25-git/) 中的命令表格进行了更新。