Skip to content

Commit ca12050

Browse files
Ethan-ArrowoodEthan-Arrowood
authored
Merge branch 'canary' into eliminate-unnecessary-decodes
2 parents 23c0c93 + a2e3b27 commit ca12050

File tree

13 files changed

+86
-85
lines changed

13 files changed

+86
-85
lines changed

‎Cargo.lock

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ swc_core = { version = "0.90.22", features = [
3737
testing = { version = "0.35.20" }
3838

3939
# Turbo crates
40-
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240315.2" }
40+
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240318.2" }
4141
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
42-
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240315.2" }
42+
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240318.2" }
4343
# [TODO]: need to refactor embed_directory! macro usage in next-core
44-
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240315.2" }
44+
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240318.2" }
4545

4646
# General Deps
4747

‎examples/with-jotai/app/layout.tsx

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { Provider } from "jotai";
2+
import { Metadata } from "next";
3+
4+
export const metadata: Metadata = {
5+
icons: "/favicon.ico",
6+
};
7+
8+
export default function RootLayout({
9+
children,
10+
}: {
11+
children: React.ReactNode;
12+
}) {
13+
return (
14+
<html lang="en">
15+
<body>
16+
<Provider>{children}</Provider>
17+
</body>
18+
</html>
19+
);
20+
}

‎examples/with-jotai/pages/index.tsx renamed to ‎examples/with-jotai/app/page.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
import Head from "next/head";
21
import Image from "next/image";
32
import styles from "../styles/Home.module.css";
3+
import "../styles/globals.css";
44
import Canvas from "../components/Canvas";
5+
import { Metadata } from "next";
6+
7+
export const metadata: Metadata = {
8+
title: "with-jotai",
9+
description: "Generated by create next app",
10+
};
511

612
export default function Home() {
713
return (
814
<div className={styles.container}>
9-
<Head>
10-
<title>with-jotai</title>
11-
<meta name="description" content="Generated by create next app" />
12-
<link rel="icon" href="/favicon.ico" />
13-
</Head>
1415
<h1 className={styles.title}>With Jotai example</h1>
1516
<main className={styles.main}>
1617
<Canvas />

‎examples/with-jotai/components/Canvas.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
"use client";
2+
13
import { atom, useAtom } from "jotai";
24

35
type Point = [number, number];

‎examples/with-jotai/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66
"start": "next start"
77
},
88
"dependencies": {
9-
"jotai": "1.7.3",
9+
"jotai": "2.7.1",
1010
"next": "latest",
1111
"react": "18.2.0",
1212
"react-dom": "18.2.0"
1313
},
1414
"devDependencies": {
15+
"@types/node": "20.11.28",
1516
"@types/react": "17.0.16",
1617
"eslint": "7.32.0",
1718
"eslint-config-next": "11.0.1",

0 commit comments

Comments
 (0)