diff --git a/.prettierignore b/.prettierignore index bdff93d7..1ed0a8d3 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,9 +3,6 @@ packages/**/dist packages/**/lib packages/playground-temp -packages/react-pages/src/client/jotai/index.js -packages/react-pages/src/client/jotai/utils.js - doc-site/dist doc-site/node_modules diff --git a/.vscode/launch.json b/.vscode/launch.json index b944a8a6..adde1926 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,14 +4,21 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ + { + "name": "Launch via NPM", + "request": "launch", + "runtimeArgs": ["run-script", "dev"], + "runtimeExecutable": "npm", + "skipFiles": ["/**"], + "type": "node", + "cwd": "${fileDirname}" + }, { "type": "node", "request": "attach", "name": "Attach", "port": 9229, - "skipFiles": [ - "/**" - ] + "skipFiles": ["/**"] } ] -} \ No newline at end of file +} diff --git a/TODO.md b/TODO.md index 4f2fcda3..bb5a6a3e 100644 --- a/TODO.md +++ b/TODO.md @@ -29,7 +29,4 @@ DATA node, graph, lazy/eager node - file 2.3 - file 2.4 (lazy) -- [upgrade to mdx v2](https://github.com/brillout/vite-plugin-mdx#vite-plugin-mdx) -- upgrade to React 18 and react-router-dom 6.x - bug: routePath don't change when route from a 404 page to another 404 page diff --git a/doc-site/declare.d.ts b/doc-site/declare.d.ts deleted file mode 100644 index 6c344ed3..00000000 --- a/doc-site/declare.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module '*.module.css' diff --git a/doc-site/package.json b/doc-site/package.json index 26dcdb7c..6fb8cf13 100644 --- a/doc-site/package.json +++ b/doc-site/package.json @@ -3,6 +3,7 @@ "private": true, "version": "1.0.0", "description": "", + "type": "module", "scripts": { "dev": "vite serve", "debug": "node --inspect ./node_modules/vite/bin/vite serve", @@ -15,20 +16,18 @@ "author": "", "license": "ISC", "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", "gh-pages": "^4.0.0", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", + "serve": "^14.1.2", + "vite": "^4.0.1", "vite-pages-theme-doc": "workspace:*", - "vite-plugin-mdx": "^3.5.11", "vite-plugin-react-pages": "workspace:*" } } diff --git a/doc-site/pages/404.tsx b/doc-site/pages/404.tsx index 46c6620f..84152b8f 100644 --- a/doc-site/pages/404.tsx +++ b/doc-site/pages/404.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Redirect } from 'react-router-dom' +import { Navigate } from 'react-router-dom' const Component404 = () => { - return + return } export default Component404 diff --git a/doc-site/pages/_assets/outline-and-search.jpg b/doc-site/pages/_assets/outline-and-search.jpg new file mode 100644 index 00000000..aa0015da Binary files /dev/null and b/doc-site/pages/_assets/outline-and-search.jpg differ diff --git a/doc-site/pages/page-data$.mdx b/doc-site/pages/page-data$.mdx index b841142c..a5b22b94 100644 --- a/doc-site/pages/page-data$.mdx +++ b/doc-site/pages/page-data$.mdx @@ -82,7 +82,7 @@ As stated in [the theme customization doc](/theme-customization), a theme is a R Here is the interface of a theme: - + > Here is an example implementation of vite-pages theme: [vite-pages-theme-doc](https://github.com/vitejs/vite-plugin-react-pages/blob/main/packages/theme-doc/src/index.tsx). [This fixture](https://github.com/vitejs/vite-plugin-react-pages/blob/main/packages/playground/use-theme-doc/pages/_theme.tsx) demonstrate how to use it. diff --git a/doc-site/pages/upgrade-from-v2$.mdx b/doc-site/pages/upgrade-from-v2-to-v3$.mdx similarity index 97% rename from doc-site/pages/upgrade-from-v2$.mdx rename to doc-site/pages/upgrade-from-v2-to-v3$.mdx index 89731f67..c6930efe 100644 --- a/doc-site/pages/upgrade-from-v2$.mdx +++ b/doc-site/pages/upgrade-from-v2-to-v3$.mdx @@ -1,10 +1,10 @@ --- -title: Upgrade from v2 -order: 6 +title: Upgrade from v2 to v3 +order: 2 subGroup: upgrade-guides --- -# Upgrade from vite-plugin-react-pages v2 +# Upgrade from v2 to v3 ## Upgrade package versions diff --git a/doc-site/pages/upgrade-from-v3-to-v4$.mdx b/doc-site/pages/upgrade-from-v3-to-v4$.mdx new file mode 100644 index 00000000..5da2ead2 --- /dev/null +++ b/doc-site/pages/upgrade-from-v3-to-v4$.mdx @@ -0,0 +1,75 @@ +--- +title: Upgrade from v3 to v4 +order: 1 +subGroup: upgrade-guides +--- + +# Upgrade from v3 to v4 + +vite-pages v4 is released with following improvements: + +- Support [Vite v4](https://vitejs.dev/guide/migration.html). +- Upgrade React to [18.x](https://reactjs.org/blog/2022/03/08/react-18-upgrade-guide.html). +- Upgrade react-router to [6.x](https://reactrouter.com/en/main/upgrading/v5). +- Upgrade mdx to [2.x](https://mdxjs.com/migrating/v2/). +- Upgrade antd to [5.x](https://ant.design/docs/react/migration-v5) (for vite-pages-theme-doc). +- Support [Node.js ECMAScript modules](https://nodejs.org/api/esm.html). +- Support markdown outline (table of content). +- Support search. + +![outline-and-search](./_assets/outline-and-search.jpg) + +The following article will show you the migrate instructions. If you encounter problems, open an issue in the repo. Or checkout the [getting-stated templates](https://vitejs.github.io/vite-plugin-react-pages/#getting-stated) for reference. + +## Upstream libraries migration + +Most upgrade work for upstream libraries is already done inside `vite-plugin-react-pages` and `vite-pages-theme-doc`. But some migration need to be done in userland, if you are using some old APIs that are dropped by these upstream libraries. For example, you can no longer use `` of `react-router`. Checkout the links above for the migration guides of upstream libraries. + +We expect upstream libraries migration to be very easy for framwork users, unless you used many `react-router` v5-only APIs. + +## Remove vite-plugin-mdx + +Since `vite-plugin-mdx` doesn't support mdx v2, vite-pages now includes a builtin mdx plugin. So you should remove the `vite-plugin-mdx` in vite-pages v5. + +Update `vite.config.ts`: + +```diff +import { defineConfig } from 'vite' +import react from '@vitejs/plugin-react' +- import mdx from 'vite-plugin-mdx' +import pages from 'vite-plugin-react-pages' + +export default defineConfig({ + plugins: [ + react(), +- mdx(), + pages() + ], +}) +``` + +Notice that `pages()` now return an array of vite plugins(instead of return a plugin). But vite can understand that and apply every plugin in that array. So the invoke pattern of `vite-plugin-react-pages` looks exactly the same as before! You don't need to apply the new builtin mdx plugin manually. + +Update `package.json`: + +- Remove `vite-plugin-mdx` and `@mdx-js/mdx`. +- You should upgrade `@mdx-js/react` to `^2.1.5`. It is a peerDependencies of mdx, so it should be installed by your vite project. + +```diff +{ + "devDependencies": { +- "@mdx-js/mdx": "^1.6.22", +- "vite-plugin-mdx": "^3.5.11", +- "@mdx-js/react": "^1.6.22", ++ "@mdx-js/react": "^2.1.5", + } +} +``` + +## Use Node.js ECMAScript modules + +The Node.js community is quickly migrating from CommonJS to ECMAScript modules (esm). And we encourage you to run vite on the esm mode of Node.js. + +How to enable esm for Node.js? Just add a `"type": "module"` field to the `package.json` of your vite project! + +> It is encouraged to have a dedicated `package.json` for your vite project. Your vite project should not share a `package.json` with the npm package that you are publishing (or the worspace package in the project root directory, if you are using monorepo). diff --git a/doc-site/prettier.config.js b/doc-site/prettier.config.js deleted file mode 100644 index 2384d395..00000000 --- a/doc-site/prettier.config.js +++ /dev/null @@ -1,5 +0,0 @@ -module.exports = { - trailingComma: 'es5', - semi: false, - singleQuote: true, -} diff --git a/packages/theme-basic/src/vite-env.d.ts b/doc-site/vite-env.d.ts similarity index 100% rename from packages/theme-basic/src/vite-env.d.ts rename to doc-site/vite-env.d.ts diff --git a/doc-site/vite.config.ts b/doc-site/vite.config.ts index 2d97d485..248029be 100644 --- a/doc-site/vite.config.ts +++ b/doc-site/vite.config.ts @@ -1,10 +1,9 @@ import { defineConfig } from 'vite' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages from 'vite-plugin-react-pages' export default defineConfig({ - plugins: [react(), mdx(), pages()], + plugins: [react(), pages()], base: process.env.GITHUB_PAGES_DEPLOY === 'true' ? '/vite-plugin-react-pages/' diff --git a/package.json b/package.json index b9d07518..cc84a762 100644 --- a/package.json +++ b/package.json @@ -8,53 +8,48 @@ "build": "pnpm -r --filter='./packages/*' run build", "dev": "pnpm -r --parallel --filter='./packages/*' run dev", "format": "prettier --write ./**/*.{js,ts,tsx}", - "ver": "pnpm recursive --filter create-vite-pages --filter vite-plugin-react-pages --filter vite-pages-theme-basic --filter vite-pages-theme-doc exec -- npm version", + "ver": "pnpm recursive --filter create-vite-pages --filter vite-plugin-react-pages --filter vite-pages-theme-doc exec -- npm version", "ver:p": "npm run ver -- patch", "ver:mi": "npm run ver -- minor", "ver:major": "npm run ver -- major", - "pub": "pnpm -r publish --filter create-vite-pages --filter vite-plugin-react-pages --filter vite-pages-theme-basic --filter vite-pages-theme-doc", + "ver:alpha": "npm run ver -- prerelease --preid alpha", + "pub": "pnpm -r publish --filter create-vite-pages --filter vite-plugin-react-pages --filter vite-pages-theme-doc", "update-deps": "pnpm -r update -i -L", - "update-local-deps": "pnpm update -r vite-plugin-react-pages vite-pages-theme-basic vite-pages-theme-doc --workspace --filter \"!./packages/create-project/**\"", + "update-local-deps": "pnpm update -r vite-plugin-react-pages vite-pages-theme-doc --workspace --filter \"!./packages/create-project/**\"", "test": "playwright test -c ./test-setup", "test-serve": "cross-env VITE_PAGES_MODE=serve pnpm test", "test-build": "cross-env VITE_PAGES_MODE=build pnpm test", "test-ssr": "cross-env VITE_PAGES_MODE=ssr pnpm test", "test-debug": "pnpm test -- --debug", "build:docs": "pnpm --filter doc-site run ssr-for-deploy", - "postinstall": "node ./scripts/linkBins.js", "install-test-deps": "playwright install --with-deps chromium", "prepare": "husky install" }, "devDependencies": { - "@playwright/test": "~1.23.4", - "@pnpm/link-bins": "^7.2.4", - "@pnpm/logger": "^4.0.0", - "@types/node": "^17.0.42", + "@playwright/test": "~1.29.0", + "@pnpm/link-bins": "^8.0.4", + "@pnpm/logger": "^5.0.0", + "@types/node": "^18.11.16", "@types/wait-on": "^5.3.1", "cross-env": "^7.0.3", "execa": "^5.1.1", "get-port": "^5.1.1", - "husky": "^8.0.1", - "prettier": "^2.7.1", + "husky": "^8.0.2", + "prettier": "^2.8.1", "sirv": "^2.0.2", "slash": "^3.0.0", - "typescript": "^4.8.3", + "typescript": "^4.9.4", "wait-on": "^6.0.1" }, "pnpm": { "overrides": { - "react": "^17.0.1", - "react-dom": "^17.0.1", "vite-plugin-react-pages": "workspace:*", - "vite-pages-theme-doc": "workspace:*", - "vite-pages-theme-basic": "workspace:*" + "vite-pages-theme-doc": "workspace:*" }, "peerDependencyRules": { "ignoreMissing": [ "react", "react-dom", - "@mdx-js/mdx", - "@alifd/meet-react", "typescript", "rollup", "@babel/core" diff --git a/packages/create-project/package.json b/packages/create-project/package.json index 77300054..c3082454 100644 --- a/packages/create-project/package.json +++ b/packages/create-project/package.json @@ -1,6 +1,6 @@ { "name": "create-vite-pages", - "version": "3.2.3", + "version": "4.0.0-alpha.17", "keywords": [ "vite", "react", @@ -22,7 +22,7 @@ "cvp": "index.js" }, "dependencies": { - "fs-extra": "^10.1.0", - "minimist": "^1.2.5" + "fs-extra": "^11.1.0", + "minimist": "^1.2.7" } } diff --git a/packages/create-project/template-app/package.json b/packages/create-project/template-app/package.json index d39c8d3c..e0a1dfcb 100644 --- a/packages/create-project/template-app/package.json +++ b/packages/create-project/template-app/package.json @@ -2,6 +2,7 @@ "name": "app-demo", "version": "1.0.2", "private": true, + "type": "module", "scripts": { "dev": "vite serve", "build": "rimraf dist && vite build --outDir dist && serve -s dist", @@ -11,22 +12,19 @@ "author": "", "license": "ISC", "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@mdx-js/mdx": "^1.6.22", - "@mdx-js/react": "^1.6.22", - "@types/node": "^17.0.42", - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", + "@mdx-js/react": "^2.2.1", + "@types/node": "^18.11.16", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", - "vite-pages-theme-doc": "^3.1.4", - "vite-plugin-mdx": "^3.5.11", - "vite-plugin-react-pages": "^3.1.8" + "serve": "^14.1.2", + "vite": "^4.0.1", + "vite-pages-theme-doc": "^4.0.0-alpha.1", + "vite-plugin-react-pages": "^4.0.0-alpha.2" } } diff --git a/packages/create-project/template-app/pages/guide/react/getting-started/index$.md b/packages/create-project/template-app/pages/guide/react/getting-started/index$.md index c802d62a..1e0adbe2 100644 --- a/packages/create-project/template-app/pages/guide/react/getting-started/index$.md +++ b/packages/create-project/template-app/pages/guide/react/getting-started/index$.md @@ -3,124 +3,4 @@ title: Getting Started order: 0 --- -# Getting Started React - -Ant Design React is dedicated to providing a **good development experience** for programmers. Before starting, it is recommended to learn [React](https://reactjs.org) and [ES2015](http://babeljs.io/docs/learn-es2015/) first, and correctly install and configure [Node.js](https://nodejs.org/) v8 or above. - -The official guide also assumes that you have intermediate knowledge about HTML, CSS, and JavaScript, and React. If you are just starting to learn front-end or React, it may not be the best idea to use the UI framework as your first step. - -Finally, if you are working in a local development environment, please refer to [Install and Initialization](/docs/react/use-with-create-react-app#Install-and-Initialization) section of "Use in create-react-app". - ---- - -## Your First Example - -Here is a simple online codesandbox demo of an Ant Design component to show the usage of Ant Design React. - -import FirstExample from './FirstExample'; - - - -Follow the steps below to play around with Ant Design yourself: - -### 1. Create a codesandbox - -Visit http://u.ant.design/codesandbox-repro to create a codesandbox -- don't forget to press the save button as well to create a new instance. - -### 2. Use and modify an antd component - -Replace the contents of `index.js` with the following code. As you can see, there is no difference between antd's components and typical React components. - -If you have already set things up by following the [Install and Initialization](/docs/react/use-with-create-react-app#Install-and-Initialization) section of "Use in create-react-app", replace the content of `/src/index.js` as follows: - -```jsx -import React, { useState } from 'react' -import { render } from 'react-dom' -import { DatePicker, message } from 'antd' -import 'antd/dist/antd.css' -import './index.css' - -const App = () => { - const [date, setDate] = useState(null) - const handleChange = (value) => { - message.info( - `Selected Date: ${value ? value.format('YYYY-MM-DD') : 'None'}` - ) - setDate(value) - } - return ( -
- -
- Selected Date: {date ? date.format('YYYY-MM-DD') : 'None'} -
-
- ) -} - -render(, document.getElementById('root')) -``` - -### 3. Explore more components - -You can view the list of components in the side menu of the Components page, such as the [Alert](/components/alert) component. Plenty of examples are also provided in the component pages and API documentation as well. - -Click the "Open in Editor" icon in the first example to open an editor with source code to use out-of-the-box. Now you can import the `Alert` component into the codesandbox: - -```diff -- import { DatePicker, message } from 'antd'; -+ import { DatePicker, message, Alert } from 'antd'; -``` - -Now add the following jsx inside the `render` function. - -```diff - this.handleChange(value)} /> -
-- Selected Date: {date ? date.format('YYYY-MM-DD') : 'None'} -+ -
-``` - -Select a date, and you can see the effect in the preview area on the right: - -codesandbox screenshot - -OK! Now that you know the basics of using antd components, you are welcome to explore more components in the codesandbox. When reporting a bug with ant design, we also strongly recommend using codesandbox to provide a reproducible demo as well. - -### 4. Next Steps - -During actual real-world project development, you will most likely need a development workflow consisting of `compile/build/deploy/lint/debug/` deployment. You can read the following documents on the subject or use the following scaffolds and examples provided below: - -- [Ant Design Pro](http://pro.ant.design/) -- [antd-admin](https://github.com/zuiidea/antd-admin) -- [d2-admin](https://github.com/d2-projects/d2-admin) -- More scaffolds at [Scaffold Market](http://scaffold.ant.design/) - -## Test with Jest - -If you use `create-react-app` follow the instructions [here](/docs/react/use-with-create-react-app#Test-with-Jest) instead. - -Jest does not support `esm` modules, and Ant Design uses them. In order to test your Ant Design application with Jest you have to add the following to your Jest config : - -```json -"transform": { "^.+\\.(ts|tsx|js|jsx)?$": "ts-jest" } -``` - -## Import on Demand - -`antd` supports tree shaking of ES modules, so using `import { Button } from 'antd';` would drop js code you didn't use. - -If you see logs like in the screenshot below, you might still be using `webpack@1.x` or have a wrong webpack config which can't support tree shaking. - -``` -You are using a whole package of antd, please use https://www.npmjs.com/package/babel-plugin-import to reduce app bundle size. Please upgrade webpack or check the config. -``` - -> ![console warning](https://zos.alipayobjects.com/rmsportal/GHIRszVcmjccgZRakJDQ.png) - -## Customize your Workflow - -If you want to customize your workflow, we recommend using [webpack](http://webpack.github.io/) to build and debug code. You can try out plenty of [boilerplates](https://github.com/enaqx/awesome-react#react-tools) available in the React ecosystem. - -There are also some [scaffolds](http://scaffold.ant.design/) which have already been integrated into antd, so you can try and start with one of these and even contribute. +# Getting Started diff --git a/packages/create-project/template-app/pages/md-test1$.md b/packages/create-project/template-app/pages/md-test1$.md new file mode 100644 index 00000000..52e8da20 --- /dev/null +++ b/packages/create-project/template-app/pages/md-test1$.md @@ -0,0 +1,162 @@ +# Markdown Test Page1 + +> markdown render test data from: https://github.com/fullpipe/markdown-test-page/blob/master/test-page.md + +# Heading one + +Sint sit cillum pariatur eiusmod nulla pariatur ipsum. Sit laborum anim qui mollit tempor pariatur nisi minim dolor. Aliquip et adipisicing sit sit fugiat commodo id sunt. Nostrud enim ad commodo incididunt cupidatat in ullamco ullamco Lorem cupidatat velit enim et Lorem. Ut laborum cillum laboris fugiat culpa sint irure do reprehenderit culpa occaecat. Exercitation esse mollit tempor magna aliqua in occaecat aliquip veniam reprehenderit nisi dolor in laboris dolore velit. + +## Heading two + +Aute officia nulla deserunt do deserunt cillum velit magna. Officia veniam culpa anim minim dolore labore pariatur voluptate id ad est duis quis velit dolor pariatur enim. Incididunt enim excepteur do veniam consequat culpa do voluptate dolor fugiat ad adipisicing sit. Labore officia est adipisicing dolore proident eiusmod exercitation deserunt ullamco anim do occaecat velit. Elit dolor consectetur proident sunt aliquip est do tempor quis aliqua culpa aute. Duis in tempor exercitation pariatur et adipisicing mollit irure tempor ut enim esse commodo laboris proident. Do excepteur laborum anim esse aliquip eu sit id Lorem incididunt elit irure ea nulla dolor et. Nulla amet fugiat qui minim deserunt enim eu cupidatat aute officia do velit ea reprehenderit. + +### Heading three + +Voluptate cupidatat cillum elit quis ipsum eu voluptate fugiat consectetur enim. Quis ut voluptate culpa ex anim aute consectetur dolore proident voluptate exercitation eiusmod. Esse in do anim magna minim culpa sint. Adipisicing ipsum consectetur proident ullamco magna sit amet aliqua aute fugiat laborum exercitation duis et. + +#### Heading four + +Commodo fugiat aliqua minim quis pariatur mollit id tempor. Non occaecat minim esse enim aliqua adipisicing nostrud duis consequat eu adipisicing qui. Minim aliquip sit excepteur ipsum consequat laborum pariatur excepteur. Veniam fugiat et amet ad elit anim laborum duis mollit occaecat et et ipsum et reprehenderit. Occaecat aliquip dolore adipisicing sint labore occaecat officia fugiat. Quis adipisicing exercitation exercitation eu amet est laboris sunt nostrud ipsum reprehenderit ullamco. Enim sint ut consectetur id anim aute voluptate exercitation mollit dolore magna magna est Lorem. Ut adipisicing adipisicing aliqua ullamco voluptate labore nisi tempor esse magna incididunt. + +##### Heading five + +Veniam enim esse amet veniam deserunt laboris amet enim consequat. Minim nostrud deserunt cillum consectetur commodo eu enim nostrud ullamco occaecat excepteur. Aliquip et ut est commodo enim dolor amet sint excepteur. Amet ad laboris laborum deserunt sint sunt aliqua commodo ex duis deserunt enim est ex labore ut. Duis incididunt velit adipisicing non incididunt adipisicing adipisicing. Ad irure duis nisi tempor eu dolor fugiat magna et consequat tempor eu ex dolore. Mollit esse nisi qui culpa ut nisi ex proident culpa cupidatat cillum culpa occaecat anim. Ut officia sit ea nisi ea excepteur nostrud ipsum et nulla. + +###### Heading six longgggggggggggggggggggggggggggggggggggggggg + +Lorem ipsum dolor sit amet, consectetur adipisicing 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. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + + +[[Top]](#markdown-test-page1) + +# Paragraphs + +Incididunt ex adipisicing ea ullamco consectetur in voluptate proident fugiat tempor deserunt reprehenderit ullamco id dolore laborum. Do laboris laboris minim incididunt qui consectetur exercitation adipisicing dolore et magna consequat magna anim sunt. Officia fugiat Lorem sunt pariatur incididunt Lorem reprehenderit proident irure. Dolore ipsum aliqua mollit ad officia fugiat sit eu aliquip cupidatat ipsum duis laborum laborum fugiat esse. Voluptate anim ex dolore deserunt ea ex eiusmod irure. Occaecat excepteur aliqua exercitation aliquip dolor esse eu eu. + +Officia dolore laborum aute incididunt commodo nisi velit est est elit et dolore elit exercitation. Enim aliquip magna id ipsum aliquip consectetur ad nulla quis. Incididunt pariatur dolor consectetur cillum enim velit cupidatat laborum quis ex. + +Officia irure in non voluptate adipisicing sit amet tempor duis dolore deserunt enim ut. Reprehenderit incididunt in ad anim et deserunt deserunt Lorem laborum quis. Enim aute anim labore proident laboris voluptate elit excepteur in. Ex labore nulla velit officia ullamco Lorem Lorem id do. Dolore ullamco ipsum magna dolor pariatur voluptate ipsum id occaecat ipsum. Dolore tempor quis duis commodo quis quis enim. + +[[Top]](#markdown-test-page1) + +# Blockquotes + +Ad nisi laborum aute cupidatat magna deserunt eu id laboris id. Aliquip nulla cupidatat sint ex Lorem mollit laborum dolor amet est ut esse aute. Nostrud ex consequat id incididunt proident ipsum minim duis aliqua ut ex et ad quis. Laborum sint esse cillum anim nulla cillum consectetur aliqua sit. Nisi excepteur cillum labore amet excepteur commodo enim occaecat consequat ipsum proident exercitation duis id in. + +> Ipsum et cupidatat mollit exercitation enim duis sunt irure aliqua reprehenderit mollit. Pariatur Lorem pariatur laboris do culpa do elit irure. Eiusmod amet nulla voluptate velit culpa et aliqua ad reprehenderit sit ut. + +Labore ea magna Lorem consequat aliquip consectetur cillum duis dolore. Et veniam dolor qui incididunt minim amet laboris sit. Dolore ad esse commodo et dolore amet est velit ut nisi ea. Excepteur ea nulla commodo dolore anim dolore adipisicing eiusmod labore id enim esse quis mollit deserunt est. Minim ea culpa voluptate nostrud commodo proident in duis aliquip minim. + +> Qui est sit et reprehenderit aute est esse enim aliqua id aliquip ea anim. Pariatur sint reprehenderit mollit velit voluptate enim consectetur sint enim. Quis exercitation proident elit non id qui culpa dolore esse aliquip consequat. + +Ipsum excepteur cupidatat sunt minim ad eiusmod tempor sit. + +> Deserunt excepteur adipisicing culpa pariatur cillum laboris ullamco nisi fugiat cillum officia. In cupidatat nulla aliquip tempor ad Lorem Lorem quis voluptate officia consectetur pariatur ex in est duis. Mollit id esse est elit exercitation voluptate nostrud nisi laborum magna dolore dolore tempor in est consectetur. + +Adipisicing voluptate ipsum culpa voluptate id aute laboris labore esse fugiat veniam ullamco occaecat do ut. Tempor et esse reprehenderit veniam proident ipsum irure sit ullamco et labore ea excepteur nulla labore ut. Ex aute minim quis tempor in eu id id irure ea nostrud dolor esse. + +[[Top]](#markdown-test-page1) + +# Lists + +### Ordered List + +1. Longan +2. Lychee +3. Excepteur ad cupidatat do elit laborum amet cillum reprehenderit consequat quis. + Deserunt officia esse aliquip consectetur duis ut labore laborum commodo aliquip aliquip velit pariatur dolore. +4. Marionberry +5. Melon + - Cantaloupe + - Honeydew + - Watermelon +6. Miracle fruit +7. Mulberry + +### Unordered List + +- Olive +- Orange + - Blood orange + - Clementine +- Papaya +- Ut aute ipsum occaecat nisi culpa Lorem id occaecat cupidatat id id magna laboris ad duis. Fugiat cillum dolore veniam nostrud proident sint consectetur eiusmod irure adipisicing. +- Passionfruit + +[[Top]](#markdown-test-page1) + +# Horizontal rule + +In dolore velit aliquip labore mollit minim tempor veniam eu veniam ad in sint aliquip mollit mollit. Ex occaecat non deserunt elit laborum sunt tempor sint consequat culpa culpa qui sit. Irure ad commodo eu voluptate mollit cillum cupidatat veniam proident amet minim reprehenderit. + +*** + +In laboris eiusmod reprehenderit aliquip sit proident occaecat. Non sit labore anim elit veniam Lorem minim commodo eiusmod irure do minim nisi. Dolor amet cillum excepteur consequat sint non sint. + +[[Top]](#markdown-test-page1) + +# Table + +Duis sunt ut pariatur reprehenderit mollit mollit magna dolore in pariatur nulla commodo sit dolor ad fugiat. Laboris amet ea occaecat duis eu enim exercitation deserunt ea laborum occaecat reprehenderit. Et incididunt dolor commodo consequat mollit nisi proident non pariatur in et incididunt id. Eu ut et Lorem ea ex magna minim ipsum ipsum do. + +| Table Heading 1 | Table Heading 2 | Center align | Right align | Table Heading 5 | +| :-------------- | :-------------- | :-------------: | --------------: | :-------------- | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | + +Minim id consequat adipisicing cupidatat laborum culpa veniam non consectetur et duis pariatur reprehenderit eu ex consectetur. Sunt nisi qui eiusmod ut cillum laborum Lorem officia aliquip laboris ullamco nostrud laboris non irure laboris. Cillum dolore labore Lorem deserunt mollit voluptate esse incididunt ex dolor. + +[[Top]](#markdown-test-page1) + +# Code + +## Inline code + +Ad amet irure est magna id mollit Lorem in do duis enim. Excepteur velit nisi magna ea pariatur pariatur ullamco fugiat deserunt sint non sint. Duis duis est `code in text` velit velit aute culpa ex quis pariatur pariatur laborum aute pariatur duis tempor sunt ad. Irure magna voluptate dolore consectetur consectetur irure esse. Anim magna `in culpa qui officia` dolor eiusmod esse amet aute cupidatat aliqua do id voluptate cupidatat reprehenderit amet labore deserunt. + +## Highlighted + +Et fugiat ad nisi amet magna labore do cillum fugiat occaecat cillum Lorem proident. In sint dolor ullamco ad do adipisicing amet id excepteur Lorem aliquip sit irure veniam laborum duis cillum. Aliqua occaecat minim cillum deserunt magna sunt laboris do do irure ea nostrud consequat ut voluptate ex. + +```go +package main + +import ( + "fmt" + "net/http" +) + +func handler(w http.ResponseWriter, r *http.Request) { + fmt.Fprintf(w, "Hi there, I love %s!", r.URL.Path[1:]) +} + +func main() { + http.HandleFunc("/", handler) + http.ListenAndServe(":8080", nil) +} +``` + +Ex amet id ex aliquip id do laborum excepteur exercitation elit sint commodo occaecat nostrud est. Nostrud pariatur esse veniam laborum non sint magna sit laboris minim in id. Aliqua pariatur pariatur excepteur adipisicing irure culpa consequat commodo et ex id ad. + +[[Top]](#markdown-test-page1) + +# Inline elements + +Sint ea anim ipsum ad commodo cupidatat do **exercitation** incididunt et minim ad labore sunt. Minim deserunt labore laboris velit nulla incididunt ipsum nulla. Ullamco ad laborum ea qui et anim in laboris exercitation tempor sit officia laborum reprehenderit culpa velit quis. **Consequat commodo** reprehenderit duis [irure](#!) esse esse exercitation minim enim Lorem dolore duis irure. Nisi Lorem reprehenderit ea amet excepteur dolor excepteur magna labore proident voluptate ipsum. Reprehenderit ex esse deserunt aliqua ea officia mollit Lorem nulla magna enim. Et ad ipsum labore enim ipsum **cupidatat consequat**. Commodo non ea cupidatat magna deserunt dolore ipsum velit nulla elit veniam nulla eiusmod proident officia. + +![Super wide](http://placekitten.com/1280/800) + +*Proident sit veniam in est proident officia adipisicing* ea tempor cillum non cillum velit deserunt. Voluptate laborum incididunt sit consectetur Lorem irure incididunt voluptate nostrud. Commodo ut eiusmod tempor cupidatat esse enim minim ex anim consequat. Mollit sint culpa qui laboris quis consectetur ad sint esse. Amet anim anim minim ullamco et duis non irure. Sit tempor adipisicing ea laboris `culpa ex duis sint` anim aute reprehenderit id eu ea. Aute [excepteur proident](#!) Lorem minim adipisicing nostrud mollit ad ut voluptate do nulla esse occaecat aliqua sint anim. + +![Not so big](http://placekitten.com/480/400) + +Incididunt in culpa cupidatat mollit cillum qui proident sit. In cillum aliquip incididunt voluptate magna amet cupidatat cillum pariatur sint aliqua est _enim **anim** voluptate_. Magna aliquip proident incididunt id duis pariatur eiusmod incididunt commodo culpa dolore sit. Culpa do nostrud elit ad exercitation anim pariatur non minim nisi **adipisicing sunt _officia_**. Do deserunt magna mollit Lorem commodo ipsum do cupidatat mollit enim ut elit veniam ea voluptate. + +[![Manny Pacquiao](https://img.youtube.com/vi/s6bCmZmy9aQ/0.jpg)](https://youtu.be/s6bCmZmy9aQ) + +Reprehenderit non eu quis in ad elit esse qui aute id [incididunt](#!) dolore cillum. Esse laboris consequat dolor anim exercitation tempor aliqua deserunt velit magna laboris. Culpa culpa minim duis amet mollit do quis amet commodo nulla irure. + +[[Top]](#markdown-test-page1) diff --git a/packages/create-project/template-app/vite.config.ts b/packages/create-project/template-app/vite.config.ts index fb14a1d9..131bec52 100644 --- a/packages/create-project/template-app/vite.config.ts +++ b/packages/create-project/template-app/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vite' import * as path from 'path' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages from 'vite-plugin-react-pages' export default defineConfig({ plugins: [ react(), - mdx(), pages({ pagesDir: path.join(__dirname, 'pages'), }), diff --git a/packages/create-project/template-lib-monorepo/packages/button/package.json b/packages/create-project/template-lib-monorepo/packages/button/package.json index f65d8743..005b14ef 100644 --- a/packages/create-project/template-lib-monorepo/packages/button/package.json +++ b/packages/create-project/template-lib-monorepo/packages/button/package.json @@ -9,9 +9,9 @@ "author": "", "license": "ISC", "devDependencies": { - "@types/react": "^17.0.3", - "react": "^17.0.1", + "@types/react": "^18.0.26", + "react": "^18.2.0", "rimraf": "^3.0.2", - "typescript": "^4.8.3" + "typescript": "^4.9.4" } } diff --git a/packages/create-project/template-lib-monorepo/packages/card/package.json b/packages/create-project/template-lib-monorepo/packages/card/package.json index 700221d1..57c0d94a 100644 --- a/packages/create-project/template-lib-monorepo/packages/card/package.json +++ b/packages/create-project/template-lib-monorepo/packages/card/package.json @@ -9,9 +9,9 @@ "author": "", "license": "ISC", "devDependencies": { - "@types/react": "^17.0.3", - "react": "^17.0.1", + "@types/react": "^18.0.26", + "react": "^18.2.0", "rimraf": "^3.0.2", - "typescript": "^4.8.3" + "typescript": "^4.9.4" } } diff --git a/packages/create-project/template-lib-monorepo/packages/demos/package.json b/packages/create-project/template-lib-monorepo/packages/demos/package.json index 370e25dd..9097a3f6 100644 --- a/packages/create-project/template-lib-monorepo/packages/demos/package.json +++ b/packages/create-project/template-lib-monorepo/packages/demos/package.json @@ -2,6 +2,7 @@ "name": "library-demos", "version": "1.0.2", "private": true, + "type": "module", "scripts": { "dev": "SHOW_ALL_COMPONENT_DEMOS=true vite serve", "build": "rimraf dist && vite build && serve -s dist", @@ -11,25 +12,22 @@ "author": "", "license": "ISC", "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@mdx-js/mdx": "^1.6.22", - "@mdx-js/react": "^1.6.22", - "@types/node": "^17.0.42", - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", - "globby": "^11.0.2", + "@mdx-js/react": "^2.2.1", + "@types/node": "^18.11.16", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", + "globby": "^13.1.3", "my-button": "*", "my-card": "*", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", - "vite-pages-theme-doc": "^3.0.0", - "vite-plugin-mdx": "^3.5.11", - "vite-plugin-react-pages": "^3.0.0" + "serve": "^14.1.2", + "vite": "^4.0.1", + "vite-pages-theme-doc": "^4.0.0-alpha.1", + "vite-plugin-react-pages": "^4.0.0-alpha.2" } } diff --git a/packages/create-project/template-lib-monorepo/packages/demos/pages/404.tsx b/packages/create-project/template-lib-monorepo/packages/demos/pages/404.tsx index 46c6620f..84152b8f 100644 --- a/packages/create-project/template-lib-monorepo/packages/demos/pages/404.tsx +++ b/packages/create-project/template-lib-monorepo/packages/demos/pages/404.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Redirect } from 'react-router-dom' +import { Navigate } from 'react-router-dom' const Component404 = () => { - return + return } export default Component404 diff --git a/packages/create-project/template-lib-monorepo/packages/demos/pages/_theme.tsx b/packages/create-project/template-lib-monorepo/packages/demos/pages/_theme.tsx index 96b85677..0a1382f3 100644 --- a/packages/create-project/template-lib-monorepo/packages/demos/pages/_theme.tsx +++ b/packages/create-project/template-lib-monorepo/packages/demos/pages/_theme.tsx @@ -12,7 +12,7 @@ export default createTheme({ activeIfMatch: { // match all first-level paths path: '/:foo', - exact: true, + end: true, }, }, { diff --git a/packages/create-project/template-lib-monorepo/packages/demos/pages/md-test1$.md b/packages/create-project/template-lib-monorepo/packages/demos/pages/md-test1$.md new file mode 100644 index 00000000..52e8da20 --- /dev/null +++ b/packages/create-project/template-lib-monorepo/packages/demos/pages/md-test1$.md @@ -0,0 +1,162 @@ +# Markdown Test Page1 + +> markdown render test data from: https://github.com/fullpipe/markdown-test-page/blob/master/test-page.md + +# Heading one + +Sint sit cillum pariatur eiusmod nulla pariatur ipsum. Sit laborum anim qui mollit tempor pariatur nisi minim dolor. Aliquip et adipisicing sit sit fugiat commodo id sunt. Nostrud enim ad commodo incididunt cupidatat in ullamco ullamco Lorem cupidatat velit enim et Lorem. Ut laborum cillum laboris fugiat culpa sint irure do reprehenderit culpa occaecat. Exercitation esse mollit tempor magna aliqua in occaecat aliquip veniam reprehenderit nisi dolor in laboris dolore velit. + +## Heading two + +Aute officia nulla deserunt do deserunt cillum velit magna. Officia veniam culpa anim minim dolore labore pariatur voluptate id ad est duis quis velit dolor pariatur enim. Incididunt enim excepteur do veniam consequat culpa do voluptate dolor fugiat ad adipisicing sit. Labore officia est adipisicing dolore proident eiusmod exercitation deserunt ullamco anim do occaecat velit. Elit dolor consectetur proident sunt aliquip est do tempor quis aliqua culpa aute. Duis in tempor exercitation pariatur et adipisicing mollit irure tempor ut enim esse commodo laboris proident. Do excepteur laborum anim esse aliquip eu sit id Lorem incididunt elit irure ea nulla dolor et. Nulla amet fugiat qui minim deserunt enim eu cupidatat aute officia do velit ea reprehenderit. + +### Heading three + +Voluptate cupidatat cillum elit quis ipsum eu voluptate fugiat consectetur enim. Quis ut voluptate culpa ex anim aute consectetur dolore proident voluptate exercitation eiusmod. Esse in do anim magna minim culpa sint. Adipisicing ipsum consectetur proident ullamco magna sit amet aliqua aute fugiat laborum exercitation duis et. + +#### Heading four + +Commodo fugiat aliqua minim quis pariatur mollit id tempor. Non occaecat minim esse enim aliqua adipisicing nostrud duis consequat eu adipisicing qui. Minim aliquip sit excepteur ipsum consequat laborum pariatur excepteur. Veniam fugiat et amet ad elit anim laborum duis mollit occaecat et et ipsum et reprehenderit. Occaecat aliquip dolore adipisicing sint labore occaecat officia fugiat. Quis adipisicing exercitation exercitation eu amet est laboris sunt nostrud ipsum reprehenderit ullamco. Enim sint ut consectetur id anim aute voluptate exercitation mollit dolore magna magna est Lorem. Ut adipisicing adipisicing aliqua ullamco voluptate labore nisi tempor esse magna incididunt. + +##### Heading five + +Veniam enim esse amet veniam deserunt laboris amet enim consequat. Minim nostrud deserunt cillum consectetur commodo eu enim nostrud ullamco occaecat excepteur. Aliquip et ut est commodo enim dolor amet sint excepteur. Amet ad laboris laborum deserunt sint sunt aliqua commodo ex duis deserunt enim est ex labore ut. Duis incididunt velit adipisicing non incididunt adipisicing adipisicing. Ad irure duis nisi tempor eu dolor fugiat magna et consequat tempor eu ex dolore. Mollit esse nisi qui culpa ut nisi ex proident culpa cupidatat cillum culpa occaecat anim. Ut officia sit ea nisi ea excepteur nostrud ipsum et nulla. + +###### Heading six longgggggggggggggggggggggggggggggggggggggggg + +Lorem ipsum dolor sit amet, consectetur adipisicing 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. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + + +[[Top]](#markdown-test-page1) + +# Paragraphs + +Incididunt ex adipisicing ea ullamco consectetur in voluptate proident fugiat tempor deserunt reprehenderit ullamco id dolore laborum. Do laboris laboris minim incididunt qui consectetur exercitation adipisicing dolore et magna consequat magna anim sunt. Officia fugiat Lorem sunt pariatur incididunt Lorem reprehenderit proident irure. Dolore ipsum aliqua mollit ad officia fugiat sit eu aliquip cupidatat ipsum duis laborum laborum fugiat esse. Voluptate anim ex dolore deserunt ea ex eiusmod irure. Occaecat excepteur aliqua exercitation aliquip dolor esse eu eu. + +Officia dolore laborum aute incididunt commodo nisi velit est est elit et dolore elit exercitation. Enim aliquip magna id ipsum aliquip consectetur ad nulla quis. Incididunt pariatur dolor consectetur cillum enim velit cupidatat laborum quis ex. + +Officia irure in non voluptate adipisicing sit amet tempor duis dolore deserunt enim ut. Reprehenderit incididunt in ad anim et deserunt deserunt Lorem laborum quis. Enim aute anim labore proident laboris voluptate elit excepteur in. Ex labore nulla velit officia ullamco Lorem Lorem id do. Dolore ullamco ipsum magna dolor pariatur voluptate ipsum id occaecat ipsum. Dolore tempor quis duis commodo quis quis enim. + +[[Top]](#markdown-test-page1) + +# Blockquotes + +Ad nisi laborum aute cupidatat magna deserunt eu id laboris id. Aliquip nulla cupidatat sint ex Lorem mollit laborum dolor amet est ut esse aute. Nostrud ex consequat id incididunt proident ipsum minim duis aliqua ut ex et ad quis. Laborum sint esse cillum anim nulla cillum consectetur aliqua sit. Nisi excepteur cillum labore amet excepteur commodo enim occaecat consequat ipsum proident exercitation duis id in. + +> Ipsum et cupidatat mollit exercitation enim duis sunt irure aliqua reprehenderit mollit. Pariatur Lorem pariatur laboris do culpa do elit irure. Eiusmod amet nulla voluptate velit culpa et aliqua ad reprehenderit sit ut. + +Labore ea magna Lorem consequat aliquip consectetur cillum duis dolore. Et veniam dolor qui incididunt minim amet laboris sit. Dolore ad esse commodo et dolore amet est velit ut nisi ea. Excepteur ea nulla commodo dolore anim dolore adipisicing eiusmod labore id enim esse quis mollit deserunt est. Minim ea culpa voluptate nostrud commodo proident in duis aliquip minim. + +> Qui est sit et reprehenderit aute est esse enim aliqua id aliquip ea anim. Pariatur sint reprehenderit mollit velit voluptate enim consectetur sint enim. Quis exercitation proident elit non id qui culpa dolore esse aliquip consequat. + +Ipsum excepteur cupidatat sunt minim ad eiusmod tempor sit. + +> Deserunt excepteur adipisicing culpa pariatur cillum laboris ullamco nisi fugiat cillum officia. In cupidatat nulla aliquip tempor ad Lorem Lorem quis voluptate officia consectetur pariatur ex in est duis. Mollit id esse est elit exercitation voluptate nostrud nisi laborum magna dolore dolore tempor in est consectetur. + +Adipisicing voluptate ipsum culpa voluptate id aute laboris labore esse fugiat veniam ullamco occaecat do ut. Tempor et esse reprehenderit veniam proident ipsum irure sit ullamco et labore ea excepteur nulla labore ut. Ex aute minim quis tempor in eu id id irure ea nostrud dolor esse. + +[[Top]](#markdown-test-page1) + +# Lists + +### Ordered List + +1. Longan +2. Lychee +3. Excepteur ad cupidatat do elit laborum amet cillum reprehenderit consequat quis. + Deserunt officia esse aliquip consectetur duis ut labore laborum commodo aliquip aliquip velit pariatur dolore. +4. Marionberry +5. Melon + - Cantaloupe + - Honeydew + - Watermelon +6. Miracle fruit +7. Mulberry + +### Unordered List + +- Olive +- Orange + - Blood orange + - Clementine +- Papaya +- Ut aute ipsum occaecat nisi culpa Lorem id occaecat cupidatat id id magna laboris ad duis. Fugiat cillum dolore veniam nostrud proident sint consectetur eiusmod irure adipisicing. +- Passionfruit + +[[Top]](#markdown-test-page1) + +# Horizontal rule + +In dolore velit aliquip labore mollit minim tempor veniam eu veniam ad in sint aliquip mollit mollit. Ex occaecat non deserunt elit laborum sunt tempor sint consequat culpa culpa qui sit. Irure ad commodo eu voluptate mollit cillum cupidatat veniam proident amet minim reprehenderit. + +*** + +In laboris eiusmod reprehenderit aliquip sit proident occaecat. Non sit labore anim elit veniam Lorem minim commodo eiusmod irure do minim nisi. Dolor amet cillum excepteur consequat sint non sint. + +[[Top]](#markdown-test-page1) + +# Table + +Duis sunt ut pariatur reprehenderit mollit mollit magna dolore in pariatur nulla commodo sit dolor ad fugiat. Laboris amet ea occaecat duis eu enim exercitation deserunt ea laborum occaecat reprehenderit. Et incididunt dolor commodo consequat mollit nisi proident non pariatur in et incididunt id. Eu ut et Lorem ea ex magna minim ipsum ipsum do. + +| Table Heading 1 | Table Heading 2 | Center align | Right align | Table Heading 5 | +| :-------------- | :-------------- | :-------------: | --------------: | :-------------- | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | + +Minim id consequat adipisicing cupidatat laborum culpa veniam non consectetur et duis pariatur reprehenderit eu ex consectetur. Sunt nisi qui eiusmod ut cillum laborum Lorem officia aliquip laboris ullamco nostrud laboris non irure laboris. Cillum dolore labore Lorem deserunt mollit voluptate esse incididunt ex dolor. + +[[Top]](#markdown-test-page1) + +# Code + +## Inline code + +Ad amet irure est magna id mollit Lorem in do duis enim. Excepteur velit nisi magna ea pariatur pariatur ullamco fugiat deserunt sint non sint. Duis duis est `code in text` velit velit aute culpa ex quis pariatur pariatur laborum aute pariatur duis tempor sunt ad. Irure magna voluptate dolore consectetur consectetur irure esse. Anim magna `in culpa qui officia` dolor eiusmod esse amet aute cupidatat aliqua do id voluptate cupidatat reprehenderit amet labore deserunt. + +## Highlighted + +Et fugiat ad nisi amet magna labore do cillum fugiat occaecat cillum Lorem proident. In sint dolor ullamco ad do adipisicing amet id excepteur Lorem aliquip sit irure veniam laborum duis cillum. Aliqua occaecat minim cillum deserunt magna sunt laboris do do irure ea nostrud consequat ut voluptate ex. + +```go +package main + +import ( + "fmt" + "net/http" +) + +func handler(w http.ResponseWriter, r *http.Request) { + fmt.Fprintf(w, "Hi there, I love %s!", r.URL.Path[1:]) +} + +func main() { + http.HandleFunc("/", handler) + http.ListenAndServe(":8080", nil) +} +``` + +Ex amet id ex aliquip id do laborum excepteur exercitation elit sint commodo occaecat nostrud est. Nostrud pariatur esse veniam laborum non sint magna sit laboris minim in id. Aliqua pariatur pariatur excepteur adipisicing irure culpa consequat commodo et ex id ad. + +[[Top]](#markdown-test-page1) + +# Inline elements + +Sint ea anim ipsum ad commodo cupidatat do **exercitation** incididunt et minim ad labore sunt. Minim deserunt labore laboris velit nulla incididunt ipsum nulla. Ullamco ad laborum ea qui et anim in laboris exercitation tempor sit officia laborum reprehenderit culpa velit quis. **Consequat commodo** reprehenderit duis [irure](#!) esse esse exercitation minim enim Lorem dolore duis irure. Nisi Lorem reprehenderit ea amet excepteur dolor excepteur magna labore proident voluptate ipsum. Reprehenderit ex esse deserunt aliqua ea officia mollit Lorem nulla magna enim. Et ad ipsum labore enim ipsum **cupidatat consequat**. Commodo non ea cupidatat magna deserunt dolore ipsum velit nulla elit veniam nulla eiusmod proident officia. + +![Super wide](http://placekitten.com/1280/800) + +*Proident sit veniam in est proident officia adipisicing* ea tempor cillum non cillum velit deserunt. Voluptate laborum incididunt sit consectetur Lorem irure incididunt voluptate nostrud. Commodo ut eiusmod tempor cupidatat esse enim minim ex anim consequat. Mollit sint culpa qui laboris quis consectetur ad sint esse. Amet anim anim minim ullamco et duis non irure. Sit tempor adipisicing ea laboris `culpa ex duis sint` anim aute reprehenderit id eu ea. Aute [excepteur proident](#!) Lorem minim adipisicing nostrud mollit ad ut voluptate do nulla esse occaecat aliqua sint anim. + +![Not so big](http://placekitten.com/480/400) + +Incididunt in culpa cupidatat mollit cillum qui proident sit. In cillum aliquip incididunt voluptate magna amet cupidatat cillum pariatur sint aliqua est _enim **anim** voluptate_. Magna aliquip proident incididunt id duis pariatur eiusmod incididunt commodo culpa dolore sit. Culpa do nostrud elit ad exercitation anim pariatur non minim nisi **adipisicing sunt _officia_**. Do deserunt magna mollit Lorem commodo ipsum do cupidatat mollit enim ut elit veniam ea voluptate. + +[![Manny Pacquiao](https://img.youtube.com/vi/s6bCmZmy9aQ/0.jpg)](https://youtu.be/s6bCmZmy9aQ) + +Reprehenderit non eu quis in ad elit esse qui aute id [incididunt](#!) dolore cillum. Esse laboris consequat dolor anim exercitation tempor aliqua deserunt velit magna laboris. Culpa culpa minim duis amet mollit do quis amet commodo nulla irure. + +[[Top]](#markdown-test-page1) diff --git a/packages/create-project/template-lib-monorepo/packages/demos/vite.config.ts b/packages/create-project/template-lib-monorepo/packages/demos/vite.config.ts index 0250cf8d..897821b3 100644 --- a/packages/create-project/template-lib-monorepo/packages/demos/vite.config.ts +++ b/packages/create-project/template-lib-monorepo/packages/demos/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vite' import * as path from 'path' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages, { DefaultPageStrategy } from 'vite-plugin-react-pages' export default defineConfig({ plugins: [ react(), - mdx(), pages({ pagesDir: path.join(__dirname, 'pages'), pageStrategy: new DefaultPageStrategy({ diff --git a/packages/create-project/template-lib/docs/package.json b/packages/create-project/template-lib/docs/package.json new file mode 100644 index 00000000..53910b39 --- /dev/null +++ b/packages/create-project/template-lib/docs/package.json @@ -0,0 +1,5 @@ +{ + "name": "docs", + "private": "true", + "type": "module" +} diff --git a/packages/create-project/template-lib/docs/pages/404.tsx b/packages/create-project/template-lib/docs/pages/404.tsx index 46c6620f..84152b8f 100644 --- a/packages/create-project/template-lib/docs/pages/404.tsx +++ b/packages/create-project/template-lib/docs/pages/404.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Redirect } from 'react-router-dom' +import { Navigate } from 'react-router-dom' const Component404 = () => { - return + return } export default Component404 diff --git a/packages/create-project/template-lib/docs/pages/_theme.tsx b/packages/create-project/template-lib/docs/pages/_theme.tsx index 260cd73c..2e57eeac 100644 --- a/packages/create-project/template-lib/docs/pages/_theme.tsx +++ b/packages/create-project/template-lib/docs/pages/_theme.tsx @@ -12,7 +12,7 @@ export default createTheme({ activeIfMatch: { // match all first-level paths path: '/:foo', - exact: true, + end: true, }, }, { diff --git a/packages/create-project/template-lib/docs/pages/md-test1$.md b/packages/create-project/template-lib/docs/pages/md-test1$.md new file mode 100644 index 00000000..52e8da20 --- /dev/null +++ b/packages/create-project/template-lib/docs/pages/md-test1$.md @@ -0,0 +1,162 @@ +# Markdown Test Page1 + +> markdown render test data from: https://github.com/fullpipe/markdown-test-page/blob/master/test-page.md + +# Heading one + +Sint sit cillum pariatur eiusmod nulla pariatur ipsum. Sit laborum anim qui mollit tempor pariatur nisi minim dolor. Aliquip et adipisicing sit sit fugiat commodo id sunt. Nostrud enim ad commodo incididunt cupidatat in ullamco ullamco Lorem cupidatat velit enim et Lorem. Ut laborum cillum laboris fugiat culpa sint irure do reprehenderit culpa occaecat. Exercitation esse mollit tempor magna aliqua in occaecat aliquip veniam reprehenderit nisi dolor in laboris dolore velit. + +## Heading two + +Aute officia nulla deserunt do deserunt cillum velit magna. Officia veniam culpa anim minim dolore labore pariatur voluptate id ad est duis quis velit dolor pariatur enim. Incididunt enim excepteur do veniam consequat culpa do voluptate dolor fugiat ad adipisicing sit. Labore officia est adipisicing dolore proident eiusmod exercitation deserunt ullamco anim do occaecat velit. Elit dolor consectetur proident sunt aliquip est do tempor quis aliqua culpa aute. Duis in tempor exercitation pariatur et adipisicing mollit irure tempor ut enim esse commodo laboris proident. Do excepteur laborum anim esse aliquip eu sit id Lorem incididunt elit irure ea nulla dolor et. Nulla amet fugiat qui minim deserunt enim eu cupidatat aute officia do velit ea reprehenderit. + +### Heading three + +Voluptate cupidatat cillum elit quis ipsum eu voluptate fugiat consectetur enim. Quis ut voluptate culpa ex anim aute consectetur dolore proident voluptate exercitation eiusmod. Esse in do anim magna minim culpa sint. Adipisicing ipsum consectetur proident ullamco magna sit amet aliqua aute fugiat laborum exercitation duis et. + +#### Heading four + +Commodo fugiat aliqua minim quis pariatur mollit id tempor. Non occaecat minim esse enim aliqua adipisicing nostrud duis consequat eu adipisicing qui. Minim aliquip sit excepteur ipsum consequat laborum pariatur excepteur. Veniam fugiat et amet ad elit anim laborum duis mollit occaecat et et ipsum et reprehenderit. Occaecat aliquip dolore adipisicing sint labore occaecat officia fugiat. Quis adipisicing exercitation exercitation eu amet est laboris sunt nostrud ipsum reprehenderit ullamco. Enim sint ut consectetur id anim aute voluptate exercitation mollit dolore magna magna est Lorem. Ut adipisicing adipisicing aliqua ullamco voluptate labore nisi tempor esse magna incididunt. + +##### Heading five + +Veniam enim esse amet veniam deserunt laboris amet enim consequat. Minim nostrud deserunt cillum consectetur commodo eu enim nostrud ullamco occaecat excepteur. Aliquip et ut est commodo enim dolor amet sint excepteur. Amet ad laboris laborum deserunt sint sunt aliqua commodo ex duis deserunt enim est ex labore ut. Duis incididunt velit adipisicing non incididunt adipisicing adipisicing. Ad irure duis nisi tempor eu dolor fugiat magna et consequat tempor eu ex dolore. Mollit esse nisi qui culpa ut nisi ex proident culpa cupidatat cillum culpa occaecat anim. Ut officia sit ea nisi ea excepteur nostrud ipsum et nulla. + +###### Heading six longgggggggggggggggggggggggggggggggggggggggg + +Lorem ipsum dolor sit amet, consectetur adipisicing 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. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + + +[[Top]](#markdown-test-page1) + +# Paragraphs + +Incididunt ex adipisicing ea ullamco consectetur in voluptate proident fugiat tempor deserunt reprehenderit ullamco id dolore laborum. Do laboris laboris minim incididunt qui consectetur exercitation adipisicing dolore et magna consequat magna anim sunt. Officia fugiat Lorem sunt pariatur incididunt Lorem reprehenderit proident irure. Dolore ipsum aliqua mollit ad officia fugiat sit eu aliquip cupidatat ipsum duis laborum laborum fugiat esse. Voluptate anim ex dolore deserunt ea ex eiusmod irure. Occaecat excepteur aliqua exercitation aliquip dolor esse eu eu. + +Officia dolore laborum aute incididunt commodo nisi velit est est elit et dolore elit exercitation. Enim aliquip magna id ipsum aliquip consectetur ad nulla quis. Incididunt pariatur dolor consectetur cillum enim velit cupidatat laborum quis ex. + +Officia irure in non voluptate adipisicing sit amet tempor duis dolore deserunt enim ut. Reprehenderit incididunt in ad anim et deserunt deserunt Lorem laborum quis. Enim aute anim labore proident laboris voluptate elit excepteur in. Ex labore nulla velit officia ullamco Lorem Lorem id do. Dolore ullamco ipsum magna dolor pariatur voluptate ipsum id occaecat ipsum. Dolore tempor quis duis commodo quis quis enim. + +[[Top]](#markdown-test-page1) + +# Blockquotes + +Ad nisi laborum aute cupidatat magna deserunt eu id laboris id. Aliquip nulla cupidatat sint ex Lorem mollit laborum dolor amet est ut esse aute. Nostrud ex consequat id incididunt proident ipsum minim duis aliqua ut ex et ad quis. Laborum sint esse cillum anim nulla cillum consectetur aliqua sit. Nisi excepteur cillum labore amet excepteur commodo enim occaecat consequat ipsum proident exercitation duis id in. + +> Ipsum et cupidatat mollit exercitation enim duis sunt irure aliqua reprehenderit mollit. Pariatur Lorem pariatur laboris do culpa do elit irure. Eiusmod amet nulla voluptate velit culpa et aliqua ad reprehenderit sit ut. + +Labore ea magna Lorem consequat aliquip consectetur cillum duis dolore. Et veniam dolor qui incididunt minim amet laboris sit. Dolore ad esse commodo et dolore amet est velit ut nisi ea. Excepteur ea nulla commodo dolore anim dolore adipisicing eiusmod labore id enim esse quis mollit deserunt est. Minim ea culpa voluptate nostrud commodo proident in duis aliquip minim. + +> Qui est sit et reprehenderit aute est esse enim aliqua id aliquip ea anim. Pariatur sint reprehenderit mollit velit voluptate enim consectetur sint enim. Quis exercitation proident elit non id qui culpa dolore esse aliquip consequat. + +Ipsum excepteur cupidatat sunt minim ad eiusmod tempor sit. + +> Deserunt excepteur adipisicing culpa pariatur cillum laboris ullamco nisi fugiat cillum officia. In cupidatat nulla aliquip tempor ad Lorem Lorem quis voluptate officia consectetur pariatur ex in est duis. Mollit id esse est elit exercitation voluptate nostrud nisi laborum magna dolore dolore tempor in est consectetur. + +Adipisicing voluptate ipsum culpa voluptate id aute laboris labore esse fugiat veniam ullamco occaecat do ut. Tempor et esse reprehenderit veniam proident ipsum irure sit ullamco et labore ea excepteur nulla labore ut. Ex aute minim quis tempor in eu id id irure ea nostrud dolor esse. + +[[Top]](#markdown-test-page1) + +# Lists + +### Ordered List + +1. Longan +2. Lychee +3. Excepteur ad cupidatat do elit laborum amet cillum reprehenderit consequat quis. + Deserunt officia esse aliquip consectetur duis ut labore laborum commodo aliquip aliquip velit pariatur dolore. +4. Marionberry +5. Melon + - Cantaloupe + - Honeydew + - Watermelon +6. Miracle fruit +7. Mulberry + +### Unordered List + +- Olive +- Orange + - Blood orange + - Clementine +- Papaya +- Ut aute ipsum occaecat nisi culpa Lorem id occaecat cupidatat id id magna laboris ad duis. Fugiat cillum dolore veniam nostrud proident sint consectetur eiusmod irure adipisicing. +- Passionfruit + +[[Top]](#markdown-test-page1) + +# Horizontal rule + +In dolore velit aliquip labore mollit minim tempor veniam eu veniam ad in sint aliquip mollit mollit. Ex occaecat non deserunt elit laborum sunt tempor sint consequat culpa culpa qui sit. Irure ad commodo eu voluptate mollit cillum cupidatat veniam proident amet minim reprehenderit. + +*** + +In laboris eiusmod reprehenderit aliquip sit proident occaecat. Non sit labore anim elit veniam Lorem minim commodo eiusmod irure do minim nisi. Dolor amet cillum excepteur consequat sint non sint. + +[[Top]](#markdown-test-page1) + +# Table + +Duis sunt ut pariatur reprehenderit mollit mollit magna dolore in pariatur nulla commodo sit dolor ad fugiat. Laboris amet ea occaecat duis eu enim exercitation deserunt ea laborum occaecat reprehenderit. Et incididunt dolor commodo consequat mollit nisi proident non pariatur in et incididunt id. Eu ut et Lorem ea ex magna minim ipsum ipsum do. + +| Table Heading 1 | Table Heading 2 | Center align | Right align | Table Heading 5 | +| :-------------- | :-------------- | :-------------: | --------------: | :-------------- | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | +| Item 1 | Item 2 | Item 3 | Item 4 | Item 5 | + +Minim id consequat adipisicing cupidatat laborum culpa veniam non consectetur et duis pariatur reprehenderit eu ex consectetur. Sunt nisi qui eiusmod ut cillum laborum Lorem officia aliquip laboris ullamco nostrud laboris non irure laboris. Cillum dolore labore Lorem deserunt mollit voluptate esse incididunt ex dolor. + +[[Top]](#markdown-test-page1) + +# Code + +## Inline code + +Ad amet irure est magna id mollit Lorem in do duis enim. Excepteur velit nisi magna ea pariatur pariatur ullamco fugiat deserunt sint non sint. Duis duis est `code in text` velit velit aute culpa ex quis pariatur pariatur laborum aute pariatur duis tempor sunt ad. Irure magna voluptate dolore consectetur consectetur irure esse. Anim magna `in culpa qui officia` dolor eiusmod esse amet aute cupidatat aliqua do id voluptate cupidatat reprehenderit amet labore deserunt. + +## Highlighted + +Et fugiat ad nisi amet magna labore do cillum fugiat occaecat cillum Lorem proident. In sint dolor ullamco ad do adipisicing amet id excepteur Lorem aliquip sit irure veniam laborum duis cillum. Aliqua occaecat minim cillum deserunt magna sunt laboris do do irure ea nostrud consequat ut voluptate ex. + +```go +package main + +import ( + "fmt" + "net/http" +) + +func handler(w http.ResponseWriter, r *http.Request) { + fmt.Fprintf(w, "Hi there, I love %s!", r.URL.Path[1:]) +} + +func main() { + http.HandleFunc("/", handler) + http.ListenAndServe(":8080", nil) +} +``` + +Ex amet id ex aliquip id do laborum excepteur exercitation elit sint commodo occaecat nostrud est. Nostrud pariatur esse veniam laborum non sint magna sit laboris minim in id. Aliqua pariatur pariatur excepteur adipisicing irure culpa consequat commodo et ex id ad. + +[[Top]](#markdown-test-page1) + +# Inline elements + +Sint ea anim ipsum ad commodo cupidatat do **exercitation** incididunt et minim ad labore sunt. Minim deserunt labore laboris velit nulla incididunt ipsum nulla. Ullamco ad laborum ea qui et anim in laboris exercitation tempor sit officia laborum reprehenderit culpa velit quis. **Consequat commodo** reprehenderit duis [irure](#!) esse esse exercitation minim enim Lorem dolore duis irure. Nisi Lorem reprehenderit ea amet excepteur dolor excepteur magna labore proident voluptate ipsum. Reprehenderit ex esse deserunt aliqua ea officia mollit Lorem nulla magna enim. Et ad ipsum labore enim ipsum **cupidatat consequat**. Commodo non ea cupidatat magna deserunt dolore ipsum velit nulla elit veniam nulla eiusmod proident officia. + +![Super wide](http://placekitten.com/1280/800) + +*Proident sit veniam in est proident officia adipisicing* ea tempor cillum non cillum velit deserunt. Voluptate laborum incididunt sit consectetur Lorem irure incididunt voluptate nostrud. Commodo ut eiusmod tempor cupidatat esse enim minim ex anim consequat. Mollit sint culpa qui laboris quis consectetur ad sint esse. Amet anim anim minim ullamco et duis non irure. Sit tempor adipisicing ea laboris `culpa ex duis sint` anim aute reprehenderit id eu ea. Aute [excepteur proident](#!) Lorem minim adipisicing nostrud mollit ad ut voluptate do nulla esse occaecat aliqua sint anim. + +![Not so big](http://placekitten.com/480/400) + +Incididunt in culpa cupidatat mollit cillum qui proident sit. In cillum aliquip incididunt voluptate magna amet cupidatat cillum pariatur sint aliqua est _enim **anim** voluptate_. Magna aliquip proident incididunt id duis pariatur eiusmod incididunt commodo culpa dolore sit. Culpa do nostrud elit ad exercitation anim pariatur non minim nisi **adipisicing sunt _officia_**. Do deserunt magna mollit Lorem commodo ipsum do cupidatat mollit enim ut elit veniam ea voluptate. + +[![Manny Pacquiao](https://img.youtube.com/vi/s6bCmZmy9aQ/0.jpg)](https://youtu.be/s6bCmZmy9aQ) + +Reprehenderit non eu quis in ad elit esse qui aute id [incididunt](#!) dolore cillum. Esse laboris consequat dolor anim exercitation tempor aliqua deserunt velit magna laboris. Culpa culpa minim duis amet mollit do quis amet commodo nulla irure. + +[[Top]](#markdown-test-page1) diff --git a/packages/create-project/template-lib/docs/vite.config.ts b/packages/create-project/template-lib/docs/vite.config.ts index 89049587..33ac7484 100644 --- a/packages/create-project/template-lib/docs/vite.config.ts +++ b/packages/create-project/template-lib/docs/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vite' import * as path from 'path' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages, { DefaultPageStrategy } from 'vite-plugin-react-pages' export default defineConfig({ plugins: [ react(), - mdx(), pages({ pagesDir: path.join(__dirname, 'pages'), pageStrategy: new DefaultPageStrategy({ diff --git a/packages/create-project/template-lib/package.json b/packages/create-project/template-lib/package.json index 78df0fb0..ea590241 100644 --- a/packages/create-project/template-lib/package.json +++ b/packages/create-project/template-lib/package.json @@ -10,23 +10,20 @@ "build-lib": "vite build" }, "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@mdx-js/mdx": "^1.6.22", - "@mdx-js/react": "^1.6.22", - "@rollup/plugin-typescript": "^8.5.0", - "@types/node": "^17.0.42", - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", + "@mdx-js/react": "^2.2.1", + "@rollup/plugin-typescript": "^10.0.1", + "@types/node": "^18.11.16", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", - "vite-pages-theme-doc": "^3.1.4", - "vite-plugin-mdx": "^3.5.11", - "vite-plugin-react-pages": "^3.1.8" + "serve": "^14.1.2", + "vite": "^4.0.1", + "vite-pages-theme-doc": "^4.0.0-alpha.1", + "vite-plugin-react-pages": "^4.0.0-alpha.2" } } diff --git a/packages/create-project/template-lib/src/Card/README.md b/packages/create-project/template-lib/src/Card/README.md index 4b55321a..c04c02e6 100644 --- a/packages/create-project/template-lib/src/Card/README.md +++ b/packages/create-project/template-lib/src/Card/README.md @@ -9,7 +9,7 @@ This is a **markdown** document of the `Card` component. You can put this page in a subGroup of the side menu using `staticData.subGroup`. -## demos +## Demos You can import demos like this: diff --git a/packages/playground/basic/package.json b/packages/playground/basic/package.json index 0093dcd1..7bd9586d 100644 --- a/packages/playground/basic/package.json +++ b/packages/playground/basic/package.json @@ -12,19 +12,18 @@ "debug:ssr": "rimraf dist && node --inspect-brk ./node_modules/vite-plugin-react-pages/bin/vite-pages.js ssr" }, "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@mdx-js/mdx": "^1.6.22", - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", + "@mdx-js/mdx": "^2.2.1", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", - "vite-plugin-mdx": "^3.5.11", + "sass": "^1.57.0", + "serve": "^14.1.2", + "vite": "^4.0.1", "vite-plugin-react-pages": "workspace:*" } } diff --git a/packages/playground/basic/pages/dir/page3$.md b/packages/playground/basic/pages/dir/page3$.md index eeee3a98..efca7dd3 100644 --- a/packages/playground/basic/pages/dir/page3$.md +++ b/packages/playground/basic/pages/dir/page3$.md @@ -232,7 +232,7 @@ easy to include example HTML source code using Markdown -- just paste it and indent it, and Markdown will handle the hassle of encoding the ampersands and angle brackets. For example, this: -
+
© 2004 Foo Corporation
diff --git a/packages/playground/basic/vite.config.ts b/packages/playground/basic/vite.config.ts index 6c66136e..8d33db5a 100644 --- a/packages/playground/basic/vite.config.ts +++ b/packages/playground/basic/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vite' import * as path from 'path' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages from 'vite-plugin-react-pages' module.exports = defineConfig({ plugins: [ react(), - mdx(), pages({ pagesDir: path.join(__dirname, 'pages'), }), diff --git a/packages/playground/custom-find-pages/package.json b/packages/playground/custom-find-pages/package.json index 39568fbe..3e8b76b4 100644 --- a/packages/playground/custom-find-pages/package.json +++ b/packages/playground/custom-find-pages/package.json @@ -15,19 +15,17 @@ "author": "", "license": "ISC", "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", - "vite-pages-theme-basic": "workspace:*", - "vite-plugin-mdx": "^3.5.11", + "serve": "^14.1.2", + "vite": "^4.0.1", + "vite-pages-theme-doc": "workspace:*", "vite-plugin-react-pages": "workspace:*" } } diff --git a/packages/playground/custom-find-pages/pages/404$.tsx b/packages/playground/custom-find-pages/pages/404$.tsx index 25b3379b..4ebf09c6 100644 --- a/packages/playground/custom-find-pages/pages/404$.tsx +++ b/packages/playground/custom-find-pages/pages/404$.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Redirect } from 'react-router-dom' +import { Navigate } from 'react-router-dom' const Page404 = () => { - return + return } export default Page404 diff --git a/packages/playground/custom-find-pages/pages/_theme.tsx b/packages/playground/custom-find-pages/pages/_theme.tsx index 7dcd9634..f8183d37 100644 --- a/packages/playground/custom-find-pages/pages/_theme.tsx +++ b/packages/playground/custom-find-pages/pages/_theme.tsx @@ -1,11 +1,11 @@ -import { createTheme } from 'vite-pages-theme-basic' +import { createTheme } from 'vite-pages-theme-doc' export default createTheme({ topNavs: [ - { text: 'index', path: '/' }, - { text: 'Vite', href: 'https://github.com/vitejs/vite' }, + { label: 'index', path: '/' }, + { label: 'Vite', href: 'https://github.com/vitejs/vite' }, { - text: 'Vite Pages', + label: 'Vite Pages', href: 'https://github.com/vitejs/vite-plugin-react-pages', }, ], diff --git a/packages/playground/custom-find-pages/vite.config.ts b/packages/playground/custom-find-pages/vite.config.ts index 401898a9..b754e39b 100644 --- a/packages/playground/custom-find-pages/vite.config.ts +++ b/packages/playground/custom-find-pages/vite.config.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vite' import * as path from 'path' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages, { DefaultPageStrategy } from 'vite-plugin-react-pages' export default defineConfig({ plugins: [ react(), - mdx(), pages({ pagesDir: path.join(__dirname, 'pages'), pageStrategy: new DefaultPageStrategy({ diff --git a/packages/playground/custom-find-pages2/package.json b/packages/playground/custom-find-pages2/package.json index 279b5c00..635e7851 100644 --- a/packages/playground/custom-find-pages2/package.json +++ b/packages/playground/custom-find-pages2/package.json @@ -15,19 +15,17 @@ "author": "", "license": "ISC", "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", - "vite-pages-theme-basic": "workspace:*", - "vite-plugin-mdx": "^3.5.11", + "serve": "^14.1.2", + "vite": "^4.0.1", + "vite-pages-theme-doc": "workspace:*", "vite-plugin-react-pages": "workspace:*" } } diff --git a/packages/playground/custom-find-pages2/pages/404.tsx b/packages/playground/custom-find-pages2/pages/404.tsx index 25b3379b..4ebf09c6 100644 --- a/packages/playground/custom-find-pages2/pages/404.tsx +++ b/packages/playground/custom-find-pages2/pages/404.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Redirect } from 'react-router-dom' +import { Navigate } from 'react-router-dom' const Page404 = () => { - return + return } export default Page404 diff --git a/packages/playground/custom-find-pages2/pages/_theme.tsx b/packages/playground/custom-find-pages2/pages/_theme.tsx index 7dcd9634..b7c14abe 100644 --- a/packages/playground/custom-find-pages2/pages/_theme.tsx +++ b/packages/playground/custom-find-pages2/pages/_theme.tsx @@ -1,11 +1,12 @@ -import { createTheme } from 'vite-pages-theme-basic' +import { createTheme } from 'vite-pages-theme-doc' export default createTheme({ topNavs: [ - { text: 'index', path: '/' }, - { text: 'Vite', href: 'https://github.com/vitejs/vite' }, + { label: 'index', path: '/' }, + { label: 'sub-path', path: '/sub-path', activeIfMatch: '/sub-path' }, + { label: 'Vite', href: 'https://github.com/vitejs/vite' }, { - text: 'Vite Pages', + label: 'Vite Pages', href: 'https://github.com/vitejs/vite-plugin-react-pages', }, ], diff --git a/packages/playground/custom-find-pages2/pages/vite.config.ts b/packages/playground/custom-find-pages2/pages/vite.config.ts index 7b55416b..1f17e5f6 100644 --- a/packages/playground/custom-find-pages2/pages/vite.config.ts +++ b/packages/playground/custom-find-pages2/pages/vite.config.ts @@ -1,7 +1,6 @@ import { defineConfig } from 'vite' import * as path from 'path' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages, { PageStrategy, FileHandler, @@ -12,7 +11,6 @@ import pages, { export default defineConfig({ plugins: [ react(), - mdx(), pages({ pagesDir: __dirname, // custom pageStrategy diff --git a/packages/playground/lib-monorepo/packages/button/package.json b/packages/playground/lib-monorepo/packages/button/package.json index 2754246d..1c8b894a 100644 --- a/packages/playground/lib-monorepo/packages/button/package.json +++ b/packages/playground/lib-monorepo/packages/button/package.json @@ -9,9 +9,9 @@ "author": "", "license": "ISC", "devDependencies": { - "@types/react": "^17.0.3", - "react": "^17.0.1", + "@types/react": "^18.0.26", + "react": "^18.2.0", "rimraf": "^3.0.2", - "typescript": "^4.8.3" + "typescript": "^4.9.4" } } diff --git a/packages/playground/lib-monorepo/packages/card/package.json b/packages/playground/lib-monorepo/packages/card/package.json index 37f8d451..14210a35 100644 --- a/packages/playground/lib-monorepo/packages/card/package.json +++ b/packages/playground/lib-monorepo/packages/card/package.json @@ -9,9 +9,9 @@ "author": "", "license": "ISC", "devDependencies": { - "@types/react": "^17.0.3", - "react": "^17.0.1", + "@types/react": "^18.0.26", + "react": "^18.2.0", "rimraf": "^3.0.2", - "typescript": "^4.8.3" + "typescript": "^4.9.4" } } diff --git a/packages/playground/lib-monorepo/packages/demos/package.json b/packages/playground/lib-monorepo/packages/demos/package.json index ef8fbfdc..e0a1a488 100644 --- a/packages/playground/lib-monorepo/packages/demos/package.json +++ b/packages/playground/lib-monorepo/packages/demos/package.json @@ -11,22 +11,20 @@ "author": "", "license": "ISC", "dependencies": { - "react": "^17.0.1", - "react-dom": "^17.0.1", - "react-router-dom": "^5.2.0" + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-router-dom": "^6.5.0" }, "devDependencies": { - "@types/react": "^17.0.3", - "@types/react-router-dom": "^5.1.7", - "@vitejs/plugin-react": "^2.1.0", - "globby": "^11.0.2", + "@types/react": "^18.0.26", + "@vitejs/plugin-react": "^3.0.0", + "globby": "^13.1.3", "playground-button": "*", "playground-card": "*", "rimraf": "^3.0.2", - "serve": "^14.0.1", - "vite": "^3.1.0", - "vite-pages-theme-basic": "workspace:*", - "vite-plugin-mdx": "^3.5.11", + "serve": "^14.1.2", + "vite": "^4.0.1", + "vite-pages-theme-doc": "workspace:*", "vite-plugin-react-pages": "workspace:*" } } diff --git a/packages/playground/lib-monorepo/packages/demos/pages/404$.tsx b/packages/playground/lib-monorepo/packages/demos/pages/404$.tsx index 25b3379b..4ebf09c6 100644 --- a/packages/playground/lib-monorepo/packages/demos/pages/404$.tsx +++ b/packages/playground/lib-monorepo/packages/demos/pages/404$.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { Redirect } from 'react-router-dom' +import { Navigate } from 'react-router-dom' const Page404 = () => { - return + return } export default Page404 diff --git a/packages/playground/lib-monorepo/packages/demos/pages/_theme.tsx b/packages/playground/lib-monorepo/packages/demos/pages/_theme.tsx index 7dcd9634..f8183d37 100644 --- a/packages/playground/lib-monorepo/packages/demos/pages/_theme.tsx +++ b/packages/playground/lib-monorepo/packages/demos/pages/_theme.tsx @@ -1,11 +1,11 @@ -import { createTheme } from 'vite-pages-theme-basic' +import { createTheme } from 'vite-pages-theme-doc' export default createTheme({ topNavs: [ - { text: 'index', path: '/' }, - { text: 'Vite', href: 'https://github.com/vitejs/vite' }, + { label: 'index', path: '/' }, + { label: 'Vite', href: 'https://github.com/vitejs/vite' }, { - text: 'Vite Pages', + label: 'Vite Pages', href: 'https://github.com/vitejs/vite-plugin-react-pages', }, ], diff --git a/packages/playground/lib-monorepo/packages/demos/vite.demos.ts b/packages/playground/lib-monorepo/packages/demos/vite.demos.ts index f25db183..e48ec955 100644 --- a/packages/playground/lib-monorepo/packages/demos/vite.demos.ts +++ b/packages/playground/lib-monorepo/packages/demos/vite.demos.ts @@ -1,13 +1,11 @@ import { defineConfig } from 'vite' import * as path from 'path' import react from '@vitejs/plugin-react' -import mdx from 'vite-plugin-mdx' import pages, { DefaultPageStrategy } from 'vite-plugin-react-pages' export default defineConfig({ plugins: [ react(), - mdx(), pages({ pagesDir: path.join(__dirname, 'pages'), pageStrategy: new DefaultPageStrategy({ diff --git a/packages/playground/use-theme-doc/__tests__/navigate-tests.ts b/packages/playground/use-theme-doc/__tests__/navigate-tests.ts index c44eb244..93a2d97b 100644 --- a/packages/playground/use-theme-doc/__tests__/navigate-tests.ts +++ b/packages/playground/use-theme-doc/__tests__/navigate-tests.ts @@ -1,4 +1,4 @@ -import { test as baseTest, expect, type Page } from '~utils' +import { test as baseTest, expect, type Page, assertContainText } from '~utils' import { userPages } from './snapshots' // reuse test declaration @@ -16,7 +16,7 @@ export function declareTests({ test('index page', async ({ page }) => { await testIndexPageSider(page) await testHeader(page) - await expect(page.locator('.vp-local-content')).toContainText([ + await assertContainText(page.locator('.vp-local-content'), [ 'Index page', 'Jump to page1', ]) @@ -27,17 +27,13 @@ export function declareTests({ await page.waitForURL('/page1') await testIndexPageSider(page) await testHeader(page) - await expect(page.locator('.vp-local-content')).toContainText( - 'This is page1.' - ) + await assertContainText(page.locator('.vp-local-content'), 'This is page1.') await page.locator('.vp-local-sider >> text="page2 title"').click() await page.waitForURL('/page2') await testIndexPageSider(page) await testHeader(page) - await expect(page.locator('.vp-local-content')).toContainText( - 'This is page2.' - ) + await assertContainText(page.locator('.vp-local-content'), 'This is page2.') await page.locator('.vp-local-header >> text="Users"').click() await page.waitForURL('/users') @@ -56,7 +52,8 @@ export function declareTests({ page.waitForNavigation(), page.locator('.vp-local-content a').nth(i).click(), ]) - await expect(page.locator('.vp-local-content')).toContainText( + await assertContainText( + page.locator('.vp-local-content'), userPages[i].split('\n') ) i++ @@ -88,16 +85,14 @@ export function declareTests({ await page.waitForURL('/zh/page2') testIndexPageSider(page, { currentLocale: '中文' }) await testHeader(page, { currentLocale: '中文' }) - await expect(page.locator('.vp-local-content')).toContainText( - '这是页面 2。' - ) + await assertContainText(page.locator('.vp-local-content'), '这是页面 2。') await page.locator('.vp-local-content >> text="前往页面 1"').click() await page.waitForURL('/zh/page1') testIndexPageSider(page, { currentLocale: '中文' }) await testHeader(page, { currentLocale: '中文' }) - await expect(page.locator('.vp-local-content')).toContainText('这是页面1。') + await assertContainText(page.locator('.vp-local-content'), '这是页面1。') // switch locale if (javaScriptEnabled) { @@ -112,9 +107,7 @@ export function declareTests({ await page.waitForURL('/page1') testIndexPageSider(page, { currentLocale: 'English' }) await testHeader(page, { currentLocale: 'English' }) - await expect(page.locator('.vp-local-content')).toContainText( - 'This is page1.' - ) + await assertContainText(page.locator('.vp-local-content'), 'This is page1.') await page.locator('.vp-local-header >> text="Guide"').click() @@ -141,7 +134,7 @@ export function declareTests({ { currentLocale = 'English' }: { currentLocale?: 'English' | '中文' } = {} ) { if (currentLocale === 'English') { - await expect(page.locator('.vp-local-sider')).toContainText([ + await assertContainText(page.locator('.vp-local-sider'), [ 'index page title', 'resources', 'sub-group', @@ -149,7 +142,7 @@ export function declareTests({ 'page2 title', ]) } else { - await expect(page.locator('.vp-local-sider')).toContainText([ + await assertContainText(page.locator('.vp-local-sider'), [ '首页标题', '资源', '小分组', @@ -164,14 +157,14 @@ export function declareTests({ { currentLocale = 'English' }: { currentLocale?: 'English' | '中文' } = {} ) { if (currentLocale === 'English') { - await expect(page.locator('.vp-local-header')).toContainText([ + await assertContainText(page.locator('.vp-local-header'), [ 'Vite Pages', 'Guide', 'Links', 'Extra', ]) } else { - await expect(page.locator('.vp-local-header')).toContainText([ + await assertContainText(page.locator('.vp-local-header'), [ 'Vite Pages', '首页', '组件', @@ -183,7 +176,9 @@ export function declareTests({ // locale selector await expect( page.locator('.vp-local-header .vp-local-localeSelectorCtn') - ).toHaveText(currentLocale) + // antd 5.x injects inline