Merge branch 'main' into feature/npm-integrity-check

Author: hip3r

package-lock.json

@@ -35,12 +35,13 @@
     "remark-slate": "^1.8.6",
     "remark-slate-transformer": "^0.7.4",
     "remark-stringify": "^6.0.4",
-    "slate": "^0.91.1",
+    "slate": "^0.118.1",
     "slate-base64-serializer": "^0.2.107",
-    "slate-history": "^0.93.0",
-    "slate-hyperscript": "^0.77.0",
-    "slate-plain-serializer": "^0.7.1",
-    "slate-react": "^0.91.2",
+    "slate-dom": "^0.118.1",
+    "slate-history": "^0.113.1",
+    "slate-hyperscript": "^0.100.0",
+    "slate-plain-serializer": "^0.7.3",
+    "slate-react": "^0.117.4",
     "slate-soft-break": "^0.9.0",
     "unified": "^9.2.0",
     "unist-builder": "^1.0.3",

packages/decap-cms-widget-markdown/package.json

@@ -223,7 +223,7 @@ function Editor(props) {
         position: relative;
       `}
     >
-      <Slate editor={editor} value={editorValue} onChange={handleChange}>
+      <Slate editor={editor} value={editorValue} initialValue={editorValue} onChange={handleChange}>
         <EditorControlBar>
           {
             <Toolbar

packages/decap-cms-widget-markdown/src/MarkdownControl/VisualEditor.js

@@ -27,4 +27,8 @@ backend:
 GIT_REPO_DIRECTORY=FULL_PATH_TO_LOCAL_GIT_REPO
 # optional, defaults to 8081
 PORT=CUSTOM_PORT
+# optional, only listen for incoming connections on a specific IP address
+BIND_HOST=127.0.0.1
+# optional, restrict API requests to a specific origin
+ORIGIN=https://example.com
 ```

packages/decap-server/README.md

@@ -8,7 +8,8 @@ import { registerMiddleware as registerLocalFs } from './middlewares/localFs';
 import { createLogger } from './logger';
 
 const app = express();
-const port = process.env.PORT || 8081;
+const port = parseInt(process.env.PORT || '8081', 10);
+const host = process.env.BIND_HOST;
 const level = process.env.LOG_LEVEL || 'info';
 
 (async () => {
@@ -33,7 +34,13 @@ const level = process.env.LOG_LEVEL || 'info';
     process.exit(1);
   }
 
-  return app.listen(port, () => {
-    logger.info(`Decap CMS Proxy Server listening on port ${port}`);
-  });
+  if (host) {
+    return app.listen(port, host, () => {
+      logger.info(`Decap CMS Proxy Server listening on ${host}:${port}`);
+    });
+  } else {
+    return app.listen(port, () => {
+      logger.info(`Decap CMS Proxy Server listening on port ${port}`);
+    });
+  }
 })();

packages/decap-server/src/index.ts

@@ -16,6 +16,10 @@ export function registerCommonMiddlewares(app: express.Express, options: Options
     },
   };
   app.use(morgan('combined', { stream }));
-  app.use(cors());
+  app.use(
+    cors({
+      origin: process.env.ORIGIN || '*',
+    }),
+  );
   app.use(express.json({ limit: '50mb' }));
 }