Merge branch 'master' of https://github.com/strapi/strapi into feature/usecase-ui

package.json

@@ -70,17 +70,17 @@
     "@babel/polyfill": "7.12.1"
   },
   "devDependencies": {
-    "@swc-node/jest": "1.1.0",
+    "@swc-node/jest": "1.4.3",
     "@testing-library/react": "11.2.6",
     "@testing-library/react-hooks": "3.4.2",
-    "@testing-library/user-event": "13.1.9",
+    "@testing-library/user-event": "13.5.0",
     "axios-mock-adapter": "1.19.0",
-    "babel-eslint": "10.0.0",
+    "babel-eslint": "10.1.0",
     "chalk": "4.1.1",
     "chokidar": "3.5.1",
     "cross-env": "7.0.3",
     "dotenv": "14.2.0",
-    "enzyme": "3.9.0",
+    "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "eslint": "7.25.0",
     "eslint-config-airbnb": "18.2.1",
@@ -91,7 +91,7 @@
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-react": "7.23.2",
-    "eslint-plugin-react-hooks": "4.2.0",
+    "eslint-plugin-react-hooks": "4.3.0",
     "eslint-plugin-redux-saga": "1.2.1",
     "execa": "1.0.0",
     "fs-extra": "10.0.0",

packages/admin-test-utils/package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@testing-library/jest-dom": "5.16.1",
-    "enzyme": "3.9.0",
+    "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
     "jest-styled-components": "7.0.2"
   },

packages/core/admin/index.js

@@ -262,7 +262,7 @@ async function watchAdmin({ plugins, dir, host, port, browser, options }) {
 
   const compiler = webpack(webpackConfig);
 
-  const server = new WebpackDevServer(compiler.options.devServer, compiler);
+  const server = new WebpackDevServer(args.devServer, compiler);
 
   const runServer = async () => {
     console.log(chalk.green('Starting the development server...'));

packages/core/helper-plugin/lib/src/components/DateTimePicker/index.js

@@ -96,11 +96,15 @@ const DateTimePicker = ({
   const handleTimeClear = () => {
     setTimeValue(undefined);
 
-    if (dateValue && onChange) {
-      const dateToSet = new Date(dateValue);
+    let dateToSet;
+
+    if (dateValue) {
+      dateToSet = new Date(dateValue);
       dateToSet.setHours('00');
       dateToSet.setMinutes('00');
+    }
 
+    if (onChange) {
       onChange(dateToSet);
     }
   };

packages/core/helper-plugin/lib/src/components/GenericInput/index.js

@@ -147,7 +147,7 @@ const GenericInput = ({
             onChange({ target: { name, value: formattedDate, type } });
           }}
           step={step}
-          onClear={() => onChange({ target: { name, value: '', type } })}
+          onClear={() => onChange({ target: { name, value: null, type } })}
           placeholder={formattedPlaceholder}
           required={required}
           value={value ? new Date(value) : null}
@@ -171,7 +171,7 @@ const GenericInput = ({
 
             onChange({ target: { name, value: formattedDate, type } });
           }}
-          onClear={() => onChange({ target: { name, value: '', type } })}
+          onClear={() => onChange({ target: { name, value: null, type } })}
           placeholder={formattedPlaceholder}
           required={required}
           selectedDate={value ? new Date(value) : null}