Merge branch 'main' into staging
This commit is contained in:
		
						commit
						c7cf64a201
					
				
							
								
								
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							@ -13,7 +13,7 @@ jobs:
 | 
				
			|||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 | 
					      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 | 
				
			||||||
      - run: corepack enable
 | 
					      - run: corepack enable
 | 
				
			||||||
      - uses: actions/setup-node@v3
 | 
					      - uses: actions/setup-node@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          node-version: 16
 | 
					          node-version: 16
 | 
				
			||||||
          cache: 'pnpm'
 | 
					          cache: 'pnpm'
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/docker-nightly-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/docker-nightly-release.yml
									
									
									
									
										vendored
									
									
								
							@ -30,7 +30,7 @@ jobs:
 | 
				
			|||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 | 
					      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
 | 
				
			||||||
      - run: corepack enable
 | 
					      - run: corepack enable
 | 
				
			||||||
      - uses: actions/setup-node@v3
 | 
					      - uses: actions/setup-node@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          node-version: 16
 | 
					          node-version: 16
 | 
				
			||||||
          cache: 'pnpm'
 | 
					          cache: 'pnpm'
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/e2e-tests.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/e2e-tests.yml
									
									
									
									
										vendored
									
									
								
							@ -16,7 +16,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
      - run: corepack enable
 | 
					      - run: corepack enable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - uses: actions/setup-node@v3
 | 
					      - uses: actions/setup-node@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          node-version: 16
 | 
					          node-version: 16
 | 
				
			||||||
          cache: 'pnpm'
 | 
					          cache: 'pnpm'
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/releases.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/releases.yml
									
									
									
									
										vendored
									
									
								
							@ -59,7 +59,7 @@ jobs:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
      - run: corepack enable
 | 
					      - run: corepack enable
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      - uses: actions/setup-node@v3
 | 
					      - uses: actions/setup-node@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          node-version: 16
 | 
					          node-version: 16
 | 
				
			||||||
          cache: 'pnpm'
 | 
					          cache: 'pnpm'
 | 
				
			||||||
 | 
				
			|||||||
@ -126,10 +126,10 @@
 | 
				
			|||||||
    "typescript": "~5.3.0",
 | 
					    "typescript": "~5.3.0",
 | 
				
			||||||
    "unocss": "^0.58.0",
 | 
					    "unocss": "^0.58.0",
 | 
				
			||||||
    "unocss-preset-scrollbar": "^0.3.0",
 | 
					    "unocss-preset-scrollbar": "^0.3.0",
 | 
				
			||||||
    "unplugin-icons": "^0.17.0",
 | 
					    "unplugin-icons": "^0.18.0",
 | 
				
			||||||
    "unplugin-vue-components": "^0.26.0",
 | 
					    "unplugin-vue-components": "^0.26.0",
 | 
				
			||||||
    "vite": "^4.4.9",
 | 
					    "vite": "^4.4.9",
 | 
				
			||||||
    "vite-plugin-pwa": "^0.16.0",
 | 
					    "vite-plugin-pwa": "^0.17.0",
 | 
				
			||||||
    "vite-plugin-vue-markdown": "^0.23.5",
 | 
					    "vite-plugin-vue-markdown": "^0.23.5",
 | 
				
			||||||
    "vite-svg-loader": "^4.0.0",
 | 
					    "vite-svg-loader": "^4.0.0",
 | 
				
			||||||
    "vitest": "^0.34.0",
 | 
					    "vitest": "^0.34.0",
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										765
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										765
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Loading…
	
		Reference in New Issue
	
	Block a user