chore: lint & set node version in workflow

decaporg · Jul 25, 2023 · 763bb67 · 763bb67
1 parent d019e2c
commit 763bb67
Show file tree

Hide file tree

Showing 5 changed files with 3,271 additions and 3,477 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -52,6 +52,7 @@ module.exports = {
       },
     ],
     'unicorn/prefer-string-slice': 'error',
+    'react/no-unknown-property': ['error', { ignore: ['css', 'bold', 'italic', 'delete'] }],
   },
   plugins: ['babel', '@emotion', 'cypress', 'unicorn'],
   settings: {

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '*'
+          node-version: 18
           check-latest: true
         if: ${{ needs.changes.outputs.cms == 'true' }}
       - name: log versions
@@ -73,7 +73,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '*'
+          node-version: 18
           check-latest: true
           cache: yarn
         if: ${{ needs.changes.outputs.cms == 'true' }}

diff --git a/packages/netlify-cms-core/src/components/MediaLibrary/MediaLibrary.js b/packages/netlify-cms-core/src/components/MediaLibrary/MediaLibrary.js
@@ -73,6 +73,7 @@ class MediaLibrary extends React.Component {
   state = {
     selectedFile: {},
     query: '',
+    isPersisted: false,
   };
 
   componentDidMount() {
@@ -89,6 +90,13 @@ class MediaLibrary extends React.Component {
     if (isOpening) {
       this.setState({ selectedFile: {}, query: '' });
     }
+
+    if (this.state.isPersisted) {
+      this.setState({
+        selectedFile: nextProps.files[0],
+        isPersisted: false,
+      });
+    }
   }
 
   componentDidUpdate(prevProps) {
@@ -97,6 +105,13 @@ class MediaLibrary extends React.Component {
     if (isOpening && prevProps.privateUpload !== this.props.privateUpload) {
       this.props.loadMedia({ privateUpload: this.props.privateUpload });
     }
+
+    if (this.state.isPersisted) {
+      this.setState({
+        selectedFile: this.props.files[0],
+        isPersisted: false,
+      });
+    }
   }
 
   loadDisplayURL = file => {
@@ -186,7 +201,7 @@ class MediaLibrary extends React.Component {
     } else {
       await persistMedia(file, { privateUpload, field });
 
-      this.setState({ selectedFile: this.props.files[0] });
+      this.setState({ isPersisted: true });
 
       this.scrollToTop();
     }

diff --git a/packages/netlify-cms-core/src/formats/frontmatter.ts b/packages/netlify-cms-core/src/formats/frontmatter.ts
@@ -10,7 +10,7 @@ const Languages = {
   JSON: 'json',
 } as const;
 
-type Language = typeof Languages[keyof typeof Languages];
+type Language = (typeof Languages)[keyof typeof Languages];
 
 export type Delimiter = string | [string, string];
 type Format = { language: Language; delimiters: Delimiter };