From bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf Mon Sep 17 00:00:00 2001 From: Prachya Saechua Date: Tue, 20 Feb 2024 23:48:01 -0800 Subject: [PATCH 1/4] fix: gitlab pkce auth error (#7110) --- .../src/AuthenticationPage.js | 2 -- .../src/AuthenticationPage.js | 1 - .../src/AuthenticationPage.js | 20 +++++++++++++++---- packages/decap-cms-lib-auth/src/pkce-oauth.js | 5 ++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/packages/decap-cms-backend-aws-cognito-github-proxy/src/AuthenticationPage.js b/packages/decap-cms-backend-aws-cognito-github-proxy/src/AuthenticationPage.js index 94ce2974fe6a..caba50d0fea4 100644 --- a/packages/decap-cms-backend-aws-cognito-github-proxy/src/AuthenticationPage.js +++ b/packages/decap-cms-backend-aws-cognito-github-proxy/src/AuthenticationPage.js @@ -24,14 +24,12 @@ export default class GenericPKCEAuthenticationPage extends React.Component { app_id = '', auth_endpoint = 'oauth2/authorize', auth_token_endpoint = 'oauth2/token', - redirect_uri = document.location.origin + document.location.pathname, } = this.props.config.backend; this.auth = new PkceAuthenticator({ base_url, auth_endpoint, app_id, auth_token_endpoint, - redirect_uri, auth_token_endpoint_content_type: 'application/x-www-form-urlencoded; charset=utf-8', }); // Complete authentication if we were redirected back to from the provider. diff --git a/packages/decap-cms-backend-gitea/src/AuthenticationPage.js b/packages/decap-cms-backend-gitea/src/AuthenticationPage.js index 2def4d2ac66f..15990df1bc36 100644 --- a/packages/decap-cms-backend-gitea/src/AuthenticationPage.js +++ b/packages/decap-cms-backend-gitea/src/AuthenticationPage.js @@ -26,7 +26,6 @@ export default class GiteaAuthenticationPage extends React.Component { app_id, auth_token_endpoint: 'login/oauth/access_token', auth_token_endpoint_content_type: 'application/json; charset=utf-8', - redirect_uri: document.location.origin + document.location.pathname, }); // Complete authentication if we were redirected back to from the provider. this.auth.completeAuth((err, data) => { diff --git a/packages/decap-cms-backend-gitlab/src/AuthenticationPage.js b/packages/decap-cms-backend-gitlab/src/AuthenticationPage.js index 6eb5cc61fb59..6576b19e3236 100644 --- a/packages/decap-cms-backend-gitlab/src/AuthenticationPage.js +++ b/packages/decap-cms-backend-gitlab/src/AuthenticationPage.js @@ -13,18 +13,30 @@ const LoginButtonIcon = styled(Icon)` `; const clientSideAuthenticators = { - pkce: ({ base_url, auth_endpoint, app_id, auth_token_endpoint }) => + pkce: ({ + base_url, + auth_endpoint, + app_id, + auth_token_endpoint}) => new PkceAuthenticator({ base_url, auth_endpoint, app_id, auth_token_endpoint, auth_token_endpoint_content_type: 'application/json; charset=utf-8', - redirect_uri: document.location.origin + document.location.pathname, }), - implicit: ({ base_url, auth_endpoint, app_id, clearHash }) => - new ImplicitAuthenticator({ base_url, auth_endpoint, app_id, clearHash }), + implicit: ({ + base_url, + auth_endpoint, + app_id, + clearHash }) => + new ImplicitAuthenticator({ + base_url, + auth_endpoint, + app_id, + clearHash, + }), }; export default class GitLabAuthenticationPage extends React.Component { diff --git a/packages/decap-cms-lib-auth/src/pkce-oauth.js b/packages/decap-cms-lib-auth/src/pkce-oauth.js index 803ce11aebc7..fa1c8a2888f7 100644 --- a/packages/decap-cms-lib-auth/src/pkce-oauth.js +++ b/packages/decap-cms-lib-auth/src/pkce-oauth.js @@ -54,7 +54,6 @@ export default class PkceAuthenticator { this.auth_url = `${baseURL}/${authEndpoint}`; this.auth_token_url = `${baseURL}/${authTokenEndpoint}`; this.auth_token_endpoint_content_type = config.auth_token_endpoint_content_type; - this.redirect_uri = trim(config.redirect_uri, '/'); this.appID = config.app_id; } @@ -65,7 +64,7 @@ export default class PkceAuthenticator { const authURL = new URL(this.auth_url); authURL.searchParams.set('client_id', this.appID); - authURL.searchParams.set('redirect_uri', this.redirect_uri); + authURL.searchParams.set('redirect_uri', document.location.origin + document.location.pathname); authURL.searchParams.set('response_type', 'code'); authURL.searchParams.set('scope', options.scope); @@ -118,7 +117,7 @@ export default class PkceAuthenticator { client_id: this.appID, code, grant_type: 'authorization_code', - redirect_uri: this.redirect_uri, + redirect_uri: document.location.origin + document.location.pathname, code_verifier: getCodeVerifier(), }; From 3715ca74a21de3aed1a5b96627c6745bc1b5b490 Mon Sep 17 00:00:00 2001 From: Anze Demsar Date: Wed, 21 Feb 2024 08:51:29 +0100 Subject: [PATCH 2/4] chore(release): publish - decap-cms@3.1.2 - decap-cms-app@3.1.2 - decap-cms-backend-aws-cognito-github-proxy@3.1.1 - decap-cms-backend-gitea@3.1.1 - decap-cms-backend-gitlab@3.1.1 - decap-cms-core@3.3.2 - decap-cms-lib-auth@3.0.4 --- package-lock.json | 24 +++++++++---------- packages/decap-cms-app/CHANGELOG.md | 4 ++++ packages/decap-cms-app/package.json | 10 ++++---- .../CHANGELOG.md | 6 +++++ .../package.json | 2 +- packages/decap-cms-backend-gitea/CHANGELOG.md | 6 +++++ packages/decap-cms-backend-gitea/package.json | 2 +- .../decap-cms-backend-gitlab/CHANGELOG.md | 6 +++++ .../decap-cms-backend-gitlab/package.json | 2 +- packages/decap-cms-core/CHANGELOG.md | 4 ++++ packages/decap-cms-core/package.json | 2 +- packages/decap-cms-lib-auth/CHANGELOG.md | 6 +++++ packages/decap-cms-lib-auth/package.json | 2 +- packages/decap-cms/CHANGELOG.md | 4 ++++ packages/decap-cms/package.json | 4 ++-- 15 files changed, 60 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2fde350db04f..f6168167461a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33121,12 +33121,12 @@ } }, "packages/decap-cms": { - "version": "3.1.1", + "version": "3.1.2", "license": "MIT", "dependencies": { "codemirror": "^5.46.0", "create-react-class": "^15.7.0", - "decap-cms-app": "^3.1.1", + "decap-cms-app": "^3.1.2", "decap-cms-media-library-cloudinary": "^3.0.2", "decap-cms-media-library-uploadcare": "^3.0.1", "file-loader": "^6.2.0", @@ -33136,24 +33136,24 @@ } }, "packages/decap-cms-app": { - "version": "3.1.1", + "version": "3.1.2", "license": "MIT", "dependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "codemirror": "^5.46.0", "dayjs": "^1.11.10", - "decap-cms-backend-aws-cognito-github-proxy": "^3.1.0", + "decap-cms-backend-aws-cognito-github-proxy": "^3.1.1", "decap-cms-backend-azure": "^3.1.0", "decap-cms-backend-bitbucket": "^3.1.0", "decap-cms-backend-git-gateway": "^3.1.0", "decap-cms-backend-github": "^3.1.0", - "decap-cms-backend-gitlab": "^3.1.0", + "decap-cms-backend-gitlab": "^3.1.1", "decap-cms-backend-proxy": "^3.1.0", "decap-cms-backend-test": "^3.1.0", - "decap-cms-core": "^3.3.1", + "decap-cms-core": "^3.3.2", "decap-cms-editor-component-image": "^3.1.0", - "decap-cms-lib-auth": "^3.0.3", + "decap-cms-lib-auth": "^3.0.4", "decap-cms-lib-util": "^3.0.2", "decap-cms-lib-widgets": "^3.0.1", "decap-cms-locales": "^3.1.3", @@ -33185,7 +33185,7 @@ } }, "packages/decap-cms-backend-aws-cognito-github-proxy": { - "version": "3.1.0", + "version": "3.1.1", "license": "MIT", "dependencies": { "apollo-cache-inmemory": "^1.6.2", @@ -33284,7 +33284,7 @@ } }, "packages/decap-cms-backend-gitea": { - "version": "3.1.0", + "version": "3.1.1", "license": "MIT", "dependencies": { "js-base64": "^3.0.0", @@ -33328,7 +33328,7 @@ } }, "packages/decap-cms-backend-gitlab": { - "version": "3.1.0", + "version": "3.1.1", "license": "MIT", "dependencies": { "apollo-cache-inmemory": "^1.6.2", @@ -33377,7 +33377,7 @@ } }, "packages/decap-cms-core": { - "version": "3.3.1", + "version": "3.3.2", "license": "MIT", "dependencies": { "@iarna/toml": "2.2.5", @@ -33516,7 +33516,7 @@ } }, "packages/decap-cms-lib-auth": { - "version": "3.0.3", + "version": "3.0.4", "license": "MIT", "peerDependencies": { "immutable": "^3.7.6", diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md index 67449c38ce7e..21116f577526 100644 --- a/packages/decap-cms-app/CHANGELOG.md +++ b/packages/decap-cms-app/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.1.2](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.1...decap-cms-app@3.1.2) (2024-02-21) + +**Note:** Version bump only for package decap-cms-app + ## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-app@3.1.0...decap-cms-app@3.1.1) (2024-02-01) **Note:** Version bump only for package decap-cms-app diff --git a/packages/decap-cms-app/package.json b/packages/decap-cms-app/package.json index 93f391f84126..fd0cf9e21b4b 100644 --- a/packages/decap-cms-app/package.json +++ b/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.1.1", + "version": "3.1.2", "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", @@ -30,17 +30,17 @@ "@emotion/styled": "^11.11.0", "codemirror": "^5.46.0", "dayjs": "^1.11.10", - "decap-cms-backend-aws-cognito-github-proxy": "^3.1.0", + "decap-cms-backend-aws-cognito-github-proxy": "^3.1.1", "decap-cms-backend-azure": "^3.1.0", "decap-cms-backend-bitbucket": "^3.1.0", "decap-cms-backend-git-gateway": "^3.1.0", "decap-cms-backend-github": "^3.1.0", - "decap-cms-backend-gitlab": "^3.1.0", + "decap-cms-backend-gitlab": "^3.1.1", "decap-cms-backend-proxy": "^3.1.0", "decap-cms-backend-test": "^3.1.0", - "decap-cms-core": "^3.3.1", + "decap-cms-core": "^3.3.2", "decap-cms-editor-component-image": "^3.1.0", - "decap-cms-lib-auth": "^3.0.3", + "decap-cms-lib-auth": "^3.0.4", "decap-cms-lib-util": "^3.0.2", "decap-cms-lib-widgets": "^3.0.1", "decap-cms-locales": "^3.1.3", diff --git a/packages/decap-cms-backend-aws-cognito-github-proxy/CHANGELOG.md b/packages/decap-cms-backend-aws-cognito-github-proxy/CHANGELOG.md index 25d99e00abae..ad9110323913 100644 --- a/packages/decap-cms-backend-aws-cognito-github-proxy/CHANGELOG.md +++ b/packages/decap-cms-backend-aws-cognito-github-proxy/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-aws-cognito-github-proxy@3.1.0...decap-cms-backend-aws-cognito-github-proxy@3.1.1) (2024-02-21) + +### Bug Fixes + +- gitlab pkce auth error ([#7110](https://github.com/decaporg/decap-cms/issues/7110)) ([bcd58d6](https://github.com/decaporg/decap-cms/commit/bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf)) + # [3.1.0](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-aws-cognito-github-proxy@3.1.0-beta.2...decap-cms-backend-aws-cognito-github-proxy@3.1.0) (2024-02-01) **Note:** Version bump only for package decap-cms-backend-aws-cognito-github-proxy diff --git a/packages/decap-cms-backend-aws-cognito-github-proxy/package.json b/packages/decap-cms-backend-aws-cognito-github-proxy/package.json index ddf554d84614..a971a9cc28fc 100644 --- a/packages/decap-cms-backend-aws-cognito-github-proxy/package.json +++ b/packages/decap-cms-backend-aws-cognito-github-proxy/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-backend-aws-cognito-github-proxy", "description": "GitHub backend for Decap CMS proxied through AWS Cognito", - "version": "3.1.0", + "version": "3.1.1", "license": "MIT", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-aws-cognito-github-proxy", "bugs": "https://github.com/decaporg/decap-cms/issues", diff --git a/packages/decap-cms-backend-gitea/CHANGELOG.md b/packages/decap-cms-backend-gitea/CHANGELOG.md index 05337b36727a..50ec81177677 100644 --- a/packages/decap-cms-backend-gitea/CHANGELOG.md +++ b/packages/decap-cms-backend-gitea/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitea@3.1.0-beta.1...decap-cms-backend-gitea@3.1.1) (2024-02-21) + +### Bug Fixes + +- gitlab pkce auth error ([#7110](https://github.com/decaporg/decap-cms/issues/7110)) ([bcd58d6](https://github.com/decaporg/decap-cms/commit/bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf)) + # [3.1.0](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitea@3.1.0-beta.1...decap-cms-backend-gitea@3.1.0) (2024-02-01) **Note:** Version bump only for package decap-cms-backend-gitea diff --git a/packages/decap-cms-backend-gitea/package.json b/packages/decap-cms-backend-gitea/package.json index e8e08ed2b8c7..65675aa5d345 100644 --- a/packages/decap-cms-backend-gitea/package.json +++ b/packages/decap-cms-backend-gitea/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-backend-gitea", "description": "Gitea backend for Decap CMS", - "version": "3.1.0", + "version": "3.1.1", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-gitea", "bugs": "https://github.com/decaporg/decap-cms/issues", "license": "MIT", diff --git a/packages/decap-cms-backend-gitlab/CHANGELOG.md b/packages/decap-cms-backend-gitlab/CHANGELOG.md index 5be462537ee6..034d5a012669 100644 --- a/packages/decap-cms-backend-gitlab/CHANGELOG.md +++ b/packages/decap-cms-backend-gitlab/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitlab@3.1.0-beta.1...decap-cms-backend-gitlab@3.1.1) (2024-02-21) + +### Bug Fixes + +- gitlab pkce auth error ([#7110](https://github.com/decaporg/decap-cms/issues/7110)) ([bcd58d6](https://github.com/decaporg/decap-cms/commit/bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf)) + # [3.1.0](https://github.com/decaporg/decap-cms/compare/decap-cms-backend-gitlab@3.1.0-beta.1...decap-cms-backend-gitlab@3.1.0) (2024-02-01) **Note:** Version bump only for package decap-cms-backend-gitlab diff --git a/packages/decap-cms-backend-gitlab/package.json b/packages/decap-cms-backend-gitlab/package.json index a3927a7bb9f6..d177ba33436b 100644 --- a/packages/decap-cms-backend-gitlab/package.json +++ b/packages/decap-cms-backend-gitlab/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-backend-gitlab", "description": "GitLab backend for Decap CMS", - "version": "3.1.0", + "version": "3.1.1", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-gitlab", "bugs": "https://github.com/decaporg/decap-cms/issues", "license": "MIT", diff --git a/packages/decap-cms-core/CHANGELOG.md b/packages/decap-cms-core/CHANGELOG.md index cadeb6a94d62..181687232be3 100644 --- a/packages/decap-cms-core/CHANGELOG.md +++ b/packages/decap-cms-core/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.3.2](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.3.1...decap-cms-core@3.3.2) (2024-02-21) + +**Note:** Version bump only for package decap-cms-core + ## [3.3.1](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.3.0...decap-cms-core@3.3.1) (2024-02-01) **Note:** Version bump only for package decap-cms-core diff --git a/packages/decap-cms-core/package.json b/packages/decap-cms-core/package.json index aed3707fcced..e2659e0db08a 100644 --- a/packages/decap-cms-core/package.json +++ b/packages/decap-cms-core/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-core", "description": "Decap CMS core application, see decap-cms package for the main distribution.", - "version": "3.3.1", + "version": "3.3.2", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-core", "bugs": "https://github.com/decaporg/decap-cms/issues", "module": "dist/esm/index.js", diff --git a/packages/decap-cms-lib-auth/CHANGELOG.md b/packages/decap-cms-lib-auth/CHANGELOG.md index 86d85ddf0256..7c23255c0a85 100644 --- a/packages/decap-cms-lib-auth/CHANGELOG.md +++ b/packages/decap-cms-lib-auth/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.4](https://github.com/decaporg/decap-cms/compare/decap-cms-lib-auth@3.0.3...decap-cms-lib-auth@3.0.4) (2024-02-21) + +### Bug Fixes + +- gitlab pkce auth error ([#7110](https://github.com/decaporg/decap-cms/issues/7110)) ([bcd58d6](https://github.com/decaporg/decap-cms/commit/bcd58d6e117b4654b3e0dca173f7f8aaca8dabdf)) + ## [3.0.3](https://github.com/decaporg/decap-cms/compare/decap-cms-lib-auth@3.0.3-beta.1...decap-cms-lib-auth@3.0.3) (2024-02-01) **Note:** Version bump only for package decap-cms-lib-auth diff --git a/packages/decap-cms-lib-auth/package.json b/packages/decap-cms-lib-auth/package.json index 34ce19f76677..5b65b0763345 100644 --- a/packages/decap-cms-lib-auth/package.json +++ b/packages/decap-cms-lib-auth/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms-lib-auth", "description": "Shared authentication functionality for Decap CMS.", - "version": "3.0.3", + "version": "3.0.4", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-lib-auth", "bugs": "https://github.com/decaporg/decap-cms/issues", "module": "dist/esm/index.js", diff --git a/packages/decap-cms/CHANGELOG.md b/packages/decap-cms/CHANGELOG.md index 809429d8b048..7f7eacf725df 100644 --- a/packages/decap-cms/CHANGELOG.md +++ b/packages/decap-cms/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.1.2](https://github.com/decaporg/decap-cms/compare/decap-cms@3.1.1...decap-cms@3.1.2) (2024-02-21) + +**Note:** Version bump only for package decap-cms + ## [3.1.1](https://github.com/decaporg/decap-cms/compare/decap-cms@3.1.0...decap-cms@3.1.1) (2024-02-01) **Note:** Version bump only for package decap-cms diff --git a/packages/decap-cms/package.json b/packages/decap-cms/package.json index 767061a1529a..a883812c43e4 100644 --- a/packages/decap-cms/package.json +++ b/packages/decap-cms/package.json @@ -1,7 +1,7 @@ { "name": "decap-cms", "description": "An extensible, open source, Git-based, React CMS for static sites.", - "version": "3.1.1", + "version": "3.1.2", "homepage": "https://www.decapcms.org", "repository": "https://github.com/decaporg/decap-cms", "bugs": "https://github.com/decaporg/decap-cms/issues", @@ -22,7 +22,7 @@ "dependencies": { "codemirror": "^5.46.0", "create-react-class": "^15.7.0", - "decap-cms-app": "^3.1.1", + "decap-cms-app": "^3.1.2", "decap-cms-media-library-cloudinary": "^3.0.2", "decap-cms-media-library-uploadcare": "^3.0.1", "file-loader": "^6.2.0", From 2985ed68fb3eb965a7e4bc2afdac1261fcc693a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE?= Date: Tue, 27 Feb 2024 10:47:58 +0100 Subject: [PATCH 3/4] /decaporg/decap-cms/issues/7102 publish mode allow empty string (#7116) --- packages/decap-cms-core/index.d.ts | 2 +- packages/decap-cms-core/src/constants/configSchema.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/decap-cms-core/index.d.ts b/packages/decap-cms-core/index.d.ts index 2fcd45aa83c4..edb8748a73d2 100644 --- a/packages/decap-cms-core/index.d.ts +++ b/packages/decap-cms-core/index.d.ts @@ -41,7 +41,7 @@ declare module 'decap-cms-core' { export type CmsAuthScope = 'repo' | 'public_repo'; - export type CmsPublishMode = 'simple' | 'editorial_workflow'; + export type CmsPublishMode = 'simple' | 'editorial_workflow' | ''; export type CmsSlugEncoding = 'unicode' | 'ascii'; diff --git a/packages/decap-cms-core/src/constants/configSchema.js b/packages/decap-cms-core/src/constants/configSchema.js index d3f6de491aab..5efd2cd4c172 100644 --- a/packages/decap-cms-core/src/constants/configSchema.js +++ b/packages/decap-cms-core/src/constants/configSchema.js @@ -175,7 +175,7 @@ function getConfigSchema() { }, publish_mode: { type: 'string', - enum: ['simple', 'editorial_workflow'], + enum: ['simple', 'editorial_workflow', ''], examples: ['editorial_workflow'], }, slug: { From 966f4d05e9aa53bf1ae3ea200ad9c8b201071627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alja=C5=BE?= Date: Fri, 1 Mar 2024 10:09:03 +0100 Subject: [PATCH 4/4] fix windows markdown issue (#7126) * /decaporg/decap-cms/issues/7102 publish mode allow empty string * fix: /decaporg/decap-cms/issues/7125 bump vfile version --- package-lock.json | 66 ++++++++++++++++++- .../decap-cms-widget-markdown/package.json | 2 +- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f6168167461a..5090e3e4739b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "decap-cms", + "name": "decap-cms-pm", "version": "0.0.0", "lockfileVersion": 3, "requires": true, @@ -7373,6 +7373,7 @@ }, "node_modules/@types/vfile": { "version": "3.0.2", + "dev": true, "license": "MIT", "dependencies": { "@types/node": "*", @@ -7382,6 +7383,7 @@ }, "node_modules/@types/vfile-message": { "version": "2.0.0", + "dev": true, "license": "MIT", "dependencies": { "vfile-message": "*" @@ -7389,10 +7391,12 @@ }, "node_modules/@types/vfile-message/node_modules/@types/unist": { "version": "3.0.1", + "dev": true, "license": "MIT" }, "node_modules/@types/vfile-message/node_modules/unist-util-stringify-position": { "version": "4.0.0", + "dev": true, "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" @@ -7404,6 +7408,7 @@ }, "node_modules/@types/vfile-message/node_modules/vfile-message": { "version": "4.0.2", + "dev": true, "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", @@ -7416,6 +7421,7 @@ }, "node_modules/@types/vfile/node_modules/@types/unist": { "version": "3.0.1", + "dev": true, "license": "MIT" }, "node_modules/@types/ws": { @@ -28078,6 +28084,7 @@ }, "node_modules/replace-ext": { "version": "1.0.0", + "dev": true, "license": "MIT", "engines": { "node": ">= 0.10" @@ -31415,6 +31422,7 @@ }, "node_modules/unified": { "version": "7.1.0", + "dev": true, "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", @@ -31429,6 +31437,7 @@ }, "node_modules/unified/node_modules/is-buffer": { "version": "2.0.5", + "dev": true, "funding": [ { "type": "github", @@ -31450,10 +31459,12 @@ }, "node_modules/unified/node_modules/unist-util-stringify-position": { "version": "1.1.2", + "dev": true, "license": "MIT" }, "node_modules/unified/node_modules/vfile": { "version": "3.0.1", + "dev": true, "license": "MIT", "dependencies": { "is-buffer": "^2.0.0", @@ -31464,6 +31475,7 @@ }, "node_modules/unified/node_modules/vfile-message": { "version": "1.1.1", + "dev": true, "license": "MIT", "dependencies": { "unist-util-stringify-position": "^1.1.1" @@ -32991,7 +33003,8 @@ } }, "node_modules/x-is-string": { - "version": "0.1.0" + "version": "0.1.0", + "dev": true }, "node_modules/xcase": { "version": "2.0.1", @@ -33728,7 +33741,7 @@ "slate-plain-serializer": "^0.7.1", "slate-react": "^0.91.2", "slate-soft-break": "^0.9.0", - "unified": "^7.1.0", + "unified": "^9.2.0", "unist-builder": "^1.0.3", "unist-util-visit-parents": "^2.0.1" }, @@ -33769,6 +33782,36 @@ "url": "https://opencollective.com/unified" } }, + "packages/decap-cms-widget-markdown/node_modules/is-buffer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz", + "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "engines": { + "node": ">=4" + } + }, + "packages/decap-cms-widget-markdown/node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "engines": { + "node": ">=8" + } + }, "packages/decap-cms-widget-markdown/node_modules/rehype-stringify": { "version": "7.0.0", "license": "MIT", @@ -33794,6 +33837,23 @@ "url": "https://github.com/sponsors/wooorm" } }, + "packages/decap-cms-widget-markdown/node_modules/unified": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz", + "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==", + "dependencies": { + "bail": "^1.0.0", + "extend": "^3.0.0", + "is-buffer": "^2.0.0", + "is-plain-obj": "^2.0.0", + "trough": "^1.0.0", + "vfile": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "packages/decap-cms-widget-number": { "version": "3.1.0", "license": "MIT", diff --git a/packages/decap-cms-widget-markdown/package.json b/packages/decap-cms-widget-markdown/package.json index d48874ead7da..886e20cd96df 100644 --- a/packages/decap-cms-widget-markdown/package.json +++ b/packages/decap-cms-widget-markdown/package.json @@ -40,7 +40,7 @@ "slate-plain-serializer": "^0.7.1", "slate-react": "^0.91.2", "slate-soft-break": "^0.9.0", - "unified": "^7.1.0", + "unified": "^9.2.0", "unist-builder": "^1.0.3", "unist-util-visit-parents": "^2.0.1" },