Merge branch 'main' into draft-settingsViewDaisy

This commit is contained in:
Seth Forsgren 2022-12-12 11:29:32 -08:00
commit 962d57bcc2
3 changed files with 23 additions and 1 deletions

15
package-lock.json generated
View File

@ -12,6 +12,7 @@
"@react-three/drei": "^9.41.2",
"@react-three/fiber": "^8.9.1",
"daisyui": "^2.43.0",
"@vercel/analytics": "^0.1.6",
"eslint": "8.27.0",
"eslint-config-next": "13.0.4",
"next": "13.0.4",
@ -1082,6 +1083,14 @@
"react": ">= 16.8.0"
}
},
"node_modules/@vercel/analytics": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/@vercel/analytics/-/analytics-0.1.6.tgz",
"integrity": "sha512-zNd5pj3iDvq8IMBQHa1YRcIteiw6ZiPB8AsONHd8ieFXlNpLqhXfIYnf4WvTfZ7S1NSJ++mIM14aJnNac/VMXQ==",
"peerDependencies": {
"react": "^16.8||^17||^18"
}
},
"node_modules/@webgpu/glslang": {
"version": "0.0.15",
"resolved": "https://registry.npmjs.org/@webgpu/glslang/-/glslang-0.0.15.tgz",
@ -5427,6 +5436,12 @@
"@use-gesture/core": "10.2.22"
}
},
"@vercel/analytics": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/@vercel/analytics/-/analytics-0.1.6.tgz",
"integrity": "sha512-zNd5pj3iDvq8IMBQHa1YRcIteiw6ZiPB8AsONHd8ieFXlNpLqhXfIYnf4WvTfZ7S1NSJ++mIM14aJnNac/VMXQ==",
"requires": {}
},
"@webgpu/glslang": {
"version": "0.0.15",
"resolved": "https://registry.npmjs.org/@webgpu/glslang/-/glslang-0.0.15.tgz",

View File

@ -13,6 +13,7 @@
"@react-three/drei": "^9.41.2",
"@react-three/fiber": "^8.9.1",
"daisyui": "^2.43.0",
"@vercel/analytics": "^0.1.6",
"eslint": "8.27.0",
"eslint-config-next": "13.0.4",
"next": "13.0.4",

View File

@ -1,8 +1,14 @@
import "../styles/globals.css";
import type { AppProps } from "next/app";
import { Analytics } from "@vercel/analytics/react";
function MyApp({ Component, pageProps }: AppProps) {
return <Component {...pageProps} />;
return (
<>
<Component {...pageProps} />
<Analytics />
</>
);
}
export default MyApp;