Merge branch 'canary' into eliminate-unnecessary-decodes

vercel · Mar 18, 2024 · ca12050 · ca12050
2 parents 23c0c93 + a2e3b27
commit ca12050
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 85 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,11 +37,11 @@ swc_core = { version = "0.90.22", features = [
 testing = { version = "0.35.20" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240315.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240318.2" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240315.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240318.2" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240315.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240318.2" }
 
 # General Deps
 

diff --git a/examples/with-jotai/app/layout.tsx b/examples/with-jotai/app/layout.tsx
@@ -0,0 +1,20 @@
+import { Provider } from "jotai";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  icons: "/favicon.ico",
+};
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <html lang="en">
+      <body>
+        <Provider>{children}</Provider>
+      </body>
+    </html>
+  );
+}
diff --git a/examples/with-jotai/pages/index.tsx → examples/with-jotai/app/page.tsx b/examples/with-jotai/pages/index.tsx → examples/with-jotai/app/page.tsx
@@ -1,16 +1,17 @@
-import Head from "next/head";
 import Image from "next/image";
 import styles from "../styles/Home.module.css";
+import "../styles/globals.css";
 import Canvas from "../components/Canvas";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "with-jotai",
+  description: "Generated by create next app",
+};
 
 export default function Home() {
   return (
     <div className={styles.container}>
-      <Head>
-        <title>with-jotai</title>
-        <meta name="description" content="Generated by create next app" />
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
       <h1 className={styles.title}>With Jotai example</h1>
       <main className={styles.main}>
         <Canvas />

diff --git a/examples/with-jotai/components/Canvas.tsx b/examples/with-jotai/components/Canvas.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import { atom, useAtom } from "jotai";
 
 type Point = [number, number];

diff --git a/examples/with-jotai/package.json b/examples/with-jotai/package.json
@@ -6,12 +6,13 @@
     "start": "next start"
   },
   "dependencies": {
-    "jotai": "1.7.3",
+    "jotai": "2.7.1",
     "next": "latest",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },
   "devDependencies": {
+    "@types/node": "20.11.28",
     "@types/react": "17.0.16",
     "eslint": "7.32.0",
     "eslint-config-next": "11.0.1",