Merge branch 'master' into patch-1

babel.config.js

@@ -46,7 +46,7 @@ function presets() {
     [
       '@emotion/babel-preset-css-prop',
       {
-        autoLabel: true,
+        autoLabel: 'always',
       },
     ],
     '@babel/typescript',

jest.config.js

@@ -10,7 +10,7 @@ module.exports = {
     '\\.(css|less)$': '<rootDir>/__mocks__/styleMock.js',
   },
   testURL: 'http://localhost:8080',
-  snapshotSerializers: ['jest-emotion'],
+  snapshotSerializers: ['@emotion/jest/serializer'],
   transformIgnorePatterns: [
     'node_modules/(?!copy-text-to-clipboard|clean-stack|escape-string-regexp)',
   ],

package.json

@@ -88,6 +88,7 @@
     "@commitlint/cli": "^16.0.0",
     "@commitlint/config-conventional": "^16.0.0",
     "@emotion/eslint-plugin": "^11.0.0",
+    "@emotion/jest": "^11.11.0",
     "@octokit/rest": "^16.28.7",
     "@soda/friendly-errors-webpack-plugin": "^1.8.1",
     "@storybook/addon-actions": "^5.3.6",
@@ -141,7 +142,6 @@
     "husky": "^7.0.0",
     "jest": "^27.0.0",
     "jest-cli": "^27.0.0",
-    "jest-emotion": "^10.0.32",
     "js-yaml": "^4.0.0",
     "mockserver-client": "^5.8.0",
     "mockserver-node": "^5.8.0",
@@ -184,10 +184,10 @@
   },
   "private": true,
   "dependencies": {
-    "@emotion/babel-preset-css-prop": "^10.0.27",
+    "@emotion/babel-preset-css-prop": "^11.11.0",
     "browserify": "^17.0.0",
     "buffer": "^6.0.3",
-    "emotion": "^10.0.9",
+    "emotion": "^11.0.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-babel": "^5.3.0",
     "globby": "^12.0.0",
@@ -198,5 +198,6 @@
   "resolutions": {
     "react-redux": "^7.2.0",
     "babel-plugin-lodash/@babel/types": "~7.20.0"
-  }
+  },
+  "version": "0.0.0"
 }

packages/decap-cms-app/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.10](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.9...decap-cms-app@3.0.10) (2023-10-13)
+
+**Note:** Version bump only for package decap-cms-app
+
+
+
+
+
+## [3.0.9](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.8...decap-cms-app@3.0.9) (2023-10-11)
+
+**Note:** Version bump only for package decap-cms-app
+
+
+
+
+
+## [3.0.8](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.7...decap-cms-app@3.0.8) (2023-10-10)
+
+**Note:** Version bump only for package decap-cms-app
+
+
+
+
+
 ## [3.0.7](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.0.6...decap-cms-app@3.0.7) (2023-09-06)
 
 **Note:** Version bump only for package decap-cms-app

packages/decap-cms-app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-app",
   "description": "An extensible, open source, Git-based, React CMS for static sites. Reusable congiuration with React as peer.",
-  "version": "3.0.7",
+  "version": "3.0.10",
   "homepage": "https://www.decapcms.org",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -26,35 +26,35 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@emotion/core": "^10.0.35",
-    "@emotion/styled": "^10.0.27",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
     "codemirror": "^5.46.0",
-    "decap-cms-backend-azure": "^3.0.1",
-    "decap-cms-backend-bitbucket": "^3.0.1",
-    "decap-cms-backend-git-gateway": "^3.0.2",
-    "decap-cms-backend-github": "^3.0.2",
-    "decap-cms-backend-gitlab": "^3.0.1",
-    "decap-cms-backend-proxy": "^3.0.1",
-    "decap-cms-backend-test": "^3.0.1",
-    "decap-cms-core": "^3.2.4",
+    "decap-cms-backend-azure": "^3.0.2",
+    "decap-cms-backend-bitbucket": "^3.0.2",
+    "decap-cms-backend-git-gateway": "^3.0.3",
+    "decap-cms-backend-github": "^3.0.3",
+    "decap-cms-backend-gitlab": "^3.0.2",
+    "decap-cms-backend-proxy": "^3.0.2",
+    "decap-cms-backend-test": "^3.0.2",
+    "decap-cms-core": "^3.2.6",
     "decap-cms-editor-component-image": "^3.0.0",
     "decap-cms-lib-auth": "^3.0.0",
     "decap-cms-lib-util": "^3.0.1",
     "decap-cms-lib-widgets": "^3.0.0",
     "decap-cms-locales": "^3.1.0",
-    "decap-cms-ui-default": "^3.0.2",
-    "decap-cms-widget-boolean": "^3.0.1",
-    "decap-cms-widget-code": "^3.0.1",
-    "decap-cms-widget-colorstring": "^3.0.1",
-    "decap-cms-widget-datetime": "^3.0.2",
-    "decap-cms-widget-file": "^3.0.2",
-    "decap-cms-widget-image": "^3.0.2",
-    "decap-cms-widget-list": "^3.0.2",
-    "decap-cms-widget-map": "^3.0.1",
-    "decap-cms-widget-markdown": "^3.0.1",
+    "decap-cms-ui-default": "^3.0.3",
+    "decap-cms-widget-boolean": "^3.0.2",
+    "decap-cms-widget-code": "^3.0.2",
+    "decap-cms-widget-colorstring": "^3.0.2",
+    "decap-cms-widget-datetime": "^3.0.3",
+    "decap-cms-widget-file": "^3.0.4",
+    "decap-cms-widget-image": "^3.0.3",
+    "decap-cms-widget-list": "^3.0.4",
+    "decap-cms-widget-map": "^3.0.2",
+    "decap-cms-widget-markdown": "^3.0.3",
     "decap-cms-widget-number": "^3.0.1",
-    "decap-cms-widget-object": "^3.0.1",
-    "decap-cms-widget-relation": "^3.0.2",
+    "decap-cms-widget-object": "^3.0.2",
+    "decap-cms-widget-relation": "^3.0.3",
     "decap-cms-widget-select": "^3.0.1",
     "decap-cms-widget-string": "^3.0.1",
     "decap-cms-widget-text": "^3.0.1",

packages/decap-cms-backend-azure/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-azure@3.0.1...decap-cms-backend-azure@3.0.2) (2023-10-13)
+
+**Note:** Version bump only for package decap-cms-backend-azure
+
+
+
+
+
 ## [3.0.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-azure@3.0.0...decap-cms-backend-azure@3.0.1) (2023-08-25)
 
 

packages/decap-cms-backend-azure/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-azure",
   "description": "Azure DevOps backend for Decap CMS",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "license": "MIT",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-azure",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -24,8 +24,8 @@
     "semaphore": "^1.1.0"
   },
   "peerDependencies": {
-    "@emotion/core": "^10.0.9",
-    "@emotion/styled": "^10.0.9",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
     "decap-cms-lib-auth": "^3.0.0",
     "decap-cms-lib-util": "^3.0.0",
     "decap-cms-ui-default": "^3.0.0",

packages/decap-cms-backend-bitbucket/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-bitbucket@3.0.1...decap-cms-backend-bitbucket@3.0.2) (2023-10-13)
+
+**Note:** Version bump only for package decap-cms-backend-bitbucket
+
+
+
+
+
 ## [3.0.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-bitbucket@3.0.0...decap-cms-backend-bitbucket@3.0.1) (2023-08-25)
 
 

packages/decap-cms-backend-bitbucket/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-bitbucket",
   "description": "Bitbucket backend for Decap CMS",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-bitbucket",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",
@@ -25,8 +25,8 @@
     "what-the-diff": "^0.6.0"
   },
   "peerDependencies": {
-    "@emotion/core": "^10.0.35",
-    "@emotion/styled": "^10.0.27",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
     "decap-cms-lib-auth": "^3.0.0",
     "decap-cms-lib-util": "^3.0.0",
     "decap-cms-ui-default": "^3.0.0",

packages/decap-cms-backend-git-gateway/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.3](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-git-gateway@3.0.2...decap-cms-backend-git-gateway@3.0.3) (2023-10-13)
+
+**Note:** Version bump only for package decap-cms-backend-git-gateway
+
+
+
+
+
 ## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-git-gateway@3.0.1...decap-cms-backend-git-gateway@3.0.2) (2023-09-06)
 
 

packages/decap-cms-backend-git-gateway/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-backend-git-gateway",
   "description": "Git Gateway backend for Decap CMS",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-git-gateway",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
   "module": "dist/esm/index.js",
@@ -26,8 +26,8 @@
     "minimatch": "^3.0.4"
   },
   "peerDependencies": {
-    "@emotion/core": "^10.0.35",
-    "@emotion/styled": "^10.0.27",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
     "decap-cms-backend-bitbucket": "^3.0.0",
     "decap-cms-backend-github": "^3.0.0",
     "decap-cms-backend-gitlab": "^3.0.0",

packages/decap-cms-backend-git-gateway/src/__tests__/AuthenticationPage.spec.js

@@ -1,6 +1,8 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 
+import GitGatewayAuthenticationPage from '../AuthenticationPage';
+
 window.netlifyIdentity = {
   currentUser: jest.fn(),
   on: jest.fn(),
@@ -21,21 +23,32 @@ describe('GitGatewayAuthenticationPage', () => {
   });
 
   it('should render with identity error', () => {
-    const { default: GitGatewayAuthenticationPage } = require('../AuthenticationPage');
-    const { asFragment } = render(<GitGatewayAuthenticationPage {...props} />);
+    // obtain mock calls
+    require('../AuthenticationPage');
+
+    function TestComponent() {
+      const { asFragment } = render(<GitGatewayAuthenticationPage {...props} />);
 
-    const errorCallback = window.netlifyIdentity.on.mock.calls.find(call => call[0] === 'error')[1];
+      const errorCallback = window.netlifyIdentity.on.mock.calls.find(
+        call => call[0] === 'error',
+      )[1];
 
-    errorCallback(
-      new Error('Failed to load settings from https://site.netlify.com/.netlify/identity'),
-    );
+      errorCallback(
+        new Error('Failed to load settings from https://site.netlify.com/.netlify/identity'),
+      );
 
-    expect(asFragment()).toMatchSnapshot();
+      expect(asFragment()).toMatchSnapshot();
+    }
+
+    TestComponent();
   });
 
-  it('should render with no identity error', () => {
-    const { default: GitGatewayAuthenticationPage } = require('../AuthenticationPage');
-    const { asFragment } = render(<GitGatewayAuthenticationPage {...props} />);
-    expect(asFragment()).toMatchSnapshot();
+  test('should render with no identity error', () => {
+    function TestComponent() {
+      const { asFragment } = render(<GitGatewayAuthenticationPage {...props} />);
+      expect(asFragment()).toMatchSnapshot();
+    }
+
+    TestComponent();
   });
 });