From 02a99bb2a2c5505a114549dd4d4e991757fbd025 Mon Sep 17 00:00:00 2001 From: Cupid Valentine Date: Fri, 1 Jul 2022 00:12:30 +0800 Subject: [PATCH 01/22] Add nextui example --- examples/with-next-ui/.gitignore | 35 +++++++++ examples/with-next-ui/README.md | 25 ++++++ examples/with-next-ui/common/interface.ts | 6 ++ examples/with-next-ui/components/Checkbox.tsx | 19 +++++ examples/with-next-ui/components/Collapse.tsx | 35 +++++++++ examples/with-next-ui/components/Mail.tsx | 24 ++++++ examples/with-next-ui/components/Model.tsx | 72 ++++++++++++++++++ examples/with-next-ui/components/Password.tsx | 17 +++++ examples/with-next-ui/components/Table.tsx | 44 +++++++++++ examples/with-next-ui/next-env.d.ts | 5 ++ examples/with-next-ui/next.config.js | 8 ++ examples/with-next-ui/package.json | 29 +++++++ examples/with-next-ui/pages/_app.tsx | 14 ++++ examples/with-next-ui/pages/_document.tsx | 39 ++++++++++ examples/with-next-ui/pages/api/hello.ts | 13 ++++ examples/with-next-ui/pages/index.tsx | 62 +++++++++++++++ examples/with-next-ui/public/favicon.ico | Bin 0 -> 25931 bytes examples/with-next-ui/public/vercel.svg | 4 + examples/with-next-ui/styles/Home.module.css | 64 ++++++++++++++++ examples/with-next-ui/styles/globals.css | 16 ++++ examples/with-next-ui/tsconfig.json | 20 +++++ 21 files changed, 551 insertions(+) create mode 100755 examples/with-next-ui/.gitignore create mode 100755 examples/with-next-ui/README.md create mode 100644 examples/with-next-ui/common/interface.ts create mode 100644 examples/with-next-ui/components/Checkbox.tsx create mode 100644 examples/with-next-ui/components/Collapse.tsx create mode 100644 examples/with-next-ui/components/Mail.tsx create mode 100644 examples/with-next-ui/components/Model.tsx create mode 100644 examples/with-next-ui/components/Password.tsx create mode 100644 examples/with-next-ui/components/Table.tsx create mode 100755 examples/with-next-ui/next-env.d.ts create mode 100755 examples/with-next-ui/next.config.js create mode 100644 examples/with-next-ui/package.json create mode 100755 examples/with-next-ui/pages/_app.tsx create mode 100644 examples/with-next-ui/pages/_document.tsx create mode 100755 examples/with-next-ui/pages/api/hello.ts create mode 100755 examples/with-next-ui/pages/index.tsx create mode 100755 examples/with-next-ui/public/favicon.ico create mode 100755 examples/with-next-ui/public/vercel.svg create mode 100755 examples/with-next-ui/styles/Home.module.css create mode 100755 examples/with-next-ui/styles/globals.css create mode 100755 examples/with-next-ui/tsconfig.json diff --git a/examples/with-next-ui/.gitignore b/examples/with-next-ui/.gitignore new file mode 100755 index 0000000000000..737d87210923e --- /dev/null +++ b/examples/with-next-ui/.gitignore @@ -0,0 +1,35 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# local env files +.env*.local + +# vercel +.vercel + +# typescript +*.tsbuildinfo diff --git a/examples/with-next-ui/README.md b/examples/with-next-ui/README.md new file mode 100755 index 0000000000000..ba02448b96b90 --- /dev/null +++ b/examples/with-next-ui/README.md @@ -0,0 +1,25 @@ +# NextUI Example + +This example shows how to use Next.js along with [NextUI](https://nextui.org/) of React. This is intended to show the integration of this UI toolkit with the Framework. + + + +## Deploy your own + +Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example): + +[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/with-next-ui) + +## How to use + +Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init), [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/), or [pnpm](https://pnpm.io) to bootstrap the example: + +```bash +npx create-next-app --example with-next-ui with-next-ui-app +# or +yarn create next-app --example with-next-ui with-next-ui-app +# or +pnpm create next-app --example with-next-ui with-next-ui-app +``` + +Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)). \ No newline at end of file diff --git a/examples/with-next-ui/common/interface.ts b/examples/with-next-ui/common/interface.ts new file mode 100644 index 0000000000000..23ce84bde3c4d --- /dev/null +++ b/examples/with-next-ui/common/interface.ts @@ -0,0 +1,6 @@ +export interface SvgProp { + fill?: string + size?: number + height?: number + width?: number +} \ No newline at end of file diff --git a/examples/with-next-ui/components/Checkbox.tsx b/examples/with-next-ui/components/Checkbox.tsx new file mode 100644 index 0000000000000..a81e3a8e70c1e --- /dev/null +++ b/examples/with-next-ui/components/Checkbox.tsx @@ -0,0 +1,19 @@ +import { Checkbox } from '@nextui-org/react' + +const CustomCheckbox = () => { + return ( + + Buenos Aires + Sydney + London + Tokyo + + ) +} + +export default CustomCheckbox diff --git a/examples/with-next-ui/components/Collapse.tsx b/examples/with-next-ui/components/Collapse.tsx new file mode 100644 index 0000000000000..925f1bb584492 --- /dev/null +++ b/examples/with-next-ui/components/Collapse.tsx @@ -0,0 +1,35 @@ +import { Collapse, Text } from '@nextui-org/react' + +const CustomCollapse = () => { + return ( + + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do + eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad + minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. + + + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do + eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad + minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. + + + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do + eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad + minim veniam, quis nostrud exercitation ullamco laboris nisi ut + aliquip ex ea commodo consequat. + + + + ) +} + + +export default CustomCollapse \ No newline at end of file diff --git a/examples/with-next-ui/components/Mail.tsx b/examples/with-next-ui/components/Mail.tsx new file mode 100644 index 0000000000000..450e719663a14 --- /dev/null +++ b/examples/with-next-ui/components/Mail.tsx @@ -0,0 +1,24 @@ +import { SvgProp } from "../common/interface" + + +export const Mail = ({ fill, size, height, width, ...props }: SvgProp) => { + return ( + + + + + + + ) +} diff --git a/examples/with-next-ui/components/Model.tsx b/examples/with-next-ui/components/Model.tsx new file mode 100644 index 0000000000000..6b85b0a747ccc --- /dev/null +++ b/examples/with-next-ui/components/Model.tsx @@ -0,0 +1,72 @@ +import { Button, Modal, Text, Input, Row, Checkbox } from '@nextui-org/react' +import { useState } from 'react' +import { Mail } from './Mail' +import { Password } from './Password' + +const CustomModel = () => { + const [visible, setVisible] = useState(false) + const handler = () => setVisible(true) + + const closeHandler = () => { + setVisible(false) + console.log('closed') + } + return ( +
+ + + + + Welcome to + + NextUI + + + + + } + /> + } + /> + + + Remember me + + Forgot password? + + + + + + + +
+ ) +} + +export default CustomModel \ No newline at end of file diff --git a/examples/with-next-ui/components/Password.tsx b/examples/with-next-ui/components/Password.tsx new file mode 100644 index 0000000000000..86650165ed4ad --- /dev/null +++ b/examples/with-next-ui/components/Password.tsx @@ -0,0 +1,17 @@ +import { SvgProp } from "../common/interface" + +export const Password = ({ fill, size, height, width, ...props }:SvgProp) => { + return ( + + + + + + + ) +} diff --git a/examples/with-next-ui/components/Table.tsx b/examples/with-next-ui/components/Table.tsx new file mode 100644 index 0000000000000..59ac89ccfb020 --- /dev/null +++ b/examples/with-next-ui/components/Table.tsx @@ -0,0 +1,44 @@ +import { Table } from "@nextui-org/react" + + +const CustomTable = () => { + return ( + + + NAME + ROLE + STATUS + + + + Tony Reichert + CEO + Active + + + Zoey Lang + Technical Lead + Paused + + + Jane Fisher + Senior Developer + Active + + + William Howard + Community Manager + Vacation + + +
+ ) +} + +export default CustomTable \ No newline at end of file diff --git a/examples/with-next-ui/next-env.d.ts b/examples/with-next-ui/next-env.d.ts new file mode 100755 index 0000000000000..4f11a03dc6cc3 --- /dev/null +++ b/examples/with-next-ui/next-env.d.ts @@ -0,0 +1,5 @@ +/// +/// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/examples/with-next-ui/next.config.js b/examples/with-next-ui/next.config.js new file mode 100755 index 0000000000000..c37315194aba1 --- /dev/null +++ b/examples/with-next-ui/next.config.js @@ -0,0 +1,8 @@ +/** @type {import('next').NextConfig} */ + +const nextConfig = { + reactStrictMode: false, +} + +module.exports = nextConfig + diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json new file mode 100644 index 0000000000000..5efd040236315 --- /dev/null +++ b/examples/with-next-ui/package.json @@ -0,0 +1,29 @@ +{ + "name": "with-next-ui", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint" + }, + "dependencies": { + "@nextui-org/react": "1.0.0-beta.9", + "next": "12.2.0", + "react": "18.2.0", + "react-dom": "18.2.0" + }, + "devDependencies": { + "@next/bundle-analyzer": "^12.2.0", + "@types/node": "18.0.0", + "@types/react": "18.0.14", + "@types/react-dom": "18.0.5", + "add": "^2.0.6", + "eslint": "8.18.0", + "eslint-config-next": "12.2.0", + "install": "^0.13.0", + "next-compose-plugins": "^2.2.1", + "typescript": "4.7.4" + } +} diff --git a/examples/with-next-ui/pages/_app.tsx b/examples/with-next-ui/pages/_app.tsx new file mode 100755 index 0000000000000..f3e1594131a72 --- /dev/null +++ b/examples/with-next-ui/pages/_app.tsx @@ -0,0 +1,14 @@ +import '../styles/globals.css' +import { NextUIProvider } from '@nextui-org/react' + +import type { AppProps } from 'next/app' + +function MyApp({ Component, pageProps }: AppProps) { + return ( + + + + ) +} + +export default MyApp diff --git a/examples/with-next-ui/pages/_document.tsx b/examples/with-next-ui/pages/_document.tsx new file mode 100644 index 0000000000000..32d0928a6bdde --- /dev/null +++ b/examples/with-next-ui/pages/_document.tsx @@ -0,0 +1,39 @@ +import Document, { + Html, + Head, + Main, + NextScript, + DocumentContext, + DocumentInitialProps +} from 'next/document' + +import { CssBaseline } from '@nextui-org/react' + +import { Children } from 'react' + +class MyDocument extends Document { + static async getInitialProps( + ctx: DocumentContext + ): Promise { + const initialProps = await Document.getInitialProps(ctx) + + return { + ...initialProps, + styles: Children.toArray([initialProps.styles]) + } + } + + render() { + return ( + + {CssBaseline.flush()} + +
+ + + + ) + } +} + +export default MyDocument diff --git a/examples/with-next-ui/pages/api/hello.ts b/examples/with-next-ui/pages/api/hello.ts new file mode 100755 index 0000000000000..f8bcc7e5caed1 --- /dev/null +++ b/examples/with-next-ui/pages/api/hello.ts @@ -0,0 +1,13 @@ +// Next.js API route support: https://nextjs.org/docs/api-routes/introduction +import type { NextApiRequest, NextApiResponse } from 'next' + +type Data = { + name: string +} + +export default function handler( + req: NextApiRequest, + res: NextApiResponse +) { + res.status(200).json({ name: 'John Doe' }) +} diff --git a/examples/with-next-ui/pages/index.tsx b/examples/with-next-ui/pages/index.tsx new file mode 100755 index 0000000000000..8e60618808a98 --- /dev/null +++ b/examples/with-next-ui/pages/index.tsx @@ -0,0 +1,62 @@ +import type { NextPage } from 'next' +import Head from 'next/head' +import Image from 'next/image' +import styles from '../styles/Home.module.css' +import dynamic from 'next/dynamic' +import { Avatar, Pagination } from '@nextui-org/react' +import { CSSProperties } from 'react' + +const CustomModel = dynamic(() => import('../components/Model')) +const CustomCheckbox = dynamic(() => import('../components/Checkbox')) +const CustomTable = dynamic(() => import('../components/Table')) +const CustomCollapse = dynamic(() => import('../components/Collapse')) + +const Home: NextPage = () => { + + return ( +
+ + Create Next App + + + +
+

+ +

+

+ Welcome to use NextUI! +

+ {/* model */} +

Modal:

+ + {/* checkout */} +

Checkbox:

+ + {/* table */} +

Table:

+ + {/* pagination */} +

Pagination

+ + {/* collapse */} +

Collapse

+ +
+ +
+ ) +} + +export default Home diff --git a/examples/with-next-ui/public/favicon.ico b/examples/with-next-ui/public/favicon.ico new file mode 100755 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/examples/with-next-ui/public/vercel.svg b/examples/with-next-ui/public/vercel.svg new file mode 100755 index 0000000000000..fbf0e25a651c2 --- /dev/null +++ b/examples/with-next-ui/public/vercel.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/examples/with-next-ui/styles/Home.module.css b/examples/with-next-ui/styles/Home.module.css new file mode 100755 index 0000000000000..9bee497714edf --- /dev/null +++ b/examples/with-next-ui/styles/Home.module.css @@ -0,0 +1,64 @@ +.container { + padding: 0 2rem; + width: 800px; + margin: 0 auto; +} + +.main { + min-height: 100vh; + padding: 4rem 0; + flex: 1; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.main h2 { + width: 100%; + margin-top: 20px; +} + +.footer { + display: flex; + flex: 1; + padding: 2rem 0; + border-top: 1px solid #eaeaea; + justify-content: center; + align-items: center; +} + +.footer a { + display: flex; + justify-content: center; + align-items: center; + flex-grow: 1; +} + +.title a { + color: #0070f3; + text-decoration: none; +} + +.title a:hover, +.title a:focus, +.title a:active { + text-decoration: underline; +} + +.title { + margin: 0; + line-height: 1.15; + font-size: 4rem; +} + +.title, +.description { + text-align: center; +} + +.description { + margin: 4rem 0; + line-height: 1.5; + font-size: 1.5rem; +} diff --git a/examples/with-next-ui/styles/globals.css b/examples/with-next-ui/styles/globals.css new file mode 100755 index 0000000000000..e5e2dcc23baf1 --- /dev/null +++ b/examples/with-next-ui/styles/globals.css @@ -0,0 +1,16 @@ +html, +body { + padding: 0; + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, + Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif; +} + +a { + color: inherit; + text-decoration: none; +} + +* { + box-sizing: border-box; +} diff --git a/examples/with-next-ui/tsconfig.json b/examples/with-next-ui/tsconfig.json new file mode 100755 index 0000000000000..99710e857874f --- /dev/null +++ b/examples/with-next-ui/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compilerOptions": { + "target": "es5", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], + "exclude": ["node_modules"] +} From b011ffcfdd02e120890b6a7bf219b95e764dc6af Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Wed, 6 Jul 2022 07:34:35 +0800 Subject: [PATCH 02/22] Update index.tsx --- examples/with-next-ui/pages/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/with-next-ui/pages/index.tsx b/examples/with-next-ui/pages/index.tsx index 8e60618808a98..af7cbdb1079c4 100755 --- a/examples/with-next-ui/pages/index.tsx +++ b/examples/with-next-ui/pages/index.tsx @@ -4,7 +4,6 @@ import Image from 'next/image' import styles from '../styles/Home.module.css' import dynamic from 'next/dynamic' import { Avatar, Pagination } from '@nextui-org/react' -import { CSSProperties } from 'react' const CustomModel = dynamic(() => import('../components/Model')) const CustomCheckbox = dynamic(() => import('../components/Checkbox')) From ecb19aaa5332989cf9eb21abee38822500a63c29 Mon Sep 17 00:00:00 2001 From: Cupid Valentine Date: Wed, 6 Jul 2022 08:09:38 +0800 Subject: [PATCH 03/22] format code with prettier --- examples/with-next-ui/README.md | 4 +--- examples/with-next-ui/common/interface.ts | 2 +- examples/with-next-ui/components/Collapse.tsx | 3 +-- examples/with-next-ui/components/Mail.tsx | 3 +-- examples/with-next-ui/components/Model.tsx | 2 +- examples/with-next-ui/components/Password.tsx | 4 ++-- examples/with-next-ui/components/Table.tsx | 9 ++++----- examples/with-next-ui/next.config.js | 1 - examples/with-next-ui/pages/_document.tsx | 4 ++-- examples/with-next-ui/pages/index.tsx | 1 - 10 files changed, 13 insertions(+), 20 deletions(-) diff --git a/examples/with-next-ui/README.md b/examples/with-next-ui/README.md index ba02448b96b90..3dced2b06936e 100755 --- a/examples/with-next-ui/README.md +++ b/examples/with-next-ui/README.md @@ -2,8 +2,6 @@ This example shows how to use Next.js along with [NextUI](https://nextui.org/) of React. This is intended to show the integration of this UI toolkit with the Framework. - - ## Deploy your own Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example): @@ -22,4 +20,4 @@ yarn create next-app --example with-next-ui with-next-ui-app pnpm create next-app --example with-next-ui with-next-ui-app ``` -Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)). \ No newline at end of file +Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)). diff --git a/examples/with-next-ui/common/interface.ts b/examples/with-next-ui/common/interface.ts index 23ce84bde3c4d..586bc4976b718 100644 --- a/examples/with-next-ui/common/interface.ts +++ b/examples/with-next-ui/common/interface.ts @@ -3,4 +3,4 @@ export interface SvgProp { size?: number height?: number width?: number -} \ No newline at end of file +} diff --git a/examples/with-next-ui/components/Collapse.tsx b/examples/with-next-ui/components/Collapse.tsx index 925f1bb584492..b08a6c968a6a8 100644 --- a/examples/with-next-ui/components/Collapse.tsx +++ b/examples/with-next-ui/components/Collapse.tsx @@ -31,5 +31,4 @@ const CustomCollapse = () => { ) } - -export default CustomCollapse \ No newline at end of file +export default CustomCollapse diff --git a/examples/with-next-ui/components/Mail.tsx b/examples/with-next-ui/components/Mail.tsx index 450e719663a14..2bdb10c9ad10d 100644 --- a/examples/with-next-ui/components/Mail.tsx +++ b/examples/with-next-ui/components/Mail.tsx @@ -1,5 +1,4 @@ -import { SvgProp } from "../common/interface" - +import { SvgProp } from '../common/interface' export const Mail = ({ fill, size, height, width, ...props }: SvgProp) => { return ( diff --git a/examples/with-next-ui/components/Model.tsx b/examples/with-next-ui/components/Model.tsx index 6b85b0a747ccc..b84ec7e306741 100644 --- a/examples/with-next-ui/components/Model.tsx +++ b/examples/with-next-ui/components/Model.tsx @@ -69,4 +69,4 @@ const CustomModel = () => { ) } -export default CustomModel \ No newline at end of file +export default CustomModel diff --git a/examples/with-next-ui/components/Password.tsx b/examples/with-next-ui/components/Password.tsx index 86650165ed4ad..d0f79199c69fc 100644 --- a/examples/with-next-ui/components/Password.tsx +++ b/examples/with-next-ui/components/Password.tsx @@ -1,6 +1,6 @@ -import { SvgProp } from "../common/interface" +import { SvgProp } from '../common/interface' -export const Password = ({ fill, size, height, width, ...props }:SvgProp) => { +export const Password = ({ fill, size, height, width, ...props }: SvgProp) => { return ( { +const CustomTable = () => { return ( @@ -41,4 +40,4 @@ const CustomTable = () => { ) } -export default CustomTable \ No newline at end of file +export default CustomTable diff --git a/examples/with-next-ui/next.config.js b/examples/with-next-ui/next.config.js index c37315194aba1..3686d38b989aa 100755 --- a/examples/with-next-ui/next.config.js +++ b/examples/with-next-ui/next.config.js @@ -5,4 +5,3 @@ const nextConfig = { } module.exports = nextConfig - diff --git a/examples/with-next-ui/pages/_document.tsx b/examples/with-next-ui/pages/_document.tsx index 32d0928a6bdde..fef09f6285a31 100644 --- a/examples/with-next-ui/pages/_document.tsx +++ b/examples/with-next-ui/pages/_document.tsx @@ -4,7 +4,7 @@ import Document, { Main, NextScript, DocumentContext, - DocumentInitialProps + DocumentInitialProps, } from 'next/document' import { CssBaseline } from '@nextui-org/react' @@ -19,7 +19,7 @@ class MyDocument extends Document { return { ...initialProps, - styles: Children.toArray([initialProps.styles]) + styles: Children.toArray([initialProps.styles]), } } diff --git a/examples/with-next-ui/pages/index.tsx b/examples/with-next-ui/pages/index.tsx index af7cbdb1079c4..81232f21f22cb 100755 --- a/examples/with-next-ui/pages/index.tsx +++ b/examples/with-next-ui/pages/index.tsx @@ -11,7 +11,6 @@ const CustomTable = dynamic(() => import('../components/Table')) const CustomCollapse = dynamic(() => import('../components/Collapse')) const Home: NextPage = () => { - return (
From e55e04beba2d2fb01367d42ab415449046c0808e Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Wed, 6 Jul 2022 21:53:48 +0800 Subject: [PATCH 04/22] Update examples/with-next-ui/package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Balázs Orbán --- examples/with-next-ui/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index 5efd040236315..5312a1deb91e0 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -1,6 +1,4 @@ { - "name": "with-next-ui", - "version": "0.1.0", "private": true, "scripts": { "dev": "next dev", From 33bc17419cf86a1eaaffb6a33f9bbb2a89c1229d Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Wed, 6 Jul 2022 21:53:58 +0800 Subject: [PATCH 05/22] Update examples/with-next-ui/package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Balázs Orbán --- examples/with-next-ui/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index 5312a1deb91e0..91a16f3e12f31 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -3,8 +3,7 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start", - "lint": "next lint" + "start": "next start" }, "dependencies": { "@nextui-org/react": "1.0.0-beta.9", From bea4d042f0df0f380a80e7d8a67e566ee77f79da Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Wed, 6 Jul 2022 21:54:08 +0800 Subject: [PATCH 06/22] Update examples/with-next-ui/package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Balázs Orbán --- examples/with-next-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index 91a16f3e12f31..8a7f033e8b3bc 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "@nextui-org/react": "1.0.0-beta.9", - "next": "12.2.0", + "next": "latest", "react": "18.2.0", "react-dom": "18.2.0" }, From c846e6660852df6bbbcc485be7f0ee5e29f5a3d4 Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Wed, 6 Jul 2022 21:54:19 +0800 Subject: [PATCH 07/22] Update examples/with-next-ui/package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Balázs Orbán --- examples/with-next-ui/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index 8a7f033e8b3bc..ea721f99e08b0 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -17,8 +17,6 @@ "@types/react": "18.0.14", "@types/react-dom": "18.0.5", "add": "^2.0.6", - "eslint": "8.18.0", - "eslint-config-next": "12.2.0", "install": "^0.13.0", "next-compose-plugins": "^2.2.1", "typescript": "4.7.4" From 210e9e293d890e96c09b1308c26ef954d5ec5a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Wed, 6 Jul 2022 16:20:18 +0200 Subject: [PATCH 08/22] Apply suggestions from code review --- examples/with-next-ui/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index ea721f99e08b0..b9c64ecb578c1 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -12,13 +12,9 @@ "react-dom": "18.2.0" }, "devDependencies": { - "@next/bundle-analyzer": "^12.2.0", "@types/node": "18.0.0", "@types/react": "18.0.14", "@types/react-dom": "18.0.5", - "add": "^2.0.6", - "install": "^0.13.0", - "next-compose-plugins": "^2.2.1", "typescript": "4.7.4" } } From 4c8560f70e977d0d0e816b77a5114562b94c19bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Wed, 6 Jul 2022 16:21:15 +0200 Subject: [PATCH 09/22] Delete hello.ts --- examples/with-next-ui/pages/api/hello.ts | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100755 examples/with-next-ui/pages/api/hello.ts diff --git a/examples/with-next-ui/pages/api/hello.ts b/examples/with-next-ui/pages/api/hello.ts deleted file mode 100755 index f8bcc7e5caed1..0000000000000 --- a/examples/with-next-ui/pages/api/hello.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Next.js API route support: https://nextjs.org/docs/api-routes/introduction -import type { NextApiRequest, NextApiResponse } from 'next' - -type Data = { - name: string -} - -export default function handler( - req: NextApiRequest, - res: NextApiResponse -) { - res.status(200).json({ name: 'John Doe' }) -} From b6c3915c8fb20a273f02d7c3a3570ef6d8136df0 Mon Sep 17 00:00:00 2001 From: Cupid Valentine Date: Wed, 6 Jul 2022 22:23:14 +0800 Subject: [PATCH 10/22] remove some unrelated file and code --- examples/with-next-ui/components/Collapse.tsx | 19 +++++++------------ examples/with-next-ui/next.config.js | 10 +++++++++- examples/with-next-ui/package.json | 10 ++++++---- examples/with-next-ui/pages/api/hello.ts | 13 ------------- 4 files changed, 22 insertions(+), 30 deletions(-) delete mode 100755 examples/with-next-ui/pages/api/hello.ts diff --git a/examples/with-next-ui/components/Collapse.tsx b/examples/with-next-ui/components/Collapse.tsx index b08a6c968a6a8..6f420347bd840 100644 --- a/examples/with-next-ui/components/Collapse.tsx +++ b/examples/with-next-ui/components/Collapse.tsx @@ -5,26 +5,21 @@ const CustomCollapse = () => { - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad - minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. + I have had my invitation to this world's festival, and thus my life + has been blessed. - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad - minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. + In the meanwhile I smile and I sing all alone. In the meanwhile the + air is filling with the perfume of promise. - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do - eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad - minim veniam, quis nostrud exercitation ullamco laboris nisi ut - aliquip ex ea commodo consequat. + I came out on the chariot of the first gleam of light, and pursued my + voyage through the wildernesses of worlds leaving my track on many a + star and planet. diff --git a/examples/with-next-ui/next.config.js b/examples/with-next-ui/next.config.js index 3686d38b989aa..6705d13181d9c 100755 --- a/examples/with-next-ui/next.config.js +++ b/examples/with-next-ui/next.config.js @@ -1,7 +1,15 @@ +const withPlugins = require('next-compose-plugins') + +const withBundleAnalyzer = require('@next/bundle-analyzer')({ + enabled: process.env.ANALYZE === 'true', +}) + /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: false, } -module.exports = nextConfig +const plugins = [[withBundleAnalyzer]] + +module.exports = withPlugins(plugins, nextConfig) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index ea721f99e08b0..cb93683a12bf1 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -3,7 +3,8 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start" + "start": "next start", + "analyze": "cross-env ANALYZE=true next build" }, "dependencies": { "@nextui-org/react": "1.0.0-beta.9", @@ -13,10 +14,11 @@ }, "devDependencies": { "@next/bundle-analyzer": "^12.2.0", - "@types/node": "18.0.0", - "@types/react": "18.0.14", - "@types/react-dom": "18.0.5", + "@types/node": "18.0.3", + "@types/react": "18.0.15", + "@types/react-dom": "18.0.6", "add": "^2.0.6", + "cross-env": "^7.0.3", "install": "^0.13.0", "next-compose-plugins": "^2.2.1", "typescript": "4.7.4" diff --git a/examples/with-next-ui/pages/api/hello.ts b/examples/with-next-ui/pages/api/hello.ts deleted file mode 100755 index f8bcc7e5caed1..0000000000000 --- a/examples/with-next-ui/pages/api/hello.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Next.js API route support: https://nextjs.org/docs/api-routes/introduction -import type { NextApiRequest, NextApiResponse } from 'next' - -type Data = { - name: string -} - -export default function handler( - req: NextApiRequest, - res: NextApiResponse -) { - res.status(200).json({ name: 'John Doe' }) -} From 6620d30efd26b1051965c98f3814cc9ebf930759 Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Thu, 7 Jul 2022 00:16:08 +0800 Subject: [PATCH 11/22] remove some unrelated code --- examples/with-next-ui/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index cb93683a12bf1..33f7bf485dfb1 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -17,9 +17,7 @@ "@types/node": "18.0.3", "@types/react": "18.0.15", "@types/react-dom": "18.0.6", - "add": "^2.0.6", "cross-env": "^7.0.3", - "install": "^0.13.0", "next-compose-plugins": "^2.2.1", "typescript": "4.7.4" } From 7aa5e548f37904725fb8f62e9828de0ace4ba295 Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Fri, 8 Jul 2022 21:05:22 +0800 Subject: [PATCH 12/22] Update examples/with-next-ui/package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Balázs Orbán --- examples/with-next-ui/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index 33f7bf485dfb1..fade2c3682a6c 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -3,8 +3,7 @@ "scripts": { "dev": "next dev", "build": "next build", - "start": "next start", - "analyze": "cross-env ANALYZE=true next build" + "start": "next start" }, "dependencies": { "@nextui-org/react": "1.0.0-beta.9", From d8174b987d21dad88a73419d33186e75be72c6df Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Fri, 8 Jul 2022 21:05:35 +0800 Subject: [PATCH 13/22] Update examples/with-next-ui/package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Balázs Orbán --- examples/with-next-ui/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index fade2c3682a6c..486da8c85168b 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -16,7 +16,6 @@ "@types/node": "18.0.3", "@types/react": "18.0.15", "@types/react-dom": "18.0.6", - "cross-env": "^7.0.3", "next-compose-plugins": "^2.2.1", "typescript": "4.7.4" } From 18cfc088096aff1b2680dc6f0bdbab5fc72c3b98 Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Fri, 8 Jul 2022 21:05:47 +0800 Subject: [PATCH 14/22] Update examples/with-next-ui/package.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Balázs Orbán --- examples/with-next-ui/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index 486da8c85168b..4c9d95e2e66e0 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -16,7 +16,6 @@ "@types/node": "18.0.3", "@types/react": "18.0.15", "@types/react-dom": "18.0.6", - "next-compose-plugins": "^2.2.1", "typescript": "4.7.4" } } From f490b5d3d2c25262da9fed2d759f9a2a669882fd Mon Sep 17 00:00:00 2001 From: Cupid Valentine <53572196+valcosmos@users.noreply.github.com> Date: Fri, 8 Jul 2022 21:06:30 +0800 Subject: [PATCH 15/22] Update next.config.js --- examples/with-next-ui/next.config.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/examples/with-next-ui/next.config.js b/examples/with-next-ui/next.config.js index 6705d13181d9c..3686d38b989aa 100755 --- a/examples/with-next-ui/next.config.js +++ b/examples/with-next-ui/next.config.js @@ -1,15 +1,7 @@ -const withPlugins = require('next-compose-plugins') - -const withBundleAnalyzer = require('@next/bundle-analyzer')({ - enabled: process.env.ANALYZE === 'true', -}) - /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: false, } -const plugins = [[withBundleAnalyzer]] - -module.exports = withPlugins(plugins, nextConfig) +module.exports = nextConfig From 898fca3d4d11048100a60c7c3aaa4f6ce0e826d0 Mon Sep 17 00:00:00 2001 From: Cupid Valentine Date: Sat, 9 Jul 2022 12:20:15 +0800 Subject: [PATCH 16/22] Add TypeScript to the ant-design example --- .../with-ant-design/components/DatePicker.js | 14 --- examples/with-ant-design/next-env.d.ts | 5 + examples/with-ant-design/next.config.js | 10 +- examples/with-ant-design/package.json | 23 ++-- .../pages/{_app.js => _app.tsx} | 5 +- examples/with-ant-design/pages/index.js | 104 ------------------ examples/with-ant-design/pages/index.tsx | 92 ++++++++++++++++ examples/with-ant-design/tsconfig.json | 20 ++++ 8 files changed, 137 insertions(+), 136 deletions(-) delete mode 100644 examples/with-ant-design/components/DatePicker.js create mode 100644 examples/with-ant-design/next-env.d.ts rename examples/with-ant-design/pages/{_app.js => _app.tsx} (52%) delete mode 100644 examples/with-ant-design/pages/index.js create mode 100644 examples/with-ant-design/pages/index.tsx create mode 100644 examples/with-ant-design/tsconfig.json diff --git a/examples/with-ant-design/components/DatePicker.js b/examples/with-ant-design/components/DatePicker.js deleted file mode 100644 index 40353328c64ae..0000000000000 --- a/examples/with-ant-design/components/DatePicker.js +++ /dev/null @@ -1,14 +0,0 @@ -/** - * This example previously used antd-dayjs-webpack-plugin - * (https://github.com/ant-design/antd-dayjs-webpack-plugin) to attempt to - * replace Moment.js with Day.js, but it would crash the page when the user - * clicked on the DatePicker. Using this custom component (following Ant Design - * guidelines at https://ant.design/docs/react/replace-moment) instead of the - * webpack plugin fixes that bug. - */ -import dayjsGenerateConfig from 'rc-picker/lib/generate/dayjs' -import generatePicker from 'antd/lib/date-picker/generatePicker' - -const DatePicker = generatePicker(dayjsGenerateConfig) - -export default DatePicker diff --git a/examples/with-ant-design/next-env.d.ts b/examples/with-ant-design/next-env.d.ts new file mode 100644 index 0000000000000..4f11a03dc6cc3 --- /dev/null +++ b/examples/with-ant-design/next-env.d.ts @@ -0,0 +1,5 @@ +/// +/// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/examples/with-ant-design/next.config.js b/examples/with-ant-design/next.config.js index 5e149d4f542d9..ae887958d3c9c 100644 --- a/examples/with-ant-design/next.config.js +++ b/examples/with-ant-design/next.config.js @@ -1,5 +1,7 @@ -const withBundleAnalyzer = require('@next/bundle-analyzer')({ - enabled: process.env.ANALYZE === 'true', -}) +/** @type {import('next').NextConfig} */ +const nextConfig = { + reactStrictMode: true, + swcMinify: true, +} -module.exports = withBundleAnalyzer() +module.exports = nextConfig diff --git a/examples/with-ant-design/package.json b/examples/with-ant-design/package.json index 1bd3283d88d89..93526a23095f9 100644 --- a/examples/with-ant-design/package.json +++ b/examples/with-ant-design/package.json @@ -3,26 +3,23 @@ "scripts": { "dev": "next", "build": "next build", - "start": "next start", - "analyze": "cross-env ANALYZE=true next build" + "start": "next start" }, "dependencies": { - "@ant-design/icons": "4.2.1", - "@next/bundle-analyzer": "^9.1.4", - "antd": "4.3.0", - "cross-env": "^7.0.2", - "dayjs": "1.8.28", - "esm": "^3.2.25", - "next": "latest", - "postcss-preset-env": "^6.7.0", - "react": "^17.0.2", - "react-dom": "^17.0.2" + "@ant-design/icons": "^4.7.0", + "antd": "^4.21.5", + "next": "12.2.1", + "react": "18.2.0", + "react-dom": "18.2.0" }, "browser": { "fs": false, "path": false }, "devDependencies": { - "cross-env": "^7.0.3" + "@types/node": "18.0.3", + "@types/react": "18.0.15", + "@types/react-dom": "18.0.6", + "typescript": "4.7.4" } } diff --git a/examples/with-ant-design/pages/_app.js b/examples/with-ant-design/pages/_app.tsx similarity index 52% rename from examples/with-ant-design/pages/_app.js rename to examples/with-ant-design/pages/_app.tsx index 5dc47adb7e922..32a1999c35191 100644 --- a/examples/with-ant-design/pages/_app.js +++ b/examples/with-ant-design/pages/_app.tsx @@ -1,7 +1,10 @@ +import type { AppProps } from 'next/app' import 'antd/dist/antd.css' import '../styles/vars.css' import '../styles/global.css' -export default function MyApp({ Component, pageProps }) { +function MyApp({ Component, pageProps }: AppProps) { return } + +export default MyApp diff --git a/examples/with-ant-design/pages/index.js b/examples/with-ant-design/pages/index.js deleted file mode 100644 index 215b3674e3f21..0000000000000 --- a/examples/with-ant-design/pages/index.js +++ /dev/null @@ -1,104 +0,0 @@ -import { Form, Select, InputNumber, Switch, Slider, Button } from 'antd' - -// Custom DatePicker that uses Day.js instead of Moment.js -import DatePicker from '../components/DatePicker' - -import { SmileFilled } from '@ant-design/icons' - -import Link from 'next/link' - -const FormItem = Form.Item -const Option = Select.Option - -const content = { - marginTop: '100px', -} - -export default function Home() { - return ( -
-
- - - - - - -

Welcome to the world !

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- ) -} diff --git a/examples/with-ant-design/pages/index.tsx b/examples/with-ant-design/pages/index.tsx new file mode 100644 index 0000000000000..5da617a405a5e --- /dev/null +++ b/examples/with-ant-design/pages/index.tsx @@ -0,0 +1,92 @@ +import { + Button, + DatePicker, + Form, + InputNumber, + Select, + Slider, + Switch, +} from 'antd' +import type { DatePickerProps } from 'antd' +import { SmileFilled } from '@ant-design/icons' +import type { NextPage } from 'next' +import Link from 'next/link' + +const FormItem = Form.Item +const Option = Select.Option + +const content = { + marginTop: '100px', +} + +const Home: NextPage = () => { + const onDatePickerChange: DatePickerProps['onChange'] = ( + date, + dateString + ) => { + console.log(date, dateString) + } + + return ( +
+
+ + + + + + +

Welcome to the world !

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ ) +} + +export default Home diff --git a/examples/with-ant-design/tsconfig.json b/examples/with-ant-design/tsconfig.json new file mode 100644 index 0000000000000..99710e857874f --- /dev/null +++ b/examples/with-ant-design/tsconfig.json @@ -0,0 +1,20 @@ +{ + "compilerOptions": { + "target": "es5", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], + "exclude": ["node_modules"] +} From cfdbcf1148695027cc16e49db9278611d503aac3 Mon Sep 17 00:00:00 2001 From: Cupid Valentine Date: Sat, 9 Jul 2022 12:30:10 +0800 Subject: [PATCH 17/22] Revert "Add TypeScript to the ant-design example" This reverts commit 898fca3d4d11048100a60c7c3aaa4f6ce0e826d0. --- .../with-ant-design/components/DatePicker.js | 14 +++ examples/with-ant-design/next-env.d.ts | 5 - examples/with-ant-design/next.config.js | 10 +- examples/with-ant-design/package.json | 23 ++-- .../pages/{_app.tsx => _app.js} | 5 +- examples/with-ant-design/pages/index.js | 104 ++++++++++++++++++ examples/with-ant-design/pages/index.tsx | 92 ---------------- examples/with-ant-design/tsconfig.json | 20 ---- 8 files changed, 136 insertions(+), 137 deletions(-) create mode 100644 examples/with-ant-design/components/DatePicker.js delete mode 100644 examples/with-ant-design/next-env.d.ts rename examples/with-ant-design/pages/{_app.tsx => _app.js} (52%) create mode 100644 examples/with-ant-design/pages/index.js delete mode 100644 examples/with-ant-design/pages/index.tsx delete mode 100644 examples/with-ant-design/tsconfig.json diff --git a/examples/with-ant-design/components/DatePicker.js b/examples/with-ant-design/components/DatePicker.js new file mode 100644 index 0000000000000..40353328c64ae --- /dev/null +++ b/examples/with-ant-design/components/DatePicker.js @@ -0,0 +1,14 @@ +/** + * This example previously used antd-dayjs-webpack-plugin + * (https://github.com/ant-design/antd-dayjs-webpack-plugin) to attempt to + * replace Moment.js with Day.js, but it would crash the page when the user + * clicked on the DatePicker. Using this custom component (following Ant Design + * guidelines at https://ant.design/docs/react/replace-moment) instead of the + * webpack plugin fixes that bug. + */ +import dayjsGenerateConfig from 'rc-picker/lib/generate/dayjs' +import generatePicker from 'antd/lib/date-picker/generatePicker' + +const DatePicker = generatePicker(dayjsGenerateConfig) + +export default DatePicker diff --git a/examples/with-ant-design/next-env.d.ts b/examples/with-ant-design/next-env.d.ts deleted file mode 100644 index 4f11a03dc6cc3..0000000000000 --- a/examples/with-ant-design/next-env.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -/// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/examples/with-ant-design/next.config.js b/examples/with-ant-design/next.config.js index ae887958d3c9c..5e149d4f542d9 100644 --- a/examples/with-ant-design/next.config.js +++ b/examples/with-ant-design/next.config.js @@ -1,7 +1,5 @@ -/** @type {import('next').NextConfig} */ -const nextConfig = { - reactStrictMode: true, - swcMinify: true, -} +const withBundleAnalyzer = require('@next/bundle-analyzer')({ + enabled: process.env.ANALYZE === 'true', +}) -module.exports = nextConfig +module.exports = withBundleAnalyzer() diff --git a/examples/with-ant-design/package.json b/examples/with-ant-design/package.json index 93526a23095f9..1bd3283d88d89 100644 --- a/examples/with-ant-design/package.json +++ b/examples/with-ant-design/package.json @@ -3,23 +3,26 @@ "scripts": { "dev": "next", "build": "next build", - "start": "next start" + "start": "next start", + "analyze": "cross-env ANALYZE=true next build" }, "dependencies": { - "@ant-design/icons": "^4.7.0", - "antd": "^4.21.5", - "next": "12.2.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "@ant-design/icons": "4.2.1", + "@next/bundle-analyzer": "^9.1.4", + "antd": "4.3.0", + "cross-env": "^7.0.2", + "dayjs": "1.8.28", + "esm": "^3.2.25", + "next": "latest", + "postcss-preset-env": "^6.7.0", + "react": "^17.0.2", + "react-dom": "^17.0.2" }, "browser": { "fs": false, "path": false }, "devDependencies": { - "@types/node": "18.0.3", - "@types/react": "18.0.15", - "@types/react-dom": "18.0.6", - "typescript": "4.7.4" + "cross-env": "^7.0.3" } } diff --git a/examples/with-ant-design/pages/_app.tsx b/examples/with-ant-design/pages/_app.js similarity index 52% rename from examples/with-ant-design/pages/_app.tsx rename to examples/with-ant-design/pages/_app.js index 32a1999c35191..5dc47adb7e922 100644 --- a/examples/with-ant-design/pages/_app.tsx +++ b/examples/with-ant-design/pages/_app.js @@ -1,10 +1,7 @@ -import type { AppProps } from 'next/app' import 'antd/dist/antd.css' import '../styles/vars.css' import '../styles/global.css' -function MyApp({ Component, pageProps }: AppProps) { +export default function MyApp({ Component, pageProps }) { return } - -export default MyApp diff --git a/examples/with-ant-design/pages/index.js b/examples/with-ant-design/pages/index.js new file mode 100644 index 0000000000000..215b3674e3f21 --- /dev/null +++ b/examples/with-ant-design/pages/index.js @@ -0,0 +1,104 @@ +import { Form, Select, InputNumber, Switch, Slider, Button } from 'antd' + +// Custom DatePicker that uses Day.js instead of Moment.js +import DatePicker from '../components/DatePicker' + +import { SmileFilled } from '@ant-design/icons' + +import Link from 'next/link' + +const FormItem = Form.Item +const Option = Select.Option + +const content = { + marginTop: '100px', +} + +export default function Home() { + return ( +
+
+ + + + + + +

Welcome to the world !

+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ ) +} diff --git a/examples/with-ant-design/pages/index.tsx b/examples/with-ant-design/pages/index.tsx deleted file mode 100644 index 5da617a405a5e..0000000000000 --- a/examples/with-ant-design/pages/index.tsx +++ /dev/null @@ -1,92 +0,0 @@ -import { - Button, - DatePicker, - Form, - InputNumber, - Select, - Slider, - Switch, -} from 'antd' -import type { DatePickerProps } from 'antd' -import { SmileFilled } from '@ant-design/icons' -import type { NextPage } from 'next' -import Link from 'next/link' - -const FormItem = Form.Item -const Option = Select.Option - -const content = { - marginTop: '100px', -} - -const Home: NextPage = () => { - const onDatePickerChange: DatePickerProps['onChange'] = ( - date, - dateString - ) => { - console.log(date, dateString) - } - - return ( -
-
- - - - - - -

Welcome to the world !

-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- ) -} - -export default Home diff --git a/examples/with-ant-design/tsconfig.json b/examples/with-ant-design/tsconfig.json deleted file mode 100644 index 99710e857874f..0000000000000 --- a/examples/with-ant-design/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": true, - "skipLibCheck": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "noEmit": true, - "esModuleInterop": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "jsx": "preserve", - "incremental": true - }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"], - "exclude": ["node_modules"] -} From dda03e9ce19569b4bc66101bc95005aad49592ee Mon Sep 17 00:00:00 2001 From: Cupid Valentine Date: Sat, 9 Jul 2022 14:57:45 +0800 Subject: [PATCH 18/22] add swcMinify to nextui example --- examples/with-next-ui/next.config.js | 1 + examples/with-next-ui/pages/index.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/with-next-ui/next.config.js b/examples/with-next-ui/next.config.js index 3686d38b989aa..b74ef0c30ce88 100755 --- a/examples/with-next-ui/next.config.js +++ b/examples/with-next-ui/next.config.js @@ -2,6 +2,7 @@ const nextConfig = { reactStrictMode: false, + swcMinify: true, } module.exports = nextConfig diff --git a/examples/with-next-ui/pages/index.tsx b/examples/with-next-ui/pages/index.tsx index 81232f21f22cb..446873b9248d5 100755 --- a/examples/with-next-ui/pages/index.tsx +++ b/examples/with-next-ui/pages/index.tsx @@ -14,7 +14,7 @@ const Home: NextPage = () => { return (
- Create Next App + NextUI Example From 80aa62f01d65e32b1e8798888fcc12cb27a5403c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Mon, 11 Jul 2022 14:15:03 +0200 Subject: [PATCH 19/22] Update examples/with-next-ui/package.json --- examples/with-next-ui/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/with-next-ui/package.json b/examples/with-next-ui/package.json index 4c9d95e2e66e0..06b7c1224ad3b 100644 --- a/examples/with-next-ui/package.json +++ b/examples/with-next-ui/package.json @@ -12,7 +12,6 @@ "react-dom": "18.2.0" }, "devDependencies": { - "@next/bundle-analyzer": "^12.2.0", "@types/node": "18.0.3", "@types/react": "18.0.15", "@types/react-dom": "18.0.6", From e7517def3ca8e7ca67583a193275c299b13a0909 Mon Sep 17 00:00:00 2001 From: Cupid Valentine Date: Mon, 11 Jul 2022 20:55:35 +0800 Subject: [PATCH 20/22] remove some warnings in next-ui example --- examples/with-next-ui/components/Model.tsx | 72 ---------------------- examples/with-next-ui/pages/_app.tsx | 4 +- examples/with-next-ui/pages/_document.tsx | 4 +- examples/with-next-ui/pages/index.tsx | 9 +-- 4 files changed, 3 insertions(+), 86 deletions(-) delete mode 100644 examples/with-next-ui/components/Model.tsx diff --git a/examples/with-next-ui/components/Model.tsx b/examples/with-next-ui/components/Model.tsx deleted file mode 100644 index b84ec7e306741..0000000000000 --- a/examples/with-next-ui/components/Model.tsx +++ /dev/null @@ -1,72 +0,0 @@ -import { Button, Modal, Text, Input, Row, Checkbox } from '@nextui-org/react' -import { useState } from 'react' -import { Mail } from './Mail' -import { Password } from './Password' - -const CustomModel = () => { - const [visible, setVisible] = useState(false) - const handler = () => setVisible(true) - - const closeHandler = () => { - setVisible(false) - console.log('closed') - } - return ( -
- - - - - Welcome to - - NextUI - - - - - } - /> - } - /> - - - Remember me - - Forgot password? - - - - - - - -
- ) -} - -export default CustomModel diff --git a/examples/with-next-ui/pages/_app.tsx b/examples/with-next-ui/pages/_app.tsx index f3e1594131a72..4f774da1d7270 100755 --- a/examples/with-next-ui/pages/_app.tsx +++ b/examples/with-next-ui/pages/_app.tsx @@ -3,12 +3,10 @@ import { NextUIProvider } from '@nextui-org/react' import type { AppProps } from 'next/app' -function MyApp({ Component, pageProps }: AppProps) { +export default function MyApp({ Component, pageProps }: AppProps) { return ( ) } - -export default MyApp diff --git a/examples/with-next-ui/pages/_document.tsx b/examples/with-next-ui/pages/_document.tsx index fef09f6285a31..c7d9c43257f66 100644 --- a/examples/with-next-ui/pages/_document.tsx +++ b/examples/with-next-ui/pages/_document.tsx @@ -11,7 +11,7 @@ import { CssBaseline } from '@nextui-org/react' import { Children } from 'react' -class MyDocument extends Document { +export default class MyDocument extends Document { static async getInitialProps( ctx: DocumentContext ): Promise { @@ -35,5 +35,3 @@ class MyDocument extends Document { ) } } - -export default MyDocument diff --git a/examples/with-next-ui/pages/index.tsx b/examples/with-next-ui/pages/index.tsx index 446873b9248d5..8482e382373d4 100755 --- a/examples/with-next-ui/pages/index.tsx +++ b/examples/with-next-ui/pages/index.tsx @@ -1,16 +1,14 @@ -import type { NextPage } from 'next' import Head from 'next/head' import Image from 'next/image' import styles from '../styles/Home.module.css' import dynamic from 'next/dynamic' import { Avatar, Pagination } from '@nextui-org/react' -const CustomModel = dynamic(() => import('../components/Model')) const CustomCheckbox = dynamic(() => import('../components/Checkbox')) const CustomTable = dynamic(() => import('../components/Table')) const CustomCollapse = dynamic(() => import('../components/Collapse')) -const Home: NextPage = () => { +export default function Home() { return (
@@ -25,9 +23,6 @@ const Home: NextPage = () => {

Welcome to use NextUI!

- {/* model */} -

Modal:

- {/* checkout */}

Checkbox:

@@ -56,5 +51,3 @@ const Home: NextPage = () => {
) } - -export default Home From 32c107bc55d389020ac427d89586a4c591d4331d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Fri, 30 Sep 2022 00:50:29 +0200 Subject: [PATCH 21/22] Delete next-env.d.ts --- examples/with-next-ui/next-env.d.ts | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 examples/with-next-ui/next-env.d.ts diff --git a/examples/with-next-ui/next-env.d.ts b/examples/with-next-ui/next-env.d.ts deleted file mode 100755 index 4f11a03dc6cc3..0000000000000 --- a/examples/with-next-ui/next-env.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -/// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. From 8345c5a8cc663cbc4a7077cc0fdc51e85e7c0227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= Date: Fri, 30 Sep 2022 00:56:20 +0200 Subject: [PATCH 22/22] Update examples/with-next-ui/.gitignore --- examples/with-next-ui/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/with-next-ui/.gitignore b/examples/with-next-ui/.gitignore index 737d87210923e..c87c9b392c020 100755 --- a/examples/with-next-ui/.gitignore +++ b/examples/with-next-ui/.gitignore @@ -33,3 +33,4 @@ yarn-error.log* # typescript *.tsbuildinfo +next-env.d.ts