Merge branch 'master' into releases/4.3.0

strapi · Jul 27, 2022 · a4c2f3b · a4c2f3b
2 parents 0ad69d7 + b3b6bdf
commit a4c2f3b
Show file tree

Hide file tree

Showing 23 changed files with 2,111 additions and 2,084 deletions.
diff --git a/jest.base-config.front.js b/jest.base-config.front.js
@@ -53,7 +53,7 @@ module.exports = {
   ],
   testEnvironment: 'jsdom',
   transform: {
-    '^.+\\.js$': ['@swc-node/jest', { jsx: true, dynamicImport: true }],
+    '^.+\\.js$': ['@swc/jest', { jsc: { parser: { jsx: true, dynamicImport: true } } }],
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/fileTransformer.js',
   },

diff --git a/package.json b/package.json
@@ -71,7 +71,8 @@
     "@babel/polyfill": "7.12.1"
   },
   "devDependencies": {
-    "@swc-node/jest": "1.5.0",
+    "@swc/core": "1.2.218",
+    "@swc/jest": "0.2.22",
     "@testing-library/react": "11.2.7",
     "@testing-library/react-hooks": "3.7.0",
     "@testing-library/user-event": "13.5.0",
@@ -98,11 +99,11 @@
     "glob": "7.2.3",
     "husky": "3.1.0",
     "istanbul": "~0.4.2",
-    "jest": "28.1.2",
+    "jest": "28.1.3",
     "jest-circus": "28.1.3",
-    "jest-cli": "28.1.2",
-    "jest-environment-jsdom": "28.1.2",
-    "jest-watch-typeahead": "0.6.5",
+    "jest-cli": "28.1.3",
+    "jest-environment-jsdom": "28.1.3",
+    "jest-watch-typeahead": "2.0.0",
     "lerna": "5.1.6",
     "lint-staged": "10.5.4",
     "lodash": "4.17.21",

diff --git a/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js b/packages/core/admin/admin/src/content-manager/pages/EditSettingsView/components/ModalForm.js
@@ -59,8 +59,8 @@ const ModalForm = ({ onMetaChange, onSizeChange }) => {
     const formType = get(attributes, [selectedField, 'type']);
 
     if (
-      formType === 'dynamiczone' ||
-      (formType === 'component' && !['label', 'description'].includes(meta))
+      ['component', 'dynamiczone'].includes(formType) &&
+      !['label', 'description'].includes(meta)
     ) {
       return null;
     }

diff --git a/packages/core/admin/admin/src/pages/ProfilePage/index.js b/packages/core/admin/admin/src/pages/ProfilePage/index.js
@@ -357,6 +357,7 @@ const ProfilePage = () => {
                               })}
                               name="password"
                               type={passwordShown ? 'text' : 'password'}
+                              autoComplete="new-password"
                               endAction={
                                 <FieldActionWrapper
                                   onClick={e => {
@@ -398,6 +399,7 @@ const ProfilePage = () => {
                               })}
                               name="confirmPassword"
                               type={passwordConfirmShown ? 'text' : 'password'}
+                              autoComplete="new-password"
                               endAction={
                                 <FieldActionWrapper
                                   onClick={e => {