Merge branch 'master' into react-18

decaporg · Oct 11, 2023 · a7b4403 · a7b4403
2 parents 66d1065 + 885131f
commit a7b4403
Show file tree

Hide file tree

Showing 28 changed files with 107 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -198,5 +198,6 @@
   "resolutions": {
     "react-redux": "^7.2.0",
     "babel-plugin-lodash/@babel/types": "~7.20.0"
-  }
+  },
+  "version": "0.0.0"
 }
diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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

diff --git 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.0.7",
+  "version": "3.0.9",
   "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",
@@ -36,7 +36,7 @@
     "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-core": "^3.2.5",
     "decap-cms-editor-component-image": "^3.0.0",
     "decap-cms-lib-auth": "^3.0.0",
     "decap-cms-lib-util": "^3.0.1",
@@ -47,11 +47,11 @@
     "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-file": "^3.0.3",
     "decap-cms-widget-image": "^3.0.2",
-    "decap-cms-widget-list": "^3.0.2",
+    "decap-cms-widget-list": "^3.0.3",
     "decap-cms-widget-map": "^3.0.1",
-    "decap-cms-widget-markdown": "^3.0.1",
+    "decap-cms-widget-markdown": "^3.0.2",
     "decap-cms-widget-number": "^3.0.1",
     "decap-cms-widget-object": "^3.0.1",
     "decap-cms-widget-relation": "^3.0.2",

diff --git a/packages/decap-cms-backend-bitbucket/src/AuthenticationPage.js b/packages/decap-cms-backend-bitbucket/src/AuthenticationPage.js
@@ -52,7 +52,7 @@ export default class BitbucketAuthenticationPage extends React.Component {
         base_url: this.props.base_url,
         site_id:
           document.location.host.split(':')[0] === 'localhost'
-            ? 'cms-demo.netlify.com'
+            ? 'demo.decapcms.org'
             : this.props.siteId,
         auth_endpoint: this.props.authEndpoint,
       });

diff --git a/packages/decap-cms-backend-github/src/AuthenticationPage.js b/packages/decap-cms-backend-github/src/AuthenticationPage.js
@@ -70,7 +70,7 @@ export default class GitHubAuthenticationPage extends React.Component {
       base_url: this.props.base_url,
       site_id:
         document.location.host.split(':')[0] === 'localhost'
-          ? 'cms-demo.netlify.com'
+          ? 'demo.decapcms.org'
           : this.props.siteId,
       auth_endpoint: this.props.authEndpoint,
     };

diff --git a/packages/decap-cms-backend-gitlab/src/AuthenticationPage.js b/packages/decap-cms-backend-gitlab/src/AuthenticationPage.js
@@ -63,7 +63,7 @@ export default class GitLabAuthenticationPage extends React.Component {
         base_url: this.props.base_url,
         site_id:
           document.location.host.split(':')[0] === 'localhost'
-            ? 'cms-demo.netlify.com'
+            ? 'demo.decapcms.org'
             : this.props.siteId,
         auth_endpoint: this.props.authEndpoint,
       });

diff --git a/packages/decap-cms-backend-test/README.md b/packages/decap-cms-backend-test/README.md
@@ -1,6 +1,6 @@
 # Test backend
 
-The backend behind https://cms-demo.netlify.com/.
+The backend behind https://demo.decapcms.org/.
 Used for demo purposes only.
 
 ## Code structure

diff --git a/packages/decap-cms-core/CHANGELOG.md b/packages/decap-cms-core/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.2.5](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.2.4...decap-cms-core@3.2.5) (2023-10-11)
+
+
+### Bug Fixes
+
+* consider i18n strucutre when determining regex ruleString for github backend ([#6937](https://github.com/decaporg/decap-cms/issues/6937)) ([1aac51d](https://github.com/decaporg/decap-cms/commit/1aac51d864e15a6b1646eb13ca8d95ad8554b0d5))
+
+
+
+
+
 ## [3.2.4](https://github.com/decaporg/decap-cms/compare/decap-cms-core@3.2.3...decap-cms-core@3.2.4) (2023-09-06)
 
 **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
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-core",
   "description": "Decap CMS core application, see decap-cms package for the main distribution.",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "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-core/src/backend.ts b/packages/decap-cms-core/src/backend.ts
@@ -47,8 +47,10 @@ import {
   getI18nBackup,
   formatI18nBackup,
   getI18nInfo,
+  I18N_STRUCTURE,
 } from './lib/i18n';
 
+import type { I18nInfo } from './lib/i18n';
 import type AssetProxy from './valueObjects/AssetProxy';
 import type {
   CmsConfig,
@@ -308,6 +310,13 @@ function collectionDepth(collection: Collection) {
   return depth;
 }
 
+function i18nRulestring(ruleString: string, { defaultLocale, structure }: I18nInfo): string {
+  if (structure === I18N_STRUCTURE.MULTIPLE_FOLDERS) {
+    return `${defaultLocale}\\/${ruleString}`;
+  }
+  return `${ruleString}\\.${defaultLocale}\\..*`;
+}
+
 function collectionRegex(collection: Collection): RegExp | undefined {
   let ruleString = '';
 
@@ -319,8 +328,7 @@ function collectionRegex(collection: Collection): RegExp | undefined {
   }
 
   if (hasI18n(collection)) {
-    const { defaultLocale } = getI18nInfo(collection) as { defaultLocale: string };
-    ruleString += `\\.${defaultLocale}\\..*`;
+    ruleString = i18nRulestring(ruleString, getI18nInfo(collection) as I18nInfo);
   }
 
   return ruleString ? new RegExp(ruleString) : undefined;

diff --git a/packages/decap-cms-core/src/lib/i18n.ts b/packages/decap-cms-core/src/lib/i18n.ts
@@ -24,7 +24,7 @@ export function hasI18n(collection: Collection) {
   return collection.has(I18N);
 }
 
-type I18nInfo = {
+export type I18nInfo = {
   locales: string[];
   defaultLocale: string;
   structure: I18N_STRUCTURE;

diff --git a/packages/decap-cms-lib-auth/src/netlify-auth.js b/packages/decap-cms-lib-auth/src/netlify-auth.js
@@ -81,7 +81,7 @@ class Authenticator {
       return this.site_id;
     }
     const host = document.location.host.split(':')[0];
-    return host === 'localhost' ? 'cms-demo.netlify.com' : host;
+    return host === 'localhost' ? 'demo.decapcms.org' : host;
   }
 
   authenticate(options, cb) {

diff --git a/packages/decap-cms-widget-file/CHANGELOG.md b/packages/decap-cms-widget-file/CHANGELOG.md
@@ -3,6 +3,17 @@
 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-widget-file@3.0.2...decap-cms-widget-file@3.0.3) (2023-10-10)
+
+
+### Bug Fixes
+
+* change file-control default value to string ([#6934](https://github.com/decaporg/decap-cms/issues/6934)) ([90c9844](https://github.com/decaporg/decap-cms/commit/90c984477488ed08c55a42eb1d3b45accf46c832))
+
+
+
+
+
 ## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-file@3.0.1...decap-cms-widget-file@3.0.2) (2023-09-06)
 
 **Note:** Version bump only for package decap-cms-widget-file

diff --git a/packages/decap-cms-widget-file/package.json b/packages/decap-cms-widget-file/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-file",
   "description": "Widget for uploading files in Decap CMS.",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "homepage": "https://www.decapcms.org/docs/widgets/#file",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-file",
   "bugs": "https://github.com/decaporg/decap-cms/issues",

diff --git a/packages/decap-cms-widget-file/src/withFileControl.js b/packages/decap-cms-widget-file/src/withFileControl.js
@@ -202,7 +202,7 @@ function sizeOfValue(value) {
 }
 
 function valueListToArray(value) {
-  return List.isList(value) ? value.toArray() : value ?? [];
+  return List.isList(value) ? value.toArray() : value ?? '';
 }
 
 function valueListToSortableArray(value) {

diff --git a/packages/decap-cms-widget-list/CHANGELOG.md b/packages/decap-cms-widget-list/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-widget-list@3.0.2...decap-cms-widget-list@3.0.3) (2023-10-10)
+
+**Note:** Version bump only for package decap-cms-widget-list
+
+
+
+
+
 ## [3.0.2](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-list@3.0.1...decap-cms-widget-list@3.0.2) (2023-09-06)
 
 **Note:** Version bump only for package decap-cms-widget-list

diff --git a/packages/decap-cms-widget-list/package.json b/packages/decap-cms-widget-list/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-list",
   "description": "Widget for editing lists in Decap CMS.",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "homepage": "https://www.decapcms.org/docs/widgets/#list",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-list",
   "bugs": "https://github.com/decaporg/decap-cms/issues",

diff --git a/packages/decap-cms-widget-list/src/ListControl.js b/packages/decap-cms-widget-list/src/ListControl.js
@@ -593,8 +593,6 @@ export default class ListControl extends React.Component {
       }
     }
 
-    console.log('kurwa', classNameWrapper);
-
     return (
       <SortableListItem
         css={[styles.listControlItem, collapsed && styles.listControlItemCollapsed]}

diff --git a/packages/decap-cms-widget-markdown/CHANGELOG.md b/packages/decap-cms-widget-markdown/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-widget-markdown@3.0.1...decap-cms-widget-markdown@3.0.2) (2023-10-10)
+
+**Note:** Version bump only for package decap-cms-widget-markdown
+
+
+
+
+
 ## [3.0.1](https://github.com/decaporg/decap-cms/compare/decap-cms-widget-markdown@3.0.0...decap-cms-widget-markdown@3.0.1) (2023-08-25)
 
 

diff --git a/packages/decap-cms-widget-markdown/package.json b/packages/decap-cms-widget-markdown/package.json
@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-markdown",
   "description": "Widget for editing markdown in Decap CMS.",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "homepage": "https://www.decapcms.org/docs/widgets/#markdown",
   "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-markdown",
   "bugs": "https://github.com/decaporg/decap-cms/issues",

diff --git a/packages/decap-cms-widget-markdown/src/MarkdownControl/plugins/shortcodes/insertShortcode.js b/packages/decap-cms-widget-markdown/src/MarkdownControl/plugins/shortcodes/insertShortcode.js
@@ -9,8 +9,6 @@ function insertShortcode(editor, pluginConfig) {
     .filter(field => field.has('default'))
     .map(field => field.get('default'));
 
-  // console.log(defaultValues);
-
   const nodeData = {
     type: 'shortcode',
     id: pluginConfig.id,
@@ -28,7 +26,6 @@ function insertShortcode(editor, pluginConfig) {
   }
 
   Transforms.insertNodes(editor, nodeData);
-  console.log('handleInsertShortcode', pluginConfig);
 }
 
 export default insertShortcode;
diff --git a/packages/decap-cms/CHANGELOG.md b/packages/decap-cms/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.9](https://github.com/decaporg/decap-cms/compare/decap-cms@3.0.8...decap-cms@3.0.9) (2023-10-11)
+
+**Note:** Version bump only for package decap-cms
+
+
+
+
+
+## [3.0.8](https://github.com/decaporg/decap-cms/compare/decap-cms@3.0.7...decap-cms@3.0.8) (2023-10-10)
+
+**Note:** Version bump only for package decap-cms
+
+
+
+
+
 ## [3.0.7](https://github.com/decaporg/decap-cms/compare/decap-cms@3.0.6...decap-cms@3.0.7) (2023-09-06)
 
 **Note:** Version bump only for package decap-cms

diff --git 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.0.7",
+  "version": "3.0.9",
   "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.0.7",
+    "decap-cms-app": "^3.0.9",
     "decap-cms-media-library-cloudinary": "^3.0.1",
     "decap-cms-media-library-uploadcare": "^3.0.0",
     "file-loader": "^6.2.0",

diff --git a/website/content/docs/configuration-options.md b/website/content/docs/configuration-options.md
@@ -14,7 +14,7 @@ Alternatively, you can specify a custom config file using a link tag:
 <link href="path/to/config.yml" type="text/yaml" rel="cms-config-url">
 ```
 
-To see working configuration examples, you can [start from a template](../start-with-a-template) or check out the [CMS demo site](https://cms-demo.netlify.com). (No login required: click the login button and the CMS will open.) You can refer to the demo [configuration code](https://github.com/decaporg/decap-cms/blob/master/dev-test/config.yml) to see how each option was configured.
+To see working configuration examples, you can [start from a template](../start-with-a-template) or check out the [CMS demo site](https://demo.decapcms.org). (No login required: click the login button and the CMS will open.) You can refer to the demo [configuration code](https://github.com/decaporg/decap-cms/blob/master/dev-test/config.yml) to see how each option was configured.
 
 You can find details about all configuration options below. Note that [YAML syntax](https://en.wikipedia.org/wiki/YAML#Basic_components) allows lists and objects to be written in block or inline style, and the code samples below include a mix of both.
 

diff --git a/website/content/docs/examples.md b/website/content/docs/examples.md
@@ -12,14 +12,14 @@ Example | Tools | Type | Source | More info |
 [This Developing Journey](https://briandouglas.me) | middleman | blog | [bdougie/blog](https://github.com/bdougie/blog) | [blog post](https://www.netlify.com/blog/2017/04/20/creating-a-blog-with-middleman-and-netlify-cms/)
 [Jamstack Recipes](https://jamstack-cms.netlify.com) | Hugo, Azure | demo | [hlaueriksson/jamstack-cms](https://github.com/hlaueriksson/jamstack-cms) | [blog post](http://conductofcode.io/post/managing-content-for-a-jamstack-site-with-netlify-cms/)
 [Bael](https://bael-theme.jake101.com/) | Vue, Nuxt | blog | [jake-101/bael-template](https://github.com/jake-101/bael-template) | [blog post](https://bael-theme.jake101.com/blog/2018-06-19-top-10-reasons-why)
-[Forest Garden Wales](https://www.forestgarden.wales/) | Hugo | blog | [forestgardenwales/forestgarden.wales](https://github.com/forestgardenwales/forestgarden.wales) | [blog post](https://www.forestgarden.wales/blog/now-using-netlify-cms/)
+[Forest Garden Wales](https://github.com/forestgardenwales/forestgarden.wales) | Hugo | blog | [forestgardenwales/forestgarden.wales](https://github.com/forestgardenwales/forestgarden.wales) | [blog post](https://www.forestgarden.wales/blog/now-using-netlify-cms/)
 [Jekyll Demo](https://jekyll-netlifycms.netlify.com/) | Jekyll, Gulp | demo | [NickStees/jekyll-cms](https://github.com/NickStees/jekyll-cms) | [read me](https://github.com/NickStees/jekyll-cms)
 [Jekyll feat Alembic Theme Demo](https://alembic-kit-demo.netlify.com/) | Jekyll | demo | [DavidDarnes/alembic-netlifycms-kit](https://github.com/daviddarnes/alembic-netlifycms-kit) | [read me](https://github.com/daviddarnes/alembic-netlifycms-kit#starter-kit-for-alembic-with-netlify-cms)
 [Eleventy Starter Project](https://eleventy-netlify-boilerplate.netlify.com/) | Eleventy | demo | [danurbanowicz/eleventy-netlify-boilerplate](https://github.com/danurbanowicz/eleventy-netlify-boilerplate) | [read me](https://github.com/danurbanowicz/eleventy-netlify-boilerplate)
 [YellowCake - Complete website with blog](https://yellowcake.netlify.com) | Gatsby, Netlify-CMS, Uploadcare | demo | [thriveweb/yellowcake](https://github.com/thriveweb/yellowcake/) | [blog post](https://thriveweb.com.au/the-lab/yellowcake-gatsby-react-js-starter-project/)
 [Vue.js - Nuxt.js Starter Project](https://github.com/renestalder/nuxt-netlify-cms-starter-template) | Vue, Nuxt | demo | [renestalder/nuxt-netlify-cms-starter-template](https://github.com/renestalder/nuxt-netlify-cms-starter-template) | [read me](https://github.com/renestalder/nuxt-netlify-cms-starter-template)
-[Hexo Demo](https://hexocms.imst.xyz/) | Hexo | demo | [DemoMacro/Hexo-NetlifyCMS](https://github.com/DemoMacro/Hexo-NetlifyCMS) | [read me](https://github.com/DemoMacro/Hexo-NetlifyCMS)
-[Gitbook Demo](https://gitbook.imst.xyz/) | Gitbook | demo | [DemoMacro/Gitbook-NetlifyCMS](https://github.com/DemoMacro/Gitbook-NetlifyCMS) | [read me](https://github.com/DemoMacro/Gitbook-NetlifyCMS)
+[Hexo Demo](https://hexo-boilerplate.netlify.app/) | Hexo | demo | [DemoMacro/Hexo-NetlifyCMS](https://github.com/DemoMacro/Hexo-NetlifyCMS) | [read me](https://github.com/DemoMacro/Hexo-NetlifyCMS)
+[Gitbook Demo](https://gitbook-boilerplate.netlify.app/) | Gitbook | demo | [DemoMacro/Gitbook-NetlifyCMS](https://github.com/DemoMacro/Gitbook-NetlifyCMS) | [read me](https://github.com/DemoMacro/Gitbook-NetlifyCMS)
 [VuePress Demo](https://vuedn.netlify.app/) | VuePress | demo | [NdagiStanley/VueDN](https://github.com/NdagiStanley/VueDN) | [read me](https://github.com/NdagiStanley/VueDN)
 [Jigsaw Blog Starter Template Demo](https://jigsaw-blog-netlify-netlifycms-template.netlify.com/) | Jigsaw | demo | [erickpatrick/jigsaw-blog-netlify-netlifycms-template](https://github.com/erickpatrick/jigsaw-blog-netlify-netlifycms-template) | [blog post](https://www.erickpatrick.net/blog/augmenting-tightenco-jigsaw-with-netlifycms/)
 [Nuxt & NetlifyCMS Boilerplate](https://nuxt-netlifycms-boilerplate.netlify.com/) | Vue, Nuxt | demo | [tylermercer/nuxt-netlifycms-boilerplate](https://github.com/tylermercer/nuxt-netlifycms-boilerplate) | [read me](https://github.com/tylermercer/nuxt-netlifycms-boilerplate)

diff --git a/website/content/docs/intro.md b/website/content/docs/intro.md
@@ -31,7 +31,7 @@ If you hook up Decap CMS to your website, you're basically adding a tool for con
 
 ### Find out more
 
-- Get a feel for the UI in the [demo site](https://cms-demo.netlify.com). (No login required. Click the login button to go straight to the CMS editor UI.)
+- Get a feel for the UI in the [demo site](https://demo.decapcms.org). (No login required. Click the login button to go straight to the CMS editor UI.)
 - [Start with a template](../start-with-a-template/) to make a Decap CMS-enabled site of your own.
 - Configure your existing site by following a [tutorial](../add-to-your-site/) or checking [configuration options](../configuration-options).
 - Ask questions and share ideas in the Decap CMS [community chat](https://decapcms.org/chat).

diff --git a/website/content/docs/test-backend.md b/website/content/docs/test-backend.md
@@ -4,7 +4,7 @@ group: Accounts
 weight: 50
 ---
 
-You can use the `test-repo` backend to try out Decap CMS without connecting to a Git repo. With this backend, you can write and publish content normally, but any changes will disappear when you reload the page. This backend powers the Decap CMS [demo site](https://cms-demo.netlify.com/).
+You can use the `test-repo` backend to try out Decap CMS without connecting to a Git repo. With this backend, you can write and publish content normally, but any changes will disappear when you reload the page. This backend powers the Decap CMS [demo site](https://demo.decapcms.org/).
 
 **Note:** The `test-repo` backend can't access your local file system, nor does it connect to a Git repo, thus you won't see any existing files while using it.
 

diff --git a/website/content/docs/widgets.md b/website/content/docs/widgets.md
@@ -8,7 +8,7 @@ Widgets define the data type and interface for entry fields. Decap CMS comes wit
 
 Widgets are specified as collection fields in the Decap CMS `config.yml` file. Note that [YAML syntax](https://en.wikipedia.org/wiki/YAML#Basic_components) allows lists and objects to be written in block or inline style, and the code samples below include a mix of both.
 
-To see working examples of all of the built-in widgets, try making a 'Kitchen Sink' collection item on the [CMS demo site](https://cms-demo.netlify.com). (No login required: click the login button and the CMS will open.) You can refer to the demo [configuration code](https://github.com/decaporg/decap-cms/blob/master/dev-test/config.yml) to see how each field was configured.
+To see working examples of all of the built-in widgets, try making a 'Kitchen Sink' collection item on the [CMS demo site](https://demo.decapcms.org). (No login required: click the login button and the CMS will open.) You can refer to the demo [configuration code](https://github.com/decaporg/decap-cms/blob/master/dev-test/config.yml) to see how each field was configured.
 
 ## Common widget options