Merge branch 'main' into feat/add-default-workflow-status-config

.eslintrc.js

@@ -40,6 +40,7 @@ module.exports = {
     ],
     'no-duplicate-imports': 'error',
     '@emotion/no-vanilla': 'error',
+    '@emotion/pkg-renaming': 'error',
     '@emotion/import-from-emotion': 'error',
     '@emotion/styled-import': 'error',
     'require-atomic-updates': [0],
@@ -100,11 +101,5 @@ module.exports = {
         ],
       },
     },
-    {
-      files: ['website/**/*'],
-      rules: {
-        'import/no-unresolved': [0],
-      },
-    },
   ],
 };

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: decaporg
+open_collective: decap

.github/workflows/nodejs.yml

@@ -3,7 +3,7 @@ name: Node CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     types: [opened, synchronize, reopened]
 
@@ -27,82 +27,72 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
+    if: ${{ needs.changes.outputs.cms == 'true' }}
     steps:
       - uses: actions/checkout@v3
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: Use Node.js {{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: log versions
         run: node --version && npm --version && yarn --version
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: install dependecies
-        run: yarn --frozen-lockfile --network-timeout 1000000 && yarn bootstrap
-        if: ${{ needs.changes.outputs.cms == 'true' }}
+        run: npm install
       - name: run unit tests
-        run: yarn test:ci
+        run: npm run test:ci
         env:
           CI: true
           NODE_OPTIONS: --max-old-space-size=4096
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: build demo site
-        run: yarn build:demo
+        run: npm run build:demo
         env:
           NODE_OPTIONS: --max-old-space-size=4096
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - uses: actions/upload-artifact@master
         with:
-          name: dev-test-website-${{ runner.os }}
+          name: dev-test-website-${{ runner.os }}-${{ matrix.node-version }}
           path: dev-test
-        if: ${{ needs.changes.outputs.cms == 'true' }}
 
   e2e-with-cypress:
     needs: [changes, build]
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
       fail-fast: false
 
+    if: ${{ needs.changes.outputs.cms == 'true' }}
     steps:
       - uses: actions/checkout@v3
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true
-          cache: yarn
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - uses: actions/download-artifact@master
         with:
-          name: dev-test-website-${{ runner.os }}
+          name: dev-test-website-${{ runner.os }}-18.x
           path: dev-test
-        if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: npm install
         run: |
           node --version
           npm --version
           yarn --version
-          yarn --frozen-lockfile
-        if: ${{ needs.changes.outputs.cms == 'true' }}
+          npm install
       - name: e2e test
         run: |
-          yarn test:e2e:run-ci
+          npm run test:e2e:run-ci
         env:
           IS_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true }}
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           NODE_OPTIONS: --max-old-space-size=4096
           MACHINE_COUNT: 2
           MACHINE_INDEX: ${{ matrix.node-version }}
-        if: ${{ needs.changes.outputs.cms == 'true' }}
+          TZ: Europe/Amsterdam
       - uses: actions/upload-artifact@v3
-        if: ${{ always() && needs.changes.outputs.cms == 'true' }}
+        if: ${{ always() }}
         with:
           name: cypress-results-${{ matrix.node-version }}
           path: |

.gitignore

@@ -10,7 +10,6 @@ yarn-error.log
 .idea/
 manifest.yml
 .imdone/
-website/data/contributors.json
 cypress/videos
 cypress/screenshots
 __diff_output__
@@ -20,3 +19,4 @@ coverage/
 .env
 .temp/
 storybook-static/
+.nx/cache

.npmrc

@@ -0,0 +1,2 @@
+legacy-peer-deps=true
+lockfileVersion=3

.prettierignore

@@ -5,3 +5,5 @@ public/
 packages/decap-cms-backend-github/src/fragmentTypes.js
 packages/decap-cms-backend-gitlab/src/AuthenticationPage.js
 packages/decap-cms-backend-proxy/src/implementation.ts
+
+/.nx/cache

CHANGELOG.md

@@ -3,45 +3,45 @@ Decap CMS is a collection of npm packages with their own versions and changelogs
 below. The legacy pre-2.0 changelog is below as well.
 
 ## Core and distributions
-- [decap-cms](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms/CHANGELOG.md)
-- [decap-cms-core](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-core/CHANGELOG.md)
+- [decap-cms](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms/CHANGELOG.md)
+- [decap-cms-core](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-core/CHANGELOG.md)
 
 ## Shared libraries
-- [decap-cms-lib-auth](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-lib-auth/CHANGELOG.md)
-- [decap-cms-lib-util](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-lib-util/CHANGELOG.md)
-- [decap-cms-ui-default](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-ui-default/CHANGELOG.md)
+- [decap-cms-lib-auth](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-lib-auth/CHANGELOG.md)
+- [decap-cms-lib-util](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-lib-util/CHANGELOG.md)
+- [decap-cms-ui-default](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-ui-default/CHANGELOG.md)
 
 ## Backends
-- [decap-cms-backend-bitbucket](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-bitbucket/CHANGELOG.md)
-- [decap-cms-backend-git-gateway](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-git-gateway/CHANGELOG.md)
-- [decap-cms-backend-github](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-github/CHANGELOG.md)
-- [decap-cms-backend-gitlab](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-gitlab/CHANGELOG.md)
-- [decap-cms-backend-test](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-backend-test/CHANGELOG.md)
+- [decap-cms-backend-bitbucket](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-bitbucket/CHANGELOG.md)
+- [decap-cms-backend-git-gateway](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-git-gateway/CHANGELOG.md)
+- [decap-cms-backend-github](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-github/CHANGELOG.md)
+- [decap-cms-backend-gitlab](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-gitlab/CHANGELOG.md)
+- [decap-cms-backend-test](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-backend-test/CHANGELOG.md)
 
 ## Editor Components
-- [decap-cms-editor-component-image](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-editor-component-image/CHANGELOG.md)
+- [decap-cms-editor-component-image](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-editor-component-image/CHANGELOG.md)
 
 ## Widgets
-- [decap-cms-widget-boolean](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-boolean/CHANGELOG.md)
-- [decap-cms-widget-date](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-date/CHANGELOG.md)
-- [decap-cms-widget-datetime](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-datetime/CHANGELOG.md)
-- [decap-cms-widget-file](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-file/CHANGELOG.md)
-- [decap-cms-widget-image](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-image/CHANGELOG.md)
-- [decap-cms-widget-list](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-list/CHANGELOG.md)
-- [decap-cms-widget-markdown](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-markdown/CHANGELOG.md)
-- [decap-cms-widget-number](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-number/CHANGELOG.md)
-- [decap-cms-widget-object](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-object/CHANGELOG.md)
-- [decap-cms-widget-relation](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-relation/CHANGELOG.md)
-- [decap-cms-widget-select](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-select/CHANGELOG.md)
-- [decap-cms-widget-string](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-string/CHANGELOG.md)
-- [decap-cms-widget-text](https://github.com/decaporg/decap-cms/blob/master/packages/decap-cms-widget-text/CHANGELOG.md)
+- [decap-cms-widget-boolean](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-boolean/CHANGELOG.md)
+- [decap-cms-widget-date](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-date/CHANGELOG.md)
+- [decap-cms-widget-datetime](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-datetime/CHANGELOG.md)
+- [decap-cms-widget-file](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-file/CHANGELOG.md)
+- [decap-cms-widget-image](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-image/CHANGELOG.md)
+- [decap-cms-widget-list](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-list/CHANGELOG.md)
+- [decap-cms-widget-markdown](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-markdown/CHANGELOG.md)
+- [decap-cms-widget-number](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-number/CHANGELOG.md)
+- [decap-cms-widget-object](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-object/CHANGELOG.md)
+- [decap-cms-widget-relation](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-relation/CHANGELOG.md)
+- [decap-cms-widget-select](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-select/CHANGELOG.md)
+- [decap-cms-widget-string](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-string/CHANGELOG.md)
+- [decap-cms-widget-text](https://github.com/decaporg/decap-cms/blob/main/packages/decap-cms-widget-text/CHANGELOG.md)
 
 ## Legacy Changelog
 
 ## [Unreleased] ([demo](https://cms-demo.netlify.com/))
 <details>
   <summary>
-    Changes that have landed in master but are not yet released.
+    Changes that have landed in main but are not yet released.
     Click to see more.
   </summary>
 
@@ -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/))