feat: pull changes from upstream + update packages
This commit is contained in:
		
							parent
							
								
									fb5555c1f7
								
							
						
					
					
						commit
						5a39cdc2ec
					
				| 
						 | 
					@ -4,6 +4,7 @@
 | 
				
			||||||
    <meta charset="UTF-8" />
 | 
					    <meta charset="UTF-8" />
 | 
				
			||||||
    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
 | 
					    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
 | 
				
			||||||
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 | 
					    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 | 
				
			||||||
 | 
					    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
 | 
				
			||||||
    <title>Electron + Vite + React</title>
 | 
					    <title>Electron + Vite + React</title>
 | 
				
			||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
  <body>
 | 
					  <body>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										12
									
								
								package.json
								
								
								
								
							
							
						
						
									
										12
									
								
								package.json
								
								
								
								
							| 
						 | 
					@ -17,18 +17,18 @@
 | 
				
			||||||
    "preview": "vite preview"
 | 
					    "preview": "vite preview"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "@types/react": "^18.0.26",
 | 
					    "@types/react": "^18.0.27",
 | 
				
			||||||
    "@types/react-dom": "^18.0.10",
 | 
					    "@types/react-dom": "^18.0.10",
 | 
				
			||||||
    "@vitejs/plugin-react": "^3.0.0",
 | 
					    "@vitejs/plugin-react": "^3.0.1",
 | 
				
			||||||
    "electron": "^22.0.0",
 | 
					    "electron": "^22.0.3",
 | 
				
			||||||
    "electron-builder": "^23.6.0",
 | 
					    "electron-builder": "^23.6.0",
 | 
				
			||||||
    "react": "^18.2.0",
 | 
					    "react": "^18.2.0",
 | 
				
			||||||
    "react-dom": "^18.2.0",
 | 
					    "react-dom": "^18.2.0",
 | 
				
			||||||
    "sass": "^1.57.1",
 | 
					    "sass": "^1.57.1",
 | 
				
			||||||
    "typescript": "^4.9.4",
 | 
					    "typescript": "^4.9.4",
 | 
				
			||||||
    "vite": "^4.0.3",
 | 
					    "vite": "^4.0.4",
 | 
				
			||||||
    "vite-electron-plugin": "^0.6.4",
 | 
					    "vite-electron-plugin": "^0.7.4",
 | 
				
			||||||
    "vite-plugin-electron-renderer": "^0.11.3"
 | 
					    "vite-plugin-electron-renderer": "^0.11.4"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "engines": {
 | 
					  "engines": {
 | 
				
			||||||
    "node": "^14.18.0 || >=16.0.0"
 | 
					    "node": "^14.18.0 || >=16.0.0"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,6 @@
 | 
				
			||||||
:root {
 | 
					:root {
 | 
				
			||||||
  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
 | 
					  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
 | 
				
			||||||
  font-size: 16px;
 | 
					  line-height: 1.5;
 | 
				
			||||||
  line-height: 24px;
 | 
					 | 
				
			||||||
  font-weight: 400;
 | 
					  font-weight: 400;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  color-scheme: light dark;
 | 
					  color-scheme: light dark;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue