mirror of
				https://github.com/TriliumNext/Notes.git
				synced 2025-11-04 15:11:31 +08:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into feature/highlightjs
This commit is contained in:
		
						commit
						f859b374a3
					
				@ -38,7 +38,7 @@
 | 
				
			|||||||
    "@playwright/test": "1.52.0",
 | 
					    "@playwright/test": "1.52.0",
 | 
				
			||||||
    "@stylistic/eslint-plugin": "4.2.0",        
 | 
					    "@stylistic/eslint-plugin": "4.2.0",        
 | 
				
			||||||
    "@types/express": "5.0.1",    
 | 
					    "@types/express": "5.0.1",    
 | 
				
			||||||
    "@types/node": "22.15.18",    
 | 
					    "@types/node": "22.15.19",    
 | 
				
			||||||
    "@types/yargs": "17.0.33",
 | 
					    "@types/yargs": "17.0.33",
 | 
				
			||||||
    "@vitest/coverage-v8": "3.1.3",
 | 
					    "@vitest/coverage-v8": "3.1.3",
 | 
				
			||||||
    "eslint": "9.27.0",
 | 
					    "eslint": "9.27.0",
 | 
				
			||||||
 | 
				
			|||||||
@ -46,7 +46,7 @@
 | 
				
			|||||||
    "@swc/helpers": "~0.5.11",
 | 
					    "@swc/helpers": "~0.5.11",
 | 
				
			||||||
    "@triliumnext/server": "workspace:*",
 | 
					    "@triliumnext/server": "workspace:*",
 | 
				
			||||||
    "@types/express": "^4.17.21",
 | 
					    "@types/express": "^4.17.21",
 | 
				
			||||||
    "@types/node": "22.15.18",
 | 
					    "@types/node": "22.15.19",
 | 
				
			||||||
    "@vitest/coverage-v8": "^3.0.5",
 | 
					    "@vitest/coverage-v8": "^3.0.5",
 | 
				
			||||||
    "@vitest/ui": "^3.0.0",
 | 
					    "@vitest/ui": "^3.0.0",
 | 
				
			||||||
    "chalk": "5.4.1",
 | 
					    "chalk": "5.4.1",
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										531
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										531
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user