diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 4e2b3847cae7..badb3f6fea1d 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -40,7 +40,7 @@ jobs: - name: log versions run: node --version && npm --version && yarn --version if: ${{ needs.changes.outputs.cms == 'true' }} - - name: install dependecies + - name: install dependencies run: yarn --frozen-lockfile --network-timeout 1000000 && yarn bootstrap if: ${{ needs.changes.outputs.cms == 'true' }} - name: run unit tests diff --git a/CHANGELOG.md b/CHANGELOG.md index a39918ed3516..17c2a7a60b9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -236,7 +236,7 @@ Fixes date widget default format, collection load failure when entry fails ## 1.3.1 (March 3, 2018) ([demo](https://1-3-1--cms-demo.netlify.com/)) Fixes editorial workflow failure for unknown collections. -* Report editorial workflow load errors, ignore entries with unkown collections ([@erquhart](https://github.com/erquhart) in [#1153](https://github.com/decaporg/decap-cms/pull/1153)) +* Report editorial workflow load errors, ignore entries with unknown collections ([@erquhart](https://github.com/erquhart) in [#1153](https://github.com/decaporg/decap-cms/pull/1153)) ## 1.3.0 (February 27, 2018) ([demo](https://1-3-0--cms-demo.netlify.com/)) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68ce8ab5c206..6d09297846b7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -146,7 +146,7 @@ Decap CMS uses the [Forking Workflow](https://www.atlassian.com/git/tutorials/co `yarn start` spawns a development server and uses `dev-test/config.yml` and `dev-test/index.html` to serve the CMS. In order to debug a specific issue follow the next steps: -1. Replace `dev-test/config.yml` with the relevant `config.yml`. If you want to test the backend, make sure that the `backend` property of the config indicates which backend you use (Github, Gitlab, Bitbucket etc) and path to the repo. +1. Replace `dev-test/config.yml` with the relevant `config.yml`. If you want to test the backend, make sure that the `backend` property of the config indicates which backend you use (GitHub, Gitlab, Bitbucket etc) and path to the repo. ```js backend: diff --git a/README.md b/README.md index ca719bb12140..ee012b6fc51c 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ New contributors are always welcome! Check out [CONTRIBUTING.md](https://github. ## Change Log This project adheres to [Semantic Versioning](http://semver.org/). -Every release is documented on the Github [Releases](https://github.com/decaporg/decap-cms/releases) page. +Every release is documented on the GitHub [Releases](https://github.com/decaporg/decap-cms/releases) page. ## License diff --git a/cypress/e2e/editorial_workflow_spec_github_backend_graphql.js b/cypress/e2e/editorial_workflow_spec_github_backend_graphql.js index e350fe787505..fce34030f54e 100644 --- a/cypress/e2e/editorial_workflow_spec_github_backend_graphql.js +++ b/cypress/e2e/editorial_workflow_spec_github_backend_graphql.js @@ -4,7 +4,7 @@ import { entry1, entry2, entry3 } from './common/entries'; const backend = 'github'; -describe('Github Backend Editorial Workflow - GraphQL API', () => { +describe('GitHub Backend Editorial Workflow - GraphQL API', () => { const taskResult = { data: {} }; before(() => { diff --git a/cypress/e2e/editorial_workflow_spec_github_backend_graphql_open_authoring.js b/cypress/e2e/editorial_workflow_spec_github_backend_graphql_open_authoring.js index eae3ff8731ae..05da8ce0fa9a 100644 --- a/cypress/e2e/editorial_workflow_spec_github_backend_graphql_open_authoring.js +++ b/cypress/e2e/editorial_workflow_spec_github_backend_graphql_open_authoring.js @@ -4,7 +4,7 @@ import { entry1, entry2, entry3 } from './common/entries'; const backend = 'github'; -describe('Github Backend Editorial Workflow - GraphQL API - Open Authoring', () => { +describe('GitHub Backend Editorial Workflow - GraphQL API - Open Authoring', () => { const taskResult = { data: {} }; before(() => { diff --git a/cypress/e2e/editorial_workflow_spec_github_backend_rest.js b/cypress/e2e/editorial_workflow_spec_github_backend_rest.js index 45f0fbc81647..cffc1490e948 100644 --- a/cypress/e2e/editorial_workflow_spec_github_backend_rest.js +++ b/cypress/e2e/editorial_workflow_spec_github_backend_rest.js @@ -4,7 +4,7 @@ import { entry1, entry2, entry3 } from './common/entries'; const backend = 'github'; -describe('Github Backend Editorial Workflow - REST API', () => { +describe('GitHub Backend Editorial Workflow - REST API', () => { let taskResult = { data: {} }; before(() => { diff --git a/cypress/e2e/editorial_workflow_spec_github_backend_rest_open_authoring.js b/cypress/e2e/editorial_workflow_spec_github_backend_rest_open_authoring.js index 4017cf0df89f..a3a180fbe4b3 100644 --- a/cypress/e2e/editorial_workflow_spec_github_backend_rest_open_authoring.js +++ b/cypress/e2e/editorial_workflow_spec_github_backend_rest_open_authoring.js @@ -4,7 +4,7 @@ import { entry1, entry2, entry3 } from './common/entries'; const backend = 'github'; -describe('Github Backend Editorial Workflow - REST API - Open Authoring', () => { +describe('GitHub Backend Editorial Workflow - REST API - Open Authoring', () => { let taskResult = { data: {} }; before(() => { diff --git a/cypress/e2e/markdown_widget_list_spec.js b/cypress/e2e/markdown_widget_list_spec.js index 81372906b185..99d20f6616e3 100644 --- a/cypress/e2e/markdown_widget_list_spec.js +++ b/cypress/e2e/markdown_widget_list_spec.js @@ -337,7 +337,7 @@ describe('Markdown widget', () => { }); }); - // while this works on dev environemnt, it will always fail in cypress - has something to do with text selection + // while this works on dev environment, it will always fail in cypress - has something to do with text selection // it('affects only selected list items', () => { // cy // .clickUnorderedListButton() diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can change entry status from fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can change entry status from fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can change entry status from fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can change entry status from fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry on fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry on fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry on fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry on fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can create an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can delete review entry from fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can delete review entry from fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can delete review entry from fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can delete review entry from fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can publish an editorial workflow entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can publish an editorial workflow entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can publish an editorial workflow entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can publish an editorial workflow entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can return entry to draft and delete it.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can return entry to draft and delete it.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can return entry to draft and delete it.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can return entry to draft and delete it.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can update a draft entry on fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can update a draft entry on fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can update a draft entry on fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can update a draft entry on fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can update an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can update an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__can update an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__can update an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__successfully forks repository and loads.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__successfully forks repository and loads.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__successfully forks repository and loads.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__successfully forks repository and loads.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__successfully loads.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__successfully loads.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API - Open Authoring__successfully loads.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API - Open Authoring__successfully loads.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can change status on and publish multiple entries.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change workflow status.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can change workflow status.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can change workflow status.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can change workflow status.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can create an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can create an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can create an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can create an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can delete an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can delete an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can delete an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can delete an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can publish an editorial workflow entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can publish an editorial workflow entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can publish an editorial workflow entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can publish an editorial workflow entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can update an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can update an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can update an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can update an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can update workflow status from within the editor.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can update workflow status from within the editor.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__can update workflow status from within the editor.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__can update workflow status from within the editor.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__successfully loads.json b/cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__successfully loads.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - GraphQL API__successfully loads.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - GraphQL API__successfully loads.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can change entry status from fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can change entry status from fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can change entry status from fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can change entry status from fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can create an entry on fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can create an entry on fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can create an entry on fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can create an entry on fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can create an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can create an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can create an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can create an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can delete review entry from fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can delete review entry from fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can delete review entry from fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can delete review entry from fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can publish an editorial workflow entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can publish an editorial workflow entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can publish an editorial workflow entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can publish an editorial workflow entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can return entry to draft and delete it.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can return entry to draft and delete it.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can return entry to draft and delete it.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can return entry to draft and delete it.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can update a draft entry on fork.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can update a draft entry on fork.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can update a draft entry on fork.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can update a draft entry on fork.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can update an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can update an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__can update an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__can update an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__successfully forks repository and loads.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__successfully forks repository and loads.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__successfully forks repository and loads.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__successfully forks repository and loads.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__successfully loads.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__successfully loads.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API - Open Authoring__successfully loads.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API - Open Authoring__successfully loads.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can change status on and publish multiple entries.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can change workflow status.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can change workflow status.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__can change workflow status.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can change workflow status.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can create an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can create an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__can create an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can create an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can delete an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can delete an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__can delete an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can delete an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can publish an editorial workflow entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can publish an editorial workflow entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__can publish an editorial workflow entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can publish an editorial workflow entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can update an entry.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can update an entry.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__can update an entry.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can update an entry.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__can update workflow status from within the editor.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can update workflow status from within the editor.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__can update workflow status from within the editor.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__can update workflow status from within the editor.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow - REST API__successfully loads.json b/cypress/fixtures/GitHub Backend Editorial Workflow - REST API__successfully loads.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow - REST API__successfully loads.json rename to cypress/fixtures/GitHub Backend Editorial Workflow - REST API__successfully loads.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow Migration - REST API__migrate from 2.10.24 to latest.json b/cypress/fixtures/GitHub Backend Editorial Workflow Migration - REST API__migrate from 2.10.24 to latest.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow Migration - REST API__migrate from 2.10.24 to latest.json rename to cypress/fixtures/GitHub Backend Editorial Workflow Migration - REST API__migrate from 2.10.24 to latest.json diff --git a/cypress/fixtures/Github Backend Editorial Workflow Migration - REST API__migrate from 2.9.7 to latest.json b/cypress/fixtures/GitHub Backend Editorial Workflow Migration - REST API__migrate from 2.9.7 to latest.json similarity index 100% rename from cypress/fixtures/Github Backend Editorial Workflow Migration - REST API__migrate from 2.9.7 to latest.json rename to cypress/fixtures/GitHub Backend Editorial Workflow Migration - REST API__migrate from 2.9.7 to latest.json diff --git a/dev-test/backends/test/index.html b/dev-test/backends/test/index.html index 9e61b5da04c1..8147bcc0118d 100644 --- a/dev-test/backends/test/index.html +++ b/dev-test/backends/test/index.html @@ -22,7 +22,7 @@ }, _faqs: { "what-is-decap-cms.md": { - content: "---\ntitle: What is Decap CMS?\ndate: 2015-11-02T00:00.000Z\n---\n\n# Decap CMS is Content Manager for Static Site Generators\n\nStatic sites are many times faster, cheaper and safer and traditional dynamic websites.\n\nModern static site generators like Jekyll, Middleman, Roots or Hugo are powerful publishing and development systems, but when we build sites for non-technical users, we need a layer on top of them.\n\nDecap CMS is there to let your marketing team push new content to your public site, or to let technical writers work on your documentation.\n\nDecap CMS integrates with Git and turns normal content editors into git comitters.\n\n" + content: "---\ntitle: What is Decap CMS?\ndate: 2015-11-02T00:00.000Z\n---\n\n# Decap CMS is Content Manager for Static Site Generators\n\nStatic sites are many times faster, cheaper and safer and traditional dynamic websites.\n\nModern static site generators like Jekyll, Middleman, Roots or Hugo are powerful publishing and development systems, but when we build sites for non-technical users, we need a layer on top of them.\n\nDecap CMS is there to let your marketing team push new content to your public site, or to let technical writers work on your documentation.\n\nDecap CMS integrates with Git and turns normal content editors into git committers.\n\n" }, "what-is-jam-stack.md": { content: "---\ntitle: What is the “JAM Stack”?\ndate: 2015-11-02T00:00.000Z\n---\n\n# The JAM stack is a new way of building websites and apps that are fast, secure and simple to work with.\n\nJAM stands for JavaScript, APIs and Markup. It's the fastest growing new stack for building websites and apps: no more servers, host all your front-end on a CDN and use APIs for any moving parts.\n\n" diff --git a/dev-test/index.html b/dev-test/index.html index 9e61b5da04c1..8147bcc0118d 100644 --- a/dev-test/index.html +++ b/dev-test/index.html @@ -22,7 +22,7 @@ }, _faqs: { "what-is-decap-cms.md": { - content: "---\ntitle: What is Decap CMS?\ndate: 2015-11-02T00:00.000Z\n---\n\n# Decap CMS is Content Manager for Static Site Generators\n\nStatic sites are many times faster, cheaper and safer and traditional dynamic websites.\n\nModern static site generators like Jekyll, Middleman, Roots or Hugo are powerful publishing and development systems, but when we build sites for non-technical users, we need a layer on top of them.\n\nDecap CMS is there to let your marketing team push new content to your public site, or to let technical writers work on your documentation.\n\nDecap CMS integrates with Git and turns normal content editors into git comitters.\n\n" + content: "---\ntitle: What is Decap CMS?\ndate: 2015-11-02T00:00.000Z\n---\n\n# Decap CMS is Content Manager for Static Site Generators\n\nStatic sites are many times faster, cheaper and safer and traditional dynamic websites.\n\nModern static site generators like Jekyll, Middleman, Roots or Hugo are powerful publishing and development systems, but when we build sites for non-technical users, we need a layer on top of them.\n\nDecap CMS is there to let your marketing team push new content to your public site, or to let technical writers work on your documentation.\n\nDecap CMS integrates with Git and turns normal content editors into git committers.\n\n" }, "what-is-jam-stack.md": { content: "---\ntitle: What is the “JAM Stack”?\ndate: 2015-11-02T00:00.000Z\n---\n\n# The JAM stack is a new way of building websites and apps that are fast, secure and simple to work with.\n\nJAM stands for JavaScript, APIs and Markup. It's the fastest growing new stack for building websites and apps: no more servers, host all your front-end on a CDN and use APIs for any moving parts.\n\n" diff --git a/packages/decap-cms-app/CHANGELOG.md b/packages/decap-cms-app/CHANGELOG.md index 0635a6c2878c..e8726680b91f 100644 --- a/packages/decap-cms-app/CHANGELOG.md +++ b/packages/decap-cms-app/CHANGELOG.md @@ -1201,7 +1201,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -* **deps:** update color widget dependecy ([#4512](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app/issues/4512)) ([a0176e4](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app/commit/a0176e457223da65dddf983707704dd4441553a0)) +* **deps:** update color widget dependency ([#4512](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app/issues/4512)) ([a0176e4](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-app/commit/a0176e457223da65dddf983707704dd4441553a0)) diff --git a/packages/decap-cms-backend-git-gateway/CHANGELOG.md b/packages/decap-cms-backend-git-gateway/CHANGELOG.md index b7da5a5b8d48..5ef9d942e45b 100644 --- a/packages/decap-cms-backend-git-gateway/CHANGELOG.md +++ b/packages/decap-cms-backend-git-gateway/CHANGELOG.md @@ -617,7 +617,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -* **backend-github:** make non-Large Media previews work with Git Gateway+Github ([#2151](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-git-gateway/issues/2151)) ([63582dc](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-git-gateway/commit/63582dc)) +* **backend-github:** make non-Large Media previews work with Git Gateway+GitHub ([#2151](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-git-gateway/issues/2151)) ([63582dc](https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-backend-git-gateway/commit/63582dc)) diff --git a/packages/decap-cms-backend-github/README.md b/packages/decap-cms-backend-github/README.md index a11ddfe05ad9..aa601f1b292d 100644 --- a/packages/decap-cms-backend-github/README.md +++ b/packages/decap-cms-backend-github/README.md @@ -1,6 +1,6 @@ # GitHub backend -An abstraction layer between the CMS and [Github](https://docs.github.com/en/rest) +An abstraction layer between the CMS and [GitHub](https://docs.github.com/en/rest) ## Code structure diff --git a/packages/decap-cms-core/CHANGELOG.md b/packages/decap-cms-core/CHANGELOG.md index 9d7aafc3de74..df7c150ff772 100644 --- a/packages/decap-cms-core/CHANGELOG.md +++ b/packages/decap-cms-core/CHANGELOG.md @@ -71,7 +71,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### 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)) +* consider i18n structure 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)) diff --git a/packages/decap-cms-core/src/backend.ts b/packages/decap-cms-core/src/backend.ts index 0f31fc8889de..43442e4397ee 100644 --- a/packages/decap-cms-core/src/backend.ts +++ b/packages/decap-cms-core/src/backend.ts @@ -24,7 +24,7 @@ import { selectAllowNewEntries, selectAllowDeletion, selectFolderEntryExtension, - selectInferedField, + selectInferredField, selectMediaFolders, selectFieldsComments, selectHasMetaPath, @@ -627,12 +627,12 @@ export class Backend { }); } else { searchFields = [ - selectInferedField(collection, 'title'), - selectInferedField(collection, 'shortTitle'), - selectInferedField(collection, 'author'), + selectInferredField(collection, 'title'), + selectInferredField(collection, 'shortTitle'), + selectInferredField(collection, 'author'), ...summaryFields.map(elem => { if (dateParsers[elem]) { - return selectInferedField(collection, 'date'); + return selectInferredField(collection, 'date'); } return elem; }), @@ -656,7 +656,7 @@ export class Backend { if (errors.length > 0) { // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore - throw new Error({ message: 'Errors ocurred while searching entries locally!', errors }); + throw new Error({ message: 'Errors occurred while searching entries locally!', errors }); } const hits = entries diff --git a/packages/decap-cms-core/src/components/App/Header.js b/packages/decap-cms-core/src/components/App/Header.js index 01c55e0ef7ea..d55e84782c2a 100644 --- a/packages/decap-cms-core/src/components/App/Header.js +++ b/packages/decap-cms-core/src/components/App/Header.js @@ -160,7 +160,7 @@ class Header extends React.Component { showMediaButton, } = this.props; - const createableCollections = collections + const creatableCollections = collections .filter(collection => collection.get('create')) .toList(); @@ -198,7 +198,7 @@ class Header extends React.Component { - {createableCollections.size > 0 && ( + {creatableCollections.size > 0 && ( ( {t('app.header.quickAdd')} @@ -207,7 +207,7 @@ class Header extends React.Component { dropdownWidth="160px" dropdownPosition="left" > - {createableCollections.map(collection => ( + {creatableCollections.map(collection => ( f.get('name') === inferedFields.imageField && f.get('widget') === 'image'), + ?.find(f => f.get('name') === inferredFields.imageField && f.get('widget') === 'image'), isLoadingAsset, }; } diff --git a/packages/decap-cms-core/src/components/Collection/Entries/EntryListing.js b/packages/decap-cms-core/src/components/Collection/Entries/EntryListing.js index 3e206f518fa9..6947a426ce34 100644 --- a/packages/decap-cms-core/src/components/Collection/Entries/EntryListing.js +++ b/packages/decap-cms-core/src/components/Collection/Entries/EntryListing.js @@ -5,7 +5,7 @@ import styled from '@emotion/styled'; import { Waypoint } from 'react-waypoint'; import { Map } from 'immutable'; -import { selectFields, selectInferedField } from '../../../reducers/collections'; +import { selectFields, selectInferredField } from '../../../reducers/collections'; import EntryCard from './EntryCard'; const CardsGrid = styled.ul` @@ -39,20 +39,20 @@ export default class EntryListing extends React.Component { }; inferFields = collection => { - const titleField = selectInferedField(collection, 'title'); - const descriptionField = selectInferedField(collection, 'description'); - const imageField = selectInferedField(collection, 'image'); + const titleField = selectInferredField(collection, 'title'); + const descriptionField = selectInferredField(collection, 'description'); + const imageField = selectInferredField(collection, 'image'); const fields = selectFields(collection); - const inferedFields = [titleField, descriptionField, imageField]; + const inferredFields = [titleField, descriptionField, imageField]; const remainingFields = - fields && fields.filter(f => inferedFields.indexOf(f.get('name')) === -1); + fields && fields.filter(f => inferredFields.indexOf(f.get('name')) === -1); return { titleField, descriptionField, imageField, remainingFields }; }; renderCardsForSingleCollection = () => { const { collections, entries, viewStyle } = this.props; - const inferedFields = this.inferFields(collections); - const entryCardProps = { collection: collections, inferedFields, viewStyle }; + const inferredFields = this.inferFields(collections); + const entryCardProps = { collection: collections, inferredFields, viewStyle }; return entries.map((entry, idx) => ); }; @@ -63,8 +63,8 @@ export default class EntryListing extends React.Component { const collectionName = entry.get('collection'); const collection = collections.find(coll => coll.get('name') === collectionName); const collectionLabel = !isSingleCollectionInList && collection.get('label'); - const inferedFields = this.inferFields(collection); - const entryCardProps = { collection, entry, inferedFields, collectionLabel }; + const inferredFields = this.inferFields(collection); + const entryCardProps = { collection, entry, inferredFields, collectionLabel }; return ; }); }; diff --git a/packages/decap-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js b/packages/decap-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js index 4fbcd02ec6c6..30924a1491fb 100644 --- a/packages/decap-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js +++ b/packages/decap-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js @@ -14,7 +14,11 @@ import { getRemarkPlugins, } from '../../../lib/registry'; import { ErrorBoundary } from '../../UI'; -import { selectTemplateName, selectInferedField, selectField } from '../../../reducers/collections'; +import { + selectTemplateName, + selectInferredField, + selectField, +} from '../../../reducers/collections'; import { boundGetAsset } from '../../../actions/media'; import { selectIsLoadingAsset } from '../../../reducers/medias'; import { INFERABLE_FIELDS } from '../../../constants/fieldInference'; @@ -55,17 +59,17 @@ export class PreviewPane extends React.Component { ); }; - inferedFields = {}; + inferredFields = {}; inferFields() { - const titleField = selectInferedField(this.props.collection, 'title'); - const shortTitleField = selectInferedField(this.props.collection, 'shortTitle'); - const authorField = selectInferedField(this.props.collection, 'author'); - - this.inferedFields = {}; - if (titleField) this.inferedFields[titleField] = INFERABLE_FIELDS.title; - if (shortTitleField) this.inferedFields[shortTitleField] = INFERABLE_FIELDS.shortTitle; - if (authorField) this.inferedFields[authorField] = INFERABLE_FIELDS.author; + const titleField = selectInferredField(this.props.collection, 'title'); + const shortTitleField = selectInferredField(this.props.collection, 'shortTitle'); + const authorField = selectInferredField(this.props.collection, 'author'); + + this.inferredFields = {}; + if (titleField) this.inferredFields[titleField] = INFERABLE_FIELDS.title; + if (shortTitleField) this.inferredFields[shortTitleField] = INFERABLE_FIELDS.shortTitle; + if (authorField) this.inferredFields[authorField] = INFERABLE_FIELDS.author; } /** @@ -100,15 +104,15 @@ export class PreviewPane extends React.Component { } const labelledWidgets = ['string', 'text', 'number']; - const inferedField = Object.entries(this.inferedFields) + const inferredField = Object.entries(this.inferredFields) .filter(([key]) => { const fieldToMatch = selectField(this.props.collection, key); return fieldToMatch === field; }) .map(([, value]) => value)[0]; - if (inferedField) { - value = inferedField.defaultPreview(value); + if (inferredField) { + value = inferredField.defaultPreview(value); } else if ( value && labelledWidgets.indexOf(field.get('widget')) !== -1 && diff --git a/packages/decap-cms-core/src/components/Editor/__tests__/Editor.spec.js b/packages/decap-cms-core/src/components/Editor/__tests__/Editor.spec.js index cdb1d7bc8992..7dc3ed417aa6 100644 --- a/packages/decap-cms-core/src/components/Editor/__tests__/Editor.spec.js +++ b/packages/decap-cms-core/src/components/Editor/__tests__/Editor.spec.js @@ -138,7 +138,7 @@ describe('Editor', () => { expect(props.loadEntry).toHaveBeenCalledWith(props.collection, 'slug'); }); - it('should load entires when entries are not loaded when mounting', () => { + it('should load entries when entries are not loaded when mounting', () => { render( { expect(props.loadEntries).toHaveBeenCalledWith(props.collection); }); - it('should not load entires when entries are loaded when mounting', () => { + it('should not load entries when entries are loaded when mounting', () => { render( { + integrationsConfig.get('providers').forEach((providerData, providerName) => { switch (providerName) { case 'algolia': integrationInstances = integrationInstances.set('algolia', new Algolia(providerData)); @@ -24,11 +24,11 @@ export function resolveIntegrations(interationsConfig, getToken) { export const getIntegrationProvider = (function () { let integrations = null; - return (interationsConfig, getToken, provider) => { + return (integrationsConfig, getToken, provider) => { if (integrations) { return integrations.get(provider); } else { - integrations = resolveIntegrations(interationsConfig, getToken); + integrations = resolveIntegrations(integrationsConfig, getToken); return integrations.get(provider); } }; diff --git a/packages/decap-cms-core/src/lib/__tests__/formatters.spec.js b/packages/decap-cms-core/src/lib/__tests__/formatters.spec.js index 283f5d499686..8deb7a4415fb 100644 --- a/packages/decap-cms-core/src/lib/__tests__/formatters.spec.js +++ b/packages/decap-cms-core/src/lib/__tests__/formatters.spec.js @@ -453,8 +453,8 @@ describe('formatters', () => { }); it('should infer date field when preview_path_date_field is not configured', () => { - const { selectInferedField } = require('../../reducers/collections'); - selectInferedField.mockReturnValue('date'); + const { selectInferredField } = require('../../reducers/collections'); + selectInferredField.mockReturnValue('date'); const date = new Date('2020-01-02T13:28:27.679Z'); expect( @@ -542,8 +542,8 @@ describe('formatters', () => { describe('summaryFormatter', () => { it('should return summary from template', () => { - const { selectInferedField } = require('../../reducers/collections'); - selectInferedField.mockReturnValue('date'); + const { selectInferredField } = require('../../reducers/collections'); + selectInferredField.mockReturnValue('date'); const date = new Date('2020-01-02T13:28:27.679Z'); const entry = fromJS({ data: { date, title: 'title' } }); @@ -553,8 +553,8 @@ describe('formatters', () => { }); it('should handle filename and extension variables', () => { - const { selectInferedField } = require('../../reducers/collections'); - selectInferedField.mockReturnValue('date'); + const { selectInferredField } = require('../../reducers/collections'); + selectInferredField.mockReturnValue('date'); const date = new Date('2020-01-02T13:28:27.679Z'); const entry = fromJS({ path: 'post.md', data: { date, title: 'title' } }); @@ -566,8 +566,8 @@ describe('formatters', () => { }); it('should handle the dirname variable in a regular collection', () => { - const { selectInferedField } = require('../../reducers/collections'); - selectInferedField.mockReturnValue('date'); + const { selectInferredField } = require('../../reducers/collections'); + selectInferredField.mockReturnValue('date'); const date = new Date('2020-01-02T13:28:27.679Z'); const entry = fromJS({ @@ -585,8 +585,8 @@ describe('formatters', () => { }); it('should handle the dirname variable in a nested collection', () => { - const { selectInferedField } = require('../../reducers/collections'); - selectInferedField.mockReturnValue('date'); + const { selectInferredField } = require('../../reducers/collections'); + selectInferredField.mockReturnValue('date'); const date = new Date('2020-01-02T13:28:27.679Z'); const entry = fromJS({ diff --git a/packages/decap-cms-core/src/lib/formatters.ts b/packages/decap-cms-core/src/lib/formatters.ts index edb37e0ebbd0..01e98806350a 100644 --- a/packages/decap-cms-core/src/lib/formatters.ts +++ b/packages/decap-cms-core/src/lib/formatters.ts @@ -5,7 +5,7 @@ import { stripIndent } from 'common-tags'; import { selectIdentifier, selectField, - selectInferedField, + selectInferredField, getFileFromSlug, } from '../reducers/collections'; import { sanitizeSlug } from './urlHelper'; @@ -183,7 +183,7 @@ export function previewUrlFormatter( let fields = entry.get('data') as Map; fields = addFileTemplateFields(entry.get('path'), fields, collection.get('folder')); - const dateFieldName = getDateField() || selectInferedField(collection, 'date'); + const dateFieldName = getDateField() || selectInferredField(collection, 'date'); const date = parseDateFromEntry(entry as unknown as Map, dateFieldName); // Prepare and sanitize slug variables only, leave the rest of the @@ -216,7 +216,7 @@ export function summaryFormatter(summaryTemplate: string, entry: EntryMap, colle const date = parseDateFromEntry( entry as unknown as Map, - selectInferedField(collection, 'date'), + selectInferredField(collection, 'date'), ) || null; const identifier = entryData.getIn(keyToPathArray(selectIdentifier(collection) as string)); @@ -250,7 +250,7 @@ export function folderFormatter( const date = parseDateFromEntry( entry as unknown as Map, - selectInferedField(collection, 'date'), + selectInferredField(collection, 'date'), ) || null; const identifier = fields.getIn(keyToPathArray(selectIdentifier(collection) as string)); const processSegment = getProcessSegment(slugConfig, [defaultFolder, fields.get('dirname')]); diff --git a/packages/decap-cms-core/src/reducers/collections.ts b/packages/decap-cms-core/src/reducers/collections.ts index 5dec5a639b19..3efe70631913 100644 --- a/packages/decap-cms-core/src/reducers/collections.ts +++ b/packages/decap-cms-core/src/reducers/collections.ts @@ -317,7 +317,7 @@ export function selectIdentifier(collection: Collection) { ); } -export function selectInferedField(collection: Collection, fieldName: string) { +export function selectInferredField(collection: Collection, fieldName: string) { if (fieldName === 'title' && collection.get('identifier_field')) { return selectIdentifier(collection); } @@ -381,7 +381,7 @@ export function selectEntryCollectionTitle(collection: Collection, entry: EntryM // try to infer a title field from the entry data const entryData = entry.get('data'); - const titleField = selectInferedField(collection, 'title'); + const titleField = selectInferredField(collection, 'title'); const result = titleField && entryData.getIn(keyToPathArray(titleField)); // if the custom field does not yield a result, fallback to 'title' @@ -398,7 +398,7 @@ export function selectDefaultSortableFields( hasIntegration: boolean, ) { let defaultSortable = SORTABLE_FIELDS.map((type: string) => { - const field = selectInferedField(collection, type); + const field = selectInferredField(collection, type); if (backend.isGitBackend() && type === 'author' && !field && !hasIntegration) { // default to commit author if not author field is found return COMMIT_AUTHOR; diff --git a/packages/decap-cms-lib-auth/src/pkce-oauth.js b/packages/decap-cms-lib-auth/src/pkce-oauth.js index 1928f1a85489..5c1a9ce65e4a 100644 --- a/packages/decap-cms-lib-auth/src/pkce-oauth.js +++ b/packages/decap-cms-lib-auth/src/pkce-oauth.js @@ -13,7 +13,7 @@ async function sha256(text) { // based on https://github.com/auth0/auth0-spa-js/blob/9a83f698127eae7da72691b0d4b1b847567687e3/src/utils.ts#L147 function generateVerifierCode() { - // characters that can be used for codeVerifer + // characters that can be used for codeVerifier // excludes _~ as if included would cause an uneven distribution as char.length would no longer be a factor of 256 const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.'; const randomValues = Array.from(window.crypto.getRandomValues(new Uint8Array(128))); diff --git a/packages/decap-cms-locales/CHANGELOG.md b/packages/decap-cms-locales/CHANGELOG.md index 81740b782b73..e68071429a17 100644 --- a/packages/decap-cms-locales/CHANGELOG.md +++ b/packages/decap-cms-locales/CHANGELOG.md @@ -115,7 +115,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes * **locale-hr:** fix typos ([0191f25](https://github.com/decaporg/decap-cms/commit/0191f25c51ef66292c920a93078697643c8dd68b)) -* **locale-tr:** fixe locales and added new ones. ([#6010](https://github.com/decaporg/decap-cms/issues/6010)) ([fdd9ec3](https://github.com/decaporg/decap-cms/commit/fdd9ec354d2ea3d9a2705e11119ee87b8ea96af5)) +* **locale-tr:** fixed locales and added new ones. ([#6010](https://github.com/decaporg/decap-cms/issues/6010)) ([fdd9ec3](https://github.com/decaporg/decap-cms/commit/fdd9ec354d2ea3d9a2705e11119ee87b8ea96af5)) diff --git a/packages/decap-cms-widget-markdown/src/MarkdownControl/plugins/lists/events/keyDownEnter.js b/packages/decap-cms-widget-markdown/src/MarkdownControl/plugins/lists/events/keyDownEnter.js index a0790b0bd26a..02aef30ea8a8 100644 --- a/packages/decap-cms-widget-markdown/src/MarkdownControl/plugins/lists/events/keyDownEnter.js +++ b/packages/decap-cms-widget-markdown/src/MarkdownControl/plugins/lists/events/keyDownEnter.js @@ -16,7 +16,7 @@ function keyDownEnter(editor) { Transforms.delete(editor); } - // if edge of selection is in the begining of the first text node in list-item + // if edge of selection is in the beginning of the first text node in list-item if (isCursorAtListItemStart(editor)) { return liftListItem(editor); } diff --git a/packages/decap-cms-widget-markdown/src/serializers/__tests__/remarkAssertParents.spec.js b/packages/decap-cms-widget-markdown/src/serializers/__tests__/remarkAssertParents.spec.js index e2dfa358d97b..670d5c7900ef 100644 --- a/packages/decap-cms-widget-markdown/src/serializers/__tests__/remarkAssertParents.spec.js +++ b/packages/decap-cms-widget-markdown/src/serializers/__tests__/remarkAssertParents.spec.js @@ -83,7 +83,7 @@ describe('remarkAssertParents', () => { expect(transform(input)).toEqual(output); }); - it('should handle assymetrical splits', () => { + it('should handle asymmetrical splits', () => { const input = u('root', [ u('paragraph', [u('heading', { depth: 1 }, [u('text', 'Heading text.')])]), ]); diff --git a/packages/decap-cms-widget-markdown/src/serializers/index.js b/packages/decap-cms-widget-markdown/src/serializers/index.js index e1866ecfa50c..b6e1a85de359 100644 --- a/packages/decap-cms-widget-markdown/src/serializers/index.js +++ b/packages/decap-cms-widget-markdown/src/serializers/index.js @@ -47,7 +47,7 @@ import { getEditorComponents } from '../MarkdownControl'; * temporarily before the document is stringified to HTML. * * - HTML {string} - * The field value is stringifed to HTML for preview purposes - the HTML value + * The field value is stringified to HTML for preview purposes - the HTML value * is never parsed, it is output only. * * - Slate Raw AST {object} diff --git a/packages/decap-cms-widget-number/package.json b/packages/decap-cms-widget-number/package.json index 6a4ce3e71b01..f8835c40df77 100644 --- a/packages/decap-cms-widget-number/package.json +++ b/packages/decap-cms-widget-number/package.json @@ -1,6 +1,6 @@ { "name": "decap-cms-widget-number", - "description": "Widget for editing numberic values in Decap CMS.", + "description": "Widget for editing numeric values in Decap CMS.", "version": "3.1.0-beta.0", "homepage": "https://www.decapcms.org/docs/widgets/#number", "repository": "https://github.com/decaporg/decap-cms/tree/master/packages/decap-cms-widget-number", diff --git a/packages/decap-cms/README.md b/packages/decap-cms/README.md index b49582515d27..029cf6ac029b 100644 --- a/packages/decap-cms/README.md +++ b/packages/decap-cms/README.md @@ -38,7 +38,7 @@ New contributors are always welcome! Check out [CONTRIBUTING.md](https://github. ## Change Log This project adheres to [Semantic Versioning](http://semver.org/). -Every release is documented on the Github [Releases](https://github.com/decaporg/decap-cms/releases) page. +Every release is documented on the GitHub [Releases](https://github.com/decaporg/decap-cms/releases) page. ## License diff --git a/website/content/blog/git-based-cms-definition-features-best-practices.md b/website/content/blog/git-based-cms-definition-features-best-practices.md index d51315017e7e..5d7a319be97c 100644 --- a/website/content/blog/git-based-cms-definition-features-best-practices.md +++ b/website/content/blog/git-based-cms-definition-features-best-practices.md @@ -31,7 +31,7 @@ While there may be differences among Git-based CMS options, they are generally s Git-based CMS solutions balance simplicity and scalability, making them suitable for a wide range of projects. Scalability largely depends on the volume of your content and the speed at which you need to serve it. For static site projects, Git-based CMS can go a long way. -But not all the way. For example, a Decap project on Github scales to about 10.000 entries if you have a lot of collection relations. It’s possible to have more entries if there are fewer relations. The bottleneck in this case is the GitHub API, which has a rate limit of 5000 on the personal plan and 15000 on the enterprise plan. A new user with an empty cache will eat up that limit fast because Decap will make a request per each entry to create a cache. +But not all the way. For example, a Decap project on GitHub scales to about 10.000 entries if you have a lot of collection relations. It’s possible to have more entries if there are fewer relations. The bottleneck in this case is the GitHub API, which has a rate limit of 5000 on the personal plan and 15000 on the enterprise plan. A new user with an empty cache will eat up that limit fast because Decap will make a request per each entry to create a cache. To mitigate this, some Git-based CMS platforms like [Tina](https://tina.io/) and [CloudCanon](https://cloudcannon.com/) offer a cloud database proxy, enabling advanced features that might be necessary for specific projects. Those could be real-time collaboration, user roles, and other resource-intensive queries. diff --git a/website/content/docs/custom-widgets.md b/website/content/docs/custom-widgets.md index 252455356e94..2874ed609f06 100644 --- a/website/content/docs/custom-widgets.md +++ b/website/content/docs/custom-widgets.md @@ -137,7 +137,7 @@ CMS.registerEditorComponent({ } ], // Regex pattern used to search for instances of this block in the markdown document. - // Patterns are run in a multline environment (against the entire markdown document), + // Patterns are run in a multiline environment (against the entire markdown document), // and so generally should make use of the multiline flag (`m`). If you need to capture // newlines in your capturing groups, you can either use something like // `([\S\s]*)`, or you can additionally enable the "dot all" flag (`s`), diff --git a/website/content/docs/customization.md b/website/content/docs/customization.md index 08a399eaa703..829340fd64d3 100644 --- a/website/content/docs/customization.md +++ b/website/content/docs/customization.md @@ -169,7 +169,7 @@ Registers a template for a folder collection or an individual file in a file col ``` ### Accessing Metadata - Preview Components also receive an additional prop: `fieldsMetaData`. It contains aditional information (besides the plain textual value of each field) that can be useful for preview purposes. For example, the Relation widget passes the whole selected relation data in `fieldsMetaData`. + Preview Components also receive an additional prop: `fieldsMetaData`. It contains additional information (besides the plain textual value of each field) that can be useful for preview purposes. For example, the Relation widget passes the whole selected relation data in `fieldsMetaData`. ```js export default class ArticlePreview extends React.Component { render() { diff --git a/website/content/docs/deploy-preview-links.md b/website/content/docs/deploy-preview-links.md index 36d116cf168d..bf948945ab42 100644 --- a/website/content/docs/deploy-preview-links.md +++ b/website/content/docs/deploy-preview-links.md @@ -40,7 +40,7 @@ pending, which a content editor can use to manually check for a finished preview Deploy preview links point to the site root by default, but you'll probably want them to point to the specific piece of content that the content editor is viewing. You can do this by providing a -`preview_path` string template for each collection, or for inidividual files in a files collection. +`preview_path` string template for each collection, or for individual files in a files collection. Let's say we have a `blog` collection that stores content in our repo under `content/blog`. The path to a post in your repo may look like `content/blog/2018-01-new-post.md`, but the path to that post diff --git a/website/content/docs/github-backend.md b/website/content/docs/github-backend.md index 2360fbe48a95..174759d2b3ab 100644 --- a/website/content/docs/github-backend.md +++ b/website/content/docs/github-backend.md @@ -5,7 +5,7 @@ title: GitHub --- For repositories stored on GitHub, the `github` backend allows CMS users to log in directly with their GitHub account. Note that all users must have push access to your content repository for this to work. -Because Github [requires a server](https://github.com/decaporg/decap-cms/issues/663#issuecomment-335023723) for authentication, Netlify facilitates basic GitHub authentication. +Because GitHub [requires a server](https://github.com/decaporg/decap-cms/issues/663#issuecomment-335023723) for authentication, Netlify facilitates basic GitHub authentication. To enable basic GitHub authentication: diff --git a/website/content/docs/hugo.md b/website/content/docs/hugo.md index a9d8da2f037b..1c3430bbea64 100644 --- a/website/content/docs/hugo.md +++ b/website/content/docs/hugo.md @@ -214,7 +214,7 @@ CMS.registerEditorComponent({ label: "Gist", fields: [{ name: "username", - label: "Github Username", + label: "GitHub Username", widget: "string" }, { diff --git a/website/content/docs/jekyll.md b/website/content/docs/jekyll.md index 6bb2eb2feca1..b5dfb3a0b215 100644 --- a/website/content/docs/jekyll.md +++ b/website/content/docs/jekyll.md @@ -7,7 +7,7 @@ title: Jekyll This section will help you integrate Decap CMS with a new or existing Jekyll project. -[Jekyll](https://jekyllrb.com/) is a blog-aware static site generator built with Ruby. [Github Pages](https://pages.github.com/) are powered by Jekyll, making it a popular choice for developer blogs and project pages. +[Jekyll](https://jekyllrb.com/) is a blog-aware static site generator built with Ruby. [GitHub Pages](https://pages.github.com/) are powered by Jekyll, making it a popular choice for developer blogs and project pages. If you're starting a new project, the fastest route to publishing on a Jekyll website with Decap CMS is to [deploy a template on Netlify](https://templates.netlify.com/).