chore: dumi 1.x -> 2.x (#391)

kiner-tang · web-flow · commit d14633b21470 · 2023-02-20T16:11:58.000+08:00
* chore: dumi 1.x -&gt; 2.x

* chore: update dep
diff --git a/.dumirc.ts b/.dumirc.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from 'dumi';
+import path from 'path';
+
+export default defineConfig({
+  alias: {
+    'rc-cascader$': path.resolve('src'),
+    'rc-cascader/es': path.resolve('src'),
+  },
+  favicons: ['https://avatars0.githubusercontent.com/u/9441414?s=200&v=4'],
+  themeConfig: {
+    name: 'Cascader',
+    logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4',
+  },
+});
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,7 @@ coverage
 .umi-test
 .env.local
 .doc
+
+# dumi
+.dumi/tmp
+.dumi/tmp-production
diff --git a/.umirc.gh.ts b/.umirc.gh.ts
diff --git a/.umirc.ts b/.umirc.ts
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -0,0 +1 @@
+<embed src="../CHANGELOG.md"></embed>
diff --git a/docs/demo/adjust-overflow.md b/docs/demo/adjust-overflow.md
@@ -1,3 +1,8 @@
-## adjust-overflow
+---
+title: adjust-overflow
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/adjust-overflow.jsx">
+<code src="../../examples/adjust-overflow.tsx"></code>
diff --git a/docs/demo/animation.md b/docs/demo/animation.md
@@ -1,3 +1,8 @@
-## animation
+---
+title: animation
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/animation.jsx">
+<code src="../../examples/animation.tsx"></code>
diff --git a/docs/demo/change-on-select.md b/docs/demo/change-on-select.md
@@ -1,3 +1,8 @@
-## change-on-select
+---
+title: change-on-select
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/change-on-select.jsx">
+<code src="../../examples/change-on-select.tsx"></code>
diff --git a/docs/demo/custom-arrow-icon.md b/docs/demo/custom-arrow-icon.md
@@ -1,3 +1,8 @@
-## custom-arrow-icon
+---
+title: custom-arrow-icon
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/custom-arrow-icon.jsx">
+<code src="../../examples/custom-arrow-icon.tsx"></code>
diff --git a/docs/demo/custom-field-name.md b/docs/demo/custom-field-name.md
@@ -1,3 +1,8 @@
-## custom-field-name
+---
+title: custom-field-name
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/custom-field-name.jsx">
+<code src="../../examples/custom-field-name.tsx"></code>
diff --git a/docs/demo/debug.md b/docs/demo/debug.md
@@ -1,3 +1,8 @@
-## debug
+---
+title: debug
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/debug.tsx">
+<code src="../../examples/debug.tsx"></code>
diff --git a/docs/demo/default-expand-single-option.md b/docs/demo/default-expand-single-option.md
@@ -1,3 +1,8 @@
-## default-expand-single-option
+---
+title: default-expand-single-option
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/default-expand-single-option.jsx">
+<code src="../../examples/default-expand-single-option.tsx"></code>
diff --git a/docs/demo/defaultValue.md b/docs/demo/defaultValue.md
@@ -1,3 +1,8 @@
-## defaultValue
+---
+title: defaultValue
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/defaultValue.jsx">
+<code src="../../examples/defaultValue.tsx"></code>
diff --git a/docs/demo/disabled.md b/docs/demo/disabled.md
@@ -1,3 +1,8 @@
-## disabled
+---
+title: disabled
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/disabled.jsx">
+<code src="../../examples/disabled.tsx"></code>
diff --git a/docs/demo/dropdown-render.md b/docs/demo/dropdown-render.md
@@ -1,3 +1,8 @@
-## dropdown-render
+---
+title: dropdown-render
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/dropdown-render.jsx">
+<code src="../../examples/dropdown-render.tsx"></code>
diff --git a/docs/demo/dynamic-options.md b/docs/demo/dynamic-options.md
@@ -1,3 +1,8 @@
-## dynamic-options
+---
+title: dynamic-options
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/dynamic-options.jsx">
+<code src="../../examples/dynamic-options.tsx"></code>
diff --git a/docs/demo/hover.md b/docs/demo/hover.md
@@ -1,3 +1,8 @@
-## hover
+---
+title: hover
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/hover.jsx">
+<code src="../../examples/hover.tsx"></code>
diff --git a/docs/demo/multiple.md b/docs/demo/multiple.md
@@ -1,3 +1,8 @@
-## multiple
+---
+title: multiple
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/multiple.tsx">
+<code src="../../examples/multiple.tsx"></code>
diff --git a/docs/demo/rc-form.md b/docs/demo/rc-form.md
@@ -1,3 +1,8 @@
-## rc-form
+---
+title: rc-form
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/rc-form.jsx">
+<code src="../../examples/rc-form.tsx"></code>
diff --git a/docs/demo/simple.md b/docs/demo/simple.md
@@ -1,3 +1,8 @@
-## simple
+---
+title: animated
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/simple.jsx">
+<code src="../../examples/simple.tsx"></code>
diff --git a/docs/demo/text-trigger.md b/docs/demo/text-trigger.md
@@ -1,3 +1,8 @@
-## text-trigger
+---
+title: text-trigger
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/text-trigger.jsx">
+<code src="../../examples/text-trigger.tsx">
diff --git a/docs/demo/value.md b/docs/demo/value.md
@@ -1,3 +1,8 @@
-## value
+---
+title: value
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/value.jsx">
+<code src="../../examples/value.tsx"></code>
diff --git a/docs/demo/visible.md b/docs/demo/visible.md
@@ -1,3 +1,8 @@
-## visible
+---
+title: visible
+nav:
+  title: Demo
+  path: /demo
+---
 
-<code src="../../examples/visible.jsx">
+<code src="../../examples/visible.tsx"></code>
diff --git a/docs/index.md b/docs/index.md
@@ -1,5 +1,7 @@
 ---
-title: rc-cascader
+hero:
+  title: rc-cascader
+  description: React cascader Component
 ---
 
 <embed src="../README.md"></embed>
diff --git a/examples/adjust-overflow.tsx b/examples/adjust-overflow.tsx
@@ -1,4 +1,5 @@
 /* eslint-disable no-console, react/prop-types */
+import type { BuildInPlacements } from 'rc-trigger/lib/interface';
 import React from 'react';
 import '../assets/index.less';
 import Cascader from '../src';
@@ -57,7 +58,7 @@ const addressOptions = [
   },
 ];
 
-class MyCascader extends React.Component {
+class MyCascader extends React.Component<{ builtinPlacements?: BuildInPlacements }> {
   state = {
     inputValue: '',
   };
diff --git a/examples/animation.tsx b/examples/animation.tsx
diff --git a/examples/change-on-select.tsx b/examples/change-on-select.tsx
diff --git a/examples/custom-arrow-icon.tsx b/examples/custom-arrow-icon.tsx
diff --git a/examples/custom-field-name.tsx b/examples/custom-field-name.tsx
diff --git a/examples/default-expand-single-option.tsx b/examples/default-expand-single-option.tsx
diff --git a/examples/defaultValue.tsx b/examples/defaultValue.tsx
diff --git a/examples/disabled.tsx b/examples/disabled.tsx
diff --git a/examples/dropdown-render.tsx b/examples/dropdown-render.tsx
diff --git a/examples/dynamic-options.tsx b/examples/dynamic-options.tsx
diff --git a/examples/hover.tsx b/examples/hover.tsx
diff --git a/examples/rc-form.tsx b/examples/rc-form.tsx
@@ -1,8 +1,8 @@
 /* eslint-disable no-console, react/no-multi-comp, react/prop-types, react/button-has-type,prefer-destructuring,max-len, max-classes-per-file */
-import React, { Component } from 'react';
+import arrayTreeFilter from 'array-tree-filter';
 import { createForm } from 'rc-form';
+import { Component } from 'react';
 import '../assets/index.less';
-import arrayTreeFilter from 'array-tree-filter';
 import Cascader from '../src';
 
 const addressOptions = [
@@ -59,7 +59,7 @@ const addressOptions = [
 ];
 
 class CascaderInput extends Component {
-  onChange = (value) => {
+  onChange = value => {
     const props = this.props;
     if (props.onChange) {
       props.onChange(value);
@@ -70,7 +70,7 @@ class CascaderInput extends Component {
     const props = this.props;
     const value = props.value || [];
     return arrayTreeFilter(props.options, (o, level) => o.value === value[level])
-      .map((o) => o.label)
+      .map(o => o.label)
       .join(', ');
   }
 
@@ -85,7 +85,7 @@ class CascaderInput extends Component {
 }
 
 class Form extends Component {
-  onSubmit = (e) => {
+  onSubmit = e => {
     const props = this.props;
     const { form } = props;
     e.preventDefault();
diff --git a/examples/simple.tsx b/examples/simple.tsx
diff --git a/examples/text-trigger.tsx b/examples/text-trigger.tsx
diff --git a/examples/value.tsx b/examples/value.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable no-console,react/button-has-type */
-import React from 'react';
 import arrayTreeFilter from 'array-tree-filter';
+import React from 'react';
 import '../assets/index.less';
 import Cascader from '../src';
 
diff --git a/examples/visible.tsx b/examples/visible.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
-import React from 'react';
 import arrayTreeFilter from 'array-tree-filter';
+import React from 'react';
 import '../assets/index.less';
 import Cascader from '../src';
 
diff --git a/now.json b/now.json
@@ -5,7 +5,7 @@
     {
       "src": "package.json",
       "use": "@now/static-build",
-      "config": { "distDir": ".doc" }
+      "config": { "distDir": "dist" }
     }
   ],
   "routes": [
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/warning": "^3.0.0",
     "cross-env": "^7.0.0",
-    "dumi": "^1.1.12",
+    "dumi": "^2.1.10",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.0.2",
     "enzyme-to-json": "^3.2.1",
@@ -61,7 +61,8 @@
     "rc-trigger": "^5.0.4",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
-    "typescript": "^4.4.2"
+    "typescript": "^4.4.2",
+    "less": "^3.13.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
diff --git a/src/Cascader.tsx b/src/Cascader.tsx
@@ -3,6 +3,7 @@ import { BaseSelect } from 'rc-select';
 import type { DisplayValueType, Placement } from 'rc-select/lib/BaseSelect';
 import useId from 'rc-select/lib/hooks/useId';
 import { conductCheck } from 'rc-tree/lib/utils/conductUtil';
+import type { BuildInPlacements } from 'rc-trigger/lib/interface';
 import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import * as React from 'react';
 import CascaderContext from './context';
@@ -100,6 +101,7 @@ interface BaseCascaderProps<OptionType extends BaseOptionType = DefaultOptionTyp
   /** @deprecated Use `placement` instead */
   popupPlacement?: Placement;
   placement?: Placement;
+  builtinPlacements?: BuildInPlacements;
 
   /** @deprecated Use `onDropdownVisibleChange` instead */
   onPopupVisibleChange?: (open: boolean) => void;
diff --git a/tests/demoOptions.ts b/tests/demoOptions.ts
@@ -1,4 +1,6 @@
-export const optionsForActiveMenuItems = [
+import type { DefaultOptionType } from '@/Cascader';
+
+export const optionsForActiveMenuItems: DefaultOptionType[] = [
   {
     value: '1',
     label: '1',
@@ -33,7 +35,7 @@ export const optionsForActiveMenuItems = [
   },
 ];
 
-export const addressOptions = [
+export const addressOptions: DefaultOptionType[] = [
   {
     label: '福建',
     value: 'fj',
diff --git a/tests/keyboard.spec.tsx b/tests/keyboard.spec.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import { mount } from 'enzyme';
 import KeyCode from 'rc-util/lib/KeyCode';
 import Cascader from '../src';
