@monaco-editor/react - npm Package Compare versions

Comparing version 3.3.1 to 3.3.2

CHANGELOG.md

 ### Versions
 
 ## 3.3.1
+###### *June 20, 2020*
+
+- utils: (monaco) add a possibility to pass src of config script
+
+## 3.3.1
 ###### *May 30, 2020*
@@ -5,0 +10,0 @@

lib/ControlledEditor/ControlledEditor.js

@@ -50,3 +50,3 @@ "use strict";
 
-  return _react.default.createElement(_.default, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_.default, (0, _extends2.default)({
     value: value,
@@ -53,0 +53,0 @@ editorDidMount: handleEditorDidMount,

lib/ControlledEditor/index.js

@@ -14,4 +14,4 @@ "use strict";
 
-var _default = (0, _react.memo)(_ControlledEditor.default);
+var _default = /*#__PURE__*/(0, _react.memo)(_ControlledEditor.default);
 
 exports.default = _default;

lib/DiffEditor/DiffEditor.js

@@ -121,3 +121,3 @@ "use strict";
 
-  return _react.default.createElement(_MonacoContainer.default, {
+  return /*#__PURE__*/_react.default.createElement(_MonacoContainer.default, {
     width: width,
@@ -124,0 +124,0 @@ height: height,

lib/DiffEditor/index.js

@@ -14,4 +14,4 @@ "use strict";
 
-var _default = (0, _react.memo)(_DiffEditor.default);
+var _default = /*#__PURE__*/(0, _react.memo)(_DiffEditor.default);
 
 exports.default = _default;

lib/Editor/Editor.js

@@ -32,2 +32,4 @@ "use strict";
 
+var READ_ONLY_OPTION_CODE = 68;
+
 var Editor = function Editor(_ref) {
@@ -72,3 +74,6 @@ var value = _ref.value,
   (0, _hooks.useUpdate)(function (_) {
-    if (options.readOnly) {
+    editorRef.current.updateOptions(options);
+  }, [options], isEditorReady);
+  (0, _hooks.useUpdate)(function (_) {
+    if (editorRef.current.getOption(READ_ONLY_OPTION_CODE)) {
       editorRef.current.setValue(value);
@@ -102,5 +107,2 @@ } else {
   }, [theme], isEditorReady);
-  (0, _hooks.useUpdate)(function (_) {
-    editorRef.current.updateOptions(options);
-  }, [options], isEditorReady);
   var createEditor = (0, _react.useCallback)(function (_) {
@@ -125,3 +127,3 @@ editorRef.current = monacoRef.current.editor.create(containerRef.current, _objectSpread({
 
-  return _react.default.createElement(_MonacoContainer.default, {
+  return /*#__PURE__*/_react.default.createElement(_MonacoContainer.default, {
     width: width,
@@ -128,0 +130,0 @@ height: height,

lib/Editor/index.js

@@ -14,4 +14,4 @@ "use strict";
 
-var _default = (0, _react.memo)(_Editor.default);
+var _default = /*#__PURE__*/(0, _react.memo)(_Editor.default);
 
 exports.default = _default;

lib/Loading/Loading.js

@@ -22,3 +22,3 @@ "use strict";
   var content = _ref.content;
-  return _react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement("div", {
     style: loadingStyles
@@ -25,0 +25,0 @@ }, content);

lib/MonacoContainer/index.js

@@ -14,4 +14,4 @@ "use strict";
 
-var _default = (0, _react.memo)(_MonacoContainer.default);
+var _default = /*#__PURE__*/(0, _react.memo)(_MonacoContainer.default);
 
 exports.default = _default;

lib/MonacoContainer/MonacoContainer.js

@@ -32,12 +32,12 @@ "use strict";
       _ref = _ref2._ref;
-  return _react.default.createElement("section", {
-    style: _objectSpread({}, _styles.default.wrapper, {
+  return /*#__PURE__*/_react.default.createElement("section", {
+    style: _objectSpread(_objectSpread({}, _styles.default.wrapper), {}, {
       width: width,
       height: height
     })
-  }, !isEditorReady && _react.default.createElement(_Loading.default, {
+  }, !isEditorReady && /*#__PURE__*/_react.default.createElement(_Loading.default, {
     content: loading
-  }), _react.default.createElement("div", {
+  }), /*#__PURE__*/_react.default.createElement("div", {
     ref: _ref,
-    style: _objectSpread({}, _styles.default.fullWidth, {}, !isEditorReady && _styles.default.hide)
+    style: _objectSpread(_objectSpread({}, _styles.default.fullWidth), !isEditorReady && _styles.default.hide)
   }));
@@ -44,0 +44,0 @@ };

lib/utils/deepMerge.js

@@ -20,3 +20,3 @@ "use strict";
   });
-  return _objectSpread({}, target, {}, source);
+  return _objectSpread(_objectSpread({}, target), source);
 };
@@ -23,0 +23,0 @@

lib/utils/monaco.js

@@ -10,2 +10,4 @@ "use strict";
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -21,12 +23,11 @@
 
-var Monaco =
-/*#__PURE__*/
-function () {
-  function Monaco() {
+var Monaco = /*#__PURE__*/function () {
+  function Monaco(_ref) {
     var _this = this;
 
-    var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var src = _ref.src,
+        config = (0, _objectWithoutProperties2.default)(_ref, ["src"]);
     (0, _classCallCheck2.default)(this, Monaco);
-    (0, _defineProperty2.default)(this, "handleMainScriptLoad", function (_) {
-      document.removeEventListener('monaco_init', _this.handleMainScriptLoad);
+    (0, _defineProperty2.default)(this, "handleConfigScriptLoad", function (_) {
+      document.removeEventListener('monaco_init', _this.handleConfigScriptLoad);
 
@@ -40,2 +41,3 @@ _this.resolve(window.monaco);
     }));
+    this.configScriptSrc = src;
     this.__config = config;
@@ -46,7 +48,9 @@ }
     key: "config",
-    value: function config(_config) {
-      if (_config) {
-        this.__config = (0, _utils.deepMerge)(this.__config, this.validateConfig(_config));
-      }
+    value: function config() {
+      var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          src = _ref2.src,
+          _config = (0, _objectWithoutProperties2.default)(_ref2, ["src"]);
 
+      this.configScriptSrc = src;
+      this.__config = (0, _utils.deepMerge)(this.__config, this.validateConfig(_config));
       return this;
@@ -86,3 +90,3 @@ }
     key: "createMonacoLoaderScript",
-    value: function createMonacoLoaderScript(mainScript) {
+    value: function createMonacoLoaderScript(configScript) {
       var _this2 = this;
@@ -93,3 +97,3 @@
       loaderScript.onload = function (_) {
-        return _this2.injectScripts(mainScript);
+        return _this2.injectScripts(configScript);
       };
@@ -101,8 +105,16 @@
   }, {
-    key: "createMainScript",
-    value: function createMainScript() {
-      var mainScript = this.createScript();
-      mainScript.innerHTML = "\n      require.config(".concat(JSON.stringify(this.__config), ");\n      require(['vs/editor/editor.main'], function() {\n        document.dispatchEvent(new Event('monaco_init'));\n      });\n    ");
-      mainScript.onerror = this.reject;
-      return mainScript;
+    key: "createConfigScript",
+    value: function createConfigScript() {
+      var configScript = this.createScript();
+
+      if (this.configScriptSrc) {
+        // it will be helpfull in case of CSP, which doesn't allow
+        // inline script execution
+        configScript.src = this.configScriptSrc;
+      } else {
+        configScript.innerHTML = "\n        require.config(".concat(JSON.stringify(this.__config), ");\n        require(['vs/editor/editor.main'], function() {\n          document.dispatchEvent(new Event('monaco_init'));\n        });\n      ");
+      }
+
+      configScript.onerror = this.reject;
+      return configScript;
     }
@@ -119,5 +131,5 @@ }, {
 
-        document.addEventListener('monaco_init', this.handleMainScriptLoad);
-        var mainScript = this.createMainScript();
-        var loaderScript = this.createMonacoLoaderScript(mainScript);
+        document.addEventListener('monaco_init', this.handleConfigScriptLoad);
+        var configScript = this.createConfigScript();
+        var loaderScript = this.createMonacoLoaderScript(configScript);
         this.injectScripts(loaderScript);
@@ -124,0 +136,0 @@ }

package.json

 {
   "name": "@monaco-editor/react",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Monaco editor wrapper for easy/one-line integration with React applications (e.g. powered by create-react-app) without need of webpack configuration files",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

63796

increased by1.51%

Lines of code

922

increased by1.1%

No dependency changes