Update zent to 9.0.0-beta.24 (#26)

zent-contrib · Dec 10, 2020 · 4bb2bce · 4bb2bce
1 parent af3cada
commit 4bb2bce
Show file tree

Hide file tree

Showing 29 changed files with 436 additions and 209 deletions.
diff --git a/packages/zent-compat/__tests__/cascader.js b/packages/zent-compat/__tests__/cascader.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Simulate } from 'react-dom/test-utils';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import Cascader from 'cascader';
 
 Enzyme.configure({ adapter: new Adapter() });

diff --git a/packages/zent-compat/__tests__/date-range-quick-picker.js b/packages/zent-compat/__tests__/date-range-quick-picker.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import DateRangeQuickPicker from 'date-range-quick-picker';
 
 Enzyme.configure({ adapter: new Adapter() });

diff --git a/packages/zent-compat/__tests__/datetimepicker/DatePicker.js b/packages/zent-compat/__tests__/datetimepicker/DatePicker.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import formatDate from 'zent/es/utils/date/formatDate';
 import DatePicker from 'datetimepicker/DatePicker';

diff --git a/packages/zent-compat/__tests__/datetimepicker/DateRangePicker.js b/packages/zent-compat/__tests__/datetimepicker/DateRangePicker.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import DateRangePicker from 'datetimepicker/DateRangePicker';
 import isArray from 'lodash/isArray';

diff --git a/packages/zent-compat/__tests__/datetimepicker/MonthPicker.js b/packages/zent-compat/__tests__/datetimepicker/MonthPicker.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import MonthPicker from 'datetimepicker/MonthPicker';
 import formatDate from 'zent/es/utils/date/formatDate';

diff --git a/packages/zent-compat/__tests__/form/CreateForm-Field.js b/packages/zent-compat/__tests__/form/CreateForm-Field.js
@@ -5,7 +5,7 @@ import noop from 'lodash/noop';
 import omit from 'lodash/omit';
 import PropTypes from 'prop-types';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import ZentForm from 'form';
 
 Enzyme.configure({ adapter: new Adapter() });

diff --git a/packages/zent-compat/__tests__/form/CreateForm-FieldArray.js b/packages/zent-compat/__tests__/form/CreateForm-FieldArray.js
@@ -2,7 +2,7 @@
 
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import ZentForm from 'form';
 
 Enzyme.configure({ adapter: new Adapter() });

diff --git a/packages/zent-compat/__tests__/form/CreateForm-Fieldset.js b/packages/zent-compat/__tests__/form/CreateForm-Fieldset.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import omit from 'lodash/omit';
 import ZentForm from 'form';
 

diff --git a/packages/zent-compat/__tests__/form/CreateForm-FormSection.js b/packages/zent-compat/__tests__/form/CreateForm-FormSection.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
 import ZentForm from 'form';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 Enzyme.configure({ adapter: new Adapter() });
 

diff --git a/packages/zent-compat/__tests__/form/CreateForm-HandleSubmit.js b/packages/zent-compat/__tests__/form/CreateForm-HandleSubmit.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
 import ZentForm from 'form';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 Enzyme.configure({ adapter: new Adapter() });
 

diff --git a/packages/zent-compat/__tests__/form/Form.js b/packages/zent-compat/__tests__/form/Form.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Enzyme, { shallow } from 'enzyme';
 import ZentForm from 'form';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 Enzyme.configure({ adapter: new Adapter() });
 

diff --git a/packages/zent-compat/__tests__/form/GetControlGroup-Component_Fields.js b/packages/zent-compat/__tests__/form/GetControlGroup-Component_Fields.js
@@ -3,7 +3,7 @@ import Enzyme, { mount } from 'enzyme';
 import omit from 'lodash/omit';
 import ZentForm from 'form';
 import Option from 'select';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 Enzyme.configure({ adapter: new Adapter() });
 

diff --git a/packages/zent-compat/__tests__/pop.js b/packages/zent-compat/__tests__/pop.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import { Simulate } from 'react-dom/test-utils';
 import Pop from 'pop';
 import Button from 'zent/es/button';

diff --git a/packages/zent-compat/__tests__/popover.js b/packages/zent-compat/__tests__/popover.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Simulate } from 'react-dom/test-utils';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import Button from 'zent/es/button';
 import Popover from 'popover';
 

diff --git a/packages/zent-compat/__tests__/select.js b/packages/zent-compat/__tests__/select.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount, ReactWrapper } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import { Select as I18nDefault } from 'i18n/default';
 import Select, { Option } from 'select';

diff --git a/packages/zent-compat/__tests__/table/batch-components.js b/packages/zent-compat/__tests__/table/batch-components.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import BatchComponents from './comp/batch-components';
 

diff --git a/packages/zent-compat/__tests__/table/combine.js b/packages/zent-compat/__tests__/table/combine.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import { Button } from 'zent';
 import Combine from './comp/combine';
 

diff --git a/packages/zent-compat/__tests__/table/expand.js b/packages/zent-compat/__tests__/table/expand.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import Expand from './comp/expand';
 

diff --git a/packages/zent-compat/__tests__/table/loading.js b/packages/zent-compat/__tests__/table/loading.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import Loading from './comp/loading';
 

diff --git a/packages/zent-compat/__tests__/table/modules.js b/packages/zent-compat/__tests__/table/modules.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
 import Table from 'table';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import datasets from './comp/data/conf';
 import TextComponent from './comp/components/Text';

diff --git a/packages/zent-compat/__tests__/table/simple.js b/packages/zent-compat/__tests__/table/simple.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import Simple from './comp/simple';
 

diff --git a/packages/zent-compat/__tests__/table/single-select.js b/packages/zent-compat/__tests__/table/single-select.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 
 import SingleSelect from './comp/single-select';
 

diff --git a/packages/zent-compat/__tests__/table/table.js b/packages/zent-compat/__tests__/table/table.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Enzyme, { mount } from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
 import Table from 'table';
 
 import datasets from './comp/data/conf';

diff --git a/packages/zent-compat/package.json b/packages/zent-compat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zent/compat",
-  "version": "2.0.0-beta6",
+  "version": "2.0.0-beta.7",
   "description": "一套前端设计语言和基于React的实现",
   "bugs": "https://github.com/zent-contrib/zent-compat/issues",
   "repository": {
@@ -32,7 +32,7 @@
     "classnames": "^2.2.6",
     "date-fns": "^2.15.0",
     "lodash-es": "^4.17.11",
-    "react-is": "^16.8.1",
+    "react-is": "^17.0.1",
     "sortablejs": "~1.12.0",
     "tslib": "^2.0.0",
     "utility-types": "^3.4.1",
@@ -44,30 +44,32 @@
     "@types/classnames": "^2.2.7",
     "@types/jest": "^24.0.17",
     "@types/lodash-es": "^4.17.1",
-    "@types/react-dom": "^16.8.2",
-    "@types/react-is": "^16.7.1",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "@types/react-is": "^17.0.0",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.3.1",
     "autoprefixer": "^9.6.1",
     "babel-plugin-zent": "^2.2.2",
     "banned-import-paths-tslint-rule": "^1.0.4",
     "camelcase": "^5.2.0",
     "chalk": "^2.4.2",
     "cssnano": "^4.1.10",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
+    "enzyme": "^3.11.0",
     "glob": "^7.1.6",
     "jest": "^24.5.0",
     "postcss-cli": "^6.1.3",
-    "react": "16.11.x",
-    "react-dom": "16.11.x",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "sass": "^1.22.7",
     "ts-jest": "^24.0.0",
     "ts-node": "^8.0.3",
     "tslint": "^5.14.0",
-    "typescript": "~3.9.7",
-    "zent": "9.0.0-beta13"
+    "typescript": "~4.1.2",
+    "zent": "9.0.0-beta.24"
   },
   "peerDependencies": {
-    "@types/react": "^16.8.7",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
     "zent": ">=9.0.0"
   }
 }
diff --git a/packages/zent-compat/scripts/build.sh b/packages/zent-compat/scripts/build.sh
@@ -17,10 +17,19 @@ echo "Compile styles..."
 node $basepath/./compile-style.js
 
 # autoprefixer
-postcss css --use autoprefixer --replace --no-map
+postcss \
+  css \
+  --use 'zent/plugins/postcss-plugin-constants' \
+  --use autoprefixer \
+  --replace \
+  --no-map
 
 # minify index.css
-postcss css/index.css --use cssnano --no-map -o css/index.min.css
+postcss \
+  css/index.css \
+  --use cssnano \
+  --no-map \
+  -o css/index.min.css
 
 echo "Compile esm..."
 tsc

diff --git a/packages/zent-compat/src/upload/components/UploadLocal.ts b/packages/zent-compat/src/upload/components/UploadLocal.ts
@@ -1,7 +1,7 @@
 import isPromise from 'zent/es/utils/isPromise';
 
 export default function uploadLocalImage(options, uploadConfig) {
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     const { onUpload } = options;
 
     if (typeof onUpload !== 'function') {

diff --git a/postcss.config.js b/postcss.config.js
@@ -1,5 +1,8 @@
 /* eslint-disable global-require */
 
 module.exports = {
-  plugins: [require('autoprefixer')()],
+  plugins: [
+    require('zent/plugins/postcss-plugin-constants')(),
+    require('autoprefixer')(),
+  ],
 };
diff --git a/site/package.json b/site/package.json
@@ -26,9 +26,9 @@
     "prettier": "^1.15.2",
     "prismjs": "1.21.0",
     "prop-types": "^15.6.0",
-    "react": "16.11.x",
+    "react": "^17.0.1",
     "react-beautiful-dnd": "^10.0.4",
-    "react-dom": "16.11.x",
+    "react-dom": "^17.0.1",
     "react-loadable": "^5.3.0",
     "react-router-dom": "^4.1.1",
     "transliteration": "^1.6.2"
@@ -74,14 +74,14 @@
     "postcss-loader": "^3.0.0",
     "progress-bar-webpack-plugin": "^1.11.0",
     "ramda": "^0.25.0",
-    "react-hot-loader": "^4.6.3",
+    "react-hot-loader": "^4.13.0",
     "react-markdown-doc-loader": "^3.0.2",
     "sass": "^1.22.7",
     "sass-lint": "^1.12.1",
     "sass-loader": "^7.1.0",
     "style-loader": "^0.23.1",
     "thread-loader": "^2.1.2",
-    "typescript": "~3.9.7",
+    "typescript": "~4.1.2",
     "url-loader": "^1.1.2",
     "webpack": "^4.26.0",
     "webpack-cli": "^3.1.2",