mbeditor 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0837fbeccc3634d7804e6f9957bbbaca06bb4c02942eb4decc5e8b174499ab
-  data.tar.gz: 9f97239369b2968c17cd3909abdced4917329a349564d02ebde6beb89cb8c36f
+  metadata.gz: 31199cd73e4e3321d8851a62ab20decd6e9c8d9ab328b50d9f987f85da1333b2
+  data.tar.gz: 27de9f3e0641c41e693023b3fcbedbe0d89d35d8d1fd7f3606aaa8095ceeb5b2
 SHA512:
-  metadata.gz: 6310dc010236970bf25c0945a465122e1f8a081c399696d8870dc852d85454153863b01b1f1e9a8871abc3fbe07b1489724a065835c2909daa15426899701833
-  data.tar.gz: f8ed953601769d6785a4fecd4c3b16a6ce820e6e7f5c88a7cb12750d8f32b5122dc6bc25fd67be5e86bd7ef02ae1beba9ece2dbc5fc5bc0324df47785a03c9ba
+  metadata.gz: 5f86f17e33bfd43248d7dc1a122f6ed3d85a0fcf3e745ca805561d7d490c3497e1bfaa53339ed28ed068a401ed91447888eb5f92a89654d89fe3b8ae0fd7c5b1
+  data.tar.gz: fea980a035f785508e1bc5444fce65c7a8c0824307c48e4db7ea73fcf7218f23889c1c687d999fc252f3ffb97fc732b1aae8292ec65938f40d97c48b95a470c7

data/app/assets/javascripts/mbeditor/components/EditorPanel.js

@@ -35,7 +35,7 @@ var EditorPanel = function EditorPanel(_ref) {
   var editorRef = useRef(null);
   var monacoRef = useRef(null);
   var latestContentRef = useRef('');
-  var lastAppliedExternalVersionRef = useRef(-1);
+  var lastAppliedExternalVersionRef = useRef(0);
   var aviBaseRef = useRef(0);
   var aviMaxRef = useRef(0);
 
@@ -832,12 +832,19 @@ var EditorPanel = function EditorPanel(_ref) {
       EditorStore.setState({ canUndo: false, canRedo: false });
     } else {
       // Keep undo stack for formats or replaces by using executeEdits
+      var _extEntry = window.__mbeditorModels && window.__mbeditorModels[tab.path];
+      if (_extEntry) _extEntry.cleanVersionId = null;
       editor.pushUndoStop();
       editor.executeEdits("external", [{
         range: model.getFullModelRange(),
         text: tab.content
       }]);
       editor.pushUndoStop();
+      // Re-anchor the clean baseline so onDidChangeContent doesn't mark this
+      // externally-applied content as a dirty edit.
+      var _newExtAvi = model.getAlternativeVersionId();
+      if (_extEntry) _extEntry.cleanVersionId = _newExtAvi;
+      aviBaseRef.current = _newExtAvi;
     }
   }, [tab.content, tab.externalContentVersion]);
 

data/app/assets/javascripts/mbeditor/editor_plugins.js

@@ -68,9 +68,6 @@
         var key = keys[i];
         if (alreadyDeclared[key]) continue;
         if (!/^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(key)) continue;
-        var desc;
-        try { desc = Object.getOwnPropertyDescriptor(window, key); } catch (e) { continue; }
-        if (!desc || !desc.configurable || !desc.writable || desc.get) continue;
         var value;
         try { value = window[key]; } catch (e) { continue; }
         if (value === null || value === undefined) continue;
@@ -488,11 +485,11 @@
       });
     }
 
-    // Declare globals that the sprockets asset pipeline injects at runtime so
-    // checkJs doesn't flag them as undefined.  `interface Window` augmentation
-    // covers `window.myAppGlobal` access patterns.  For app-specific component
-    // names not listed here, add `/* global MyComponent */` at the top of the
-    // file — TypeScript's checkJs mode respects that directive.
+    // Declare globals that are injected at runtime so checkJs doesn't flag them
+    // as undefined. The buildWindowGlobalsShim() function automatically detects
+    // window globals from the host application. Common Sprockets globals
+    // (React, ReactDOM, etc.) are declared explicitly. For additional globals
+    // not auto-detected, add `/* global MyComponent */` at the top of the file.
     if (monaco.languages.typescript && monaco.languages.typescript.javascriptDefaults) {
       monaco.languages.typescript.javascriptDefaults.addExtraLib(
         [
@@ -515,12 +512,18 @@
         );
       }
 
-      // Downgrade "declared but never read" (TS6133) from Error to Warning.
-      // TypeScript has no built-in way to emit this as a warning, so we intercept
+      // Downgrade certain TypeScript diagnostic codes from Error to Warning.
+      // TypeScript has no built-in way to emit these as warnings, so we intercept
       // the marker set after the worker fires and re-apply with lower severity.
-      // JS files use owner 'javascript', TS files use 'typescript'.
-      var WARN_CODES = { '6133': true };
-      var TS_OWNERS = ['javascript', 'typescript'];
+      //
+      // Patch markers after the TypeScript worker fires:
+      // - Both: downgrade TS6133 ("declared but never read") from Error to Warning.
+      // Host-app globals are handled by the dynamic window shim and explicit
+      // addExtraLib declarations above — we do not suppress TS2304 globally so
+      // that genuinely undefined names are still flagged as errors.
+      var JS_SUPPRESS_CODES = {};
+      var JS_WARN_CODES    = { '6133': true };
+      var TS_WARN_CODES    = { '6133': true };
       var _severityPatchActive = false;
       monaco.editor.onDidChangeMarkers(function(uris) {
         if (_severityPatchActive) return;
@@ -529,14 +532,20 @@
           uris.forEach(function(uri) {
             var model = monaco.editor.getModel(uri);
             if (!model) return;
-            TS_OWNERS.forEach(function(owner) {
-              var markers = monaco.editor.getModelMarkers({ resource: uri, owner: owner });
+            [
+              { owner: 'javascript', suppress: JS_SUPPRESS_CODES, warn: JS_WARN_CODES },
+              { owner: 'typescript', suppress: {},                 warn: TS_WARN_CODES }
+            ].forEach(function(entry) {
+              var markers = monaco.editor.getModelMarkers({ resource: uri, owner: entry.owner });
               var needsPatch = markers.some(function(m) {
-                return m.severity === monaco.MarkerSeverity.Error && WARN_CODES[String(m.code)];
+                var code = String(m.code);
+                return (m.severity === monaco.MarkerSeverity.Error && (entry.suppress[code] || entry.warn[code]));
               });
               if (!needsPatch) return;
-              monaco.editor.setModelMarkers(model, owner, markers.map(function(m) {
-                return (m.severity === monaco.MarkerSeverity.Error && WARN_CODES[String(m.code)])
+              monaco.editor.setModelMarkers(model, entry.owner, markers.filter(function(m) {
+                return !entry.suppress[String(m.code)];
+              }).map(function(m) {
+                return (m.severity === monaco.MarkerSeverity.Error && entry.warn[String(m.code)])
                   ? Object.assign({}, m, { severity: monaco.MarkerSeverity.Warning })
                   : m;
               }));
@@ -548,7 +557,7 @@
       });
     }
 
-    // TypeScript: enable JSX for .tsx files and catch unused locals.
+    // TypeScript: enable JSX for .tsx files.
     if (monaco.languages.typescript && monaco.languages.typescript.typescriptDefaults) {
       monaco.languages.typescript.typescriptDefaults.setCompilerOptions({
         target: monaco.languages.typescript.ScriptTarget.ES2020,

data/lib/mbeditor/rack/handle_pending_migrations.rb

@@ -36,6 +36,15 @@ module Mbeditor
       private
 
       def editor_shell_html(base)
+        prettier_scripts = %w[
+          prettier-standalone.js
+          prettier-plugin-babel.js
+          prettier-plugin-estree.js
+          prettier-plugin-html.js
+          prettier-plugin-postcss.js
+          prettier-plugin-markdown.js
+        ].map { |f| "#{base}/assets/#{f}" }.to_json
+
         <<~HTML
           <!DOCTYPE html>
           <html lang="en">
@@ -45,6 +54,16 @@ module Mbeditor
             <title>Mbeditor</title>
             <link rel="stylesheet" href="#{base}/assets/fontawesome.min.css" />
             <link rel="stylesheet" href="#{base}/assets/mbeditor/application.css" />
+            <script defer src="#{base}/assets/react.min.js"></script>
+            <script defer src="#{base}/assets/react-dom.min.js"></script>
+            <script defer src="#{base}/assets/axios.min.js"></script>
+            <script defer src="#{base}/assets/lodash.min.js"></script>
+            <script defer src="#{base}/assets/minisearch.min.js"></script>
+            <script defer src="#{base}/assets/marked.min.js"></script>
+            <script defer src="#{base}/assets/emmet.js"></script>
+            <script defer src="#{base}/assets/monaco-themes-bundle.js"></script>
+            <script>var require = { paths: { vs: '#{base}/monaco-editor/vs', 'monaco-editor/esm/vs': '#{base}/monaco-editor/vs', 'monaco-vim': '#{base}/assets/monaco-vim' } };</script>
+            <script src="#{base}/monaco-editor/vs/loader.js"></script>
           </head>
           <body>
             <script>
@@ -60,68 +79,70 @@ module Mbeditor
                 <div class="mbeditor-loading-text">Loading editor&hellip;</div>
               </div>
             </div>
-            <script defer src="#{base}/assets/react.min.js"></script>
-            <script defer src="#{base}/assets/react-dom.min.js"></script>
-            <script defer src="#{base}/assets/axios.min.js"></script>
-            <script defer src="#{base}/assets/lodash.min.js"></script>
-            <script defer src="#{base}/assets/minisearch.min.js"></script>
-            <script defer src="#{base}/assets/marked.min.js"></script>
-            <script defer src="#{base}/assets/emmet.js"></script>
-            <script defer src="#{base}/assets/monaco-themes-bundle.js"></script>
             <script>
               window.MonacoEnvironment = {
                 getWorkerUrl: function(workerId, label) {
-                  if (label === 'typescript' || label === 'javascript') return '#{base}/ts_worker.js';
-                  return '#{base}/monaco_worker.js';
+                  var b = window.MBEDITOR_BASE_PATH || '';
+                  if (label === 'typescript' || label === 'javascript') return b + '/ts_worker.js';
+                  return b + '/monaco_worker.js';
                 }
               };
-              var require = { paths: { vs: '#{base}/monaco-editor/vs', 'monaco-editor/esm/vs': '#{base}/monaco-editor/vs', 'monaco-vim': '#{base}/assets/monaco-vim' } };
-            </script>
-            <script src="#{base}/monaco-editor/vs/loader.js"></script>
-            <script>
               (function() {
-                var prettierScripts = [
-                  '#{base}/assets/prettier-standalone.js',
-                  '#{base}/assets/prettier-plugin-babel.js',
-                  '#{base}/assets/prettier-plugin-estree.js',
-                  '#{base}/assets/prettier-plugin-html.js',
-                  '#{base}/assets/prettier-plugin-postcss.js',
-                  '#{base}/assets/prettier-plugin-markdown.js'
-                ];
                 var _define = window.define;
                 window.define = undefined;
-                var pending = prettierScripts.length;
-                function onAllPrettierLoaded() {
-                  function proceed() {
-                    window.MbeditorRuntime = { React: window.React, ReactDOM: window.ReactDOM };
-                    window.React    = window._mbeditorHostReact;
-                    window.ReactDOM = window._mbeditorHostReactDOM;
-                    window.define = _define;
-                    require(['vs/editor/editor.main'], function() {
-                      if (window.MBEDITOR_CUSTOM_THEMES && window.monaco) {
-                        Object.keys(window.MBEDITOR_CUSTOM_THEMES).forEach(function(id) {
-                          window.monaco.editor.defineTheme(id, window.MBEDITOR_CUSTOM_THEMES[id]);
-                        });
-                      }
+
+                var prettierScripts = #{prettier_scripts};
+                window.loadPrettierPlugins = function() {
+                  if (window._prettierLoadPromise) return window._prettierLoadPromise;
+                  window._prettierLoadPromise = new Promise(function(resolve, reject) {
+                    var savedDefine = window.define;
+                    window.define = undefined;
+                    var pending = prettierScripts.length;
+                    prettierScripts.forEach(function(src) {
                       var s = document.createElement('script');
-                      s.src = '#{base}/assets/mbeditor/application.js';
-                      s.onload = function() {
-                        var root = document.getElementById('mbeditor-root');
-                        var _R = window.MbeditorRuntime.React, _RD = window.MbeditorRuntime.ReactDOM;
-                        if (window.MbeditorApp && _R && _RD) _RD.render(_R.createElement(window.MbeditorApp), root);
-                      };
-                      document.body.appendChild(s);
+                      s.src = src;
+                      s.onload = function() { if (--pending === 0) { window.define = savedDefine; resolve(); } };
+                      s.onerror = function() { window.define = savedDefine; reject(new Error('Failed to load Prettier: ' + src)); };
+                      document.head.appendChild(s);
                     });
-                  }
-                  if (window._mbeditorDOMReady) proceed();
-                  else document.addEventListener('DOMContentLoaded', proceed, { once: true });
+                  });
+                  return window._prettierLoadPromise;
+                };
+
+                function proceed() {
+                  window.MbeditorRuntime = { React: window.React, ReactDOM: window.ReactDOM };
+                  window.React    = window._mbeditorHostReact;
+                  window.ReactDOM = window._mbeditorHostReactDOM;
+                  window.define = _define;
+
+                  var _monacoResolve;
+                  window.__monacoReady = new Promise(function(resolve) { _monacoResolve = resolve; });
+
+                  var appScript = document.createElement('script');
+                  appScript.src = '#{base}/assets/mbeditor/application.js';
+                  appScript.onload = function() {
+                    var root = document.getElementById('mbeditor-root');
+                    var _R = window.MbeditorRuntime.React, _RD = window.MbeditorRuntime.ReactDOM;
+                    if (window.MbeditorApp && _R && _RD) _RD.render(_R.createElement(window.MbeditorApp), root);
+                  };
+                  appScript.onerror = function() {
+                    document.getElementById('mbeditor-root').innerHTML =
+                      '<div style="padding:2rem;font-family:sans-serif;color:#c00">Editor failed to load. Please refresh the page.</div>';
+                  };
+                  document.body.appendChild(appScript);
+
+                  require(['vs/editor/editor.main'], function() {
+                    if (window.MBEDITOR_CUSTOM_THEMES && window.monaco) {
+                      Object.keys(window.MBEDITOR_CUSTOM_THEMES).forEach(function(id) {
+                        window.monaco.editor.defineTheme(id, window.MBEDITOR_CUSTOM_THEMES[id]);
+                      });
+                    }
+                    _monacoResolve();
+                  });
                 }
-                prettierScripts.forEach(function(src) {
-                  var s = document.createElement('script');
-                  s.src = src;
-                  s.onload = function() { if (--pending === 0) onAllPrettierLoaded(); };
-                  document.head.appendChild(s);
-                });
+
+                if (window._mbeditorDOMReady) proceed();
+                else document.addEventListener('DOMContentLoaded', proceed, { once: true });
               })();
             </script>
           </body>

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Oliver Noonan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-30 00:00:00.000000000 Z
+date: 2026-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails