mbeditor 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e34c84c4c7e3a0ef9d4382dd49c29ac3bd13fdc42f8b38d50666cdd30439b6
-  data.tar.gz: 07a9658a8d2faa837969d7c8b05556eaba59afeb48af63b9c8482d7693805b64
+  metadata.gz: 31199cd73e4e3321d8851a62ab20decd6e9c8d9ab328b50d9f987f85da1333b2
+  data.tar.gz: 27de9f3e0641c41e693023b3fcbedbe0d89d35d8d1fd7f3606aaa8095ceeb5b2
 SHA512:
-  metadata.gz: 4506a5f5c0e7d7c5b111f9e6cb665cf5d95b7a2e9be5c140948c49f3fbb3a7ee9c13e78d1924d891522131cb85d512242074202298172a10915ea57e6e48f71a
-  data.tar.gz: c7b06da62965639c18f0531a9459da9ddcfeb14ba29ecceadeb600aeec8eb28197657c3dcca4dec5311978fef1397dc610cc2d9f27ead2513ec2e768daceda62
+  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/components/FileTree.js

@@ -12,6 +12,13 @@ var useRef = _React.useRef;
 var useEffect = _React.useEffect;
 var useMemo = _React.useMemo;
 
+function formatSize(bytes) {
+  if (typeof bytes !== 'number' || bytes < 0) return '';
+  if (bytes < 1024)        return bytes + ' B';
+  if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + ' KB';
+  return (bytes / (1024 * 1024)).toFixed(1) + ' MB';
+}
+
 var FileTree = function FileTree(_ref) {
   var items = _ref.items;
   var onSelect = _ref.onSelect;
@@ -477,7 +484,7 @@ var FileTree = function FileTree(_ref) {
           ),
           React.createElement(
             'div',
-            { className: 'tree-item-name', title: node.path },
+            { className: 'tree-item-name', title: node.type === 'file' && node.size != null ? node.path + ' — ' + formatSize(node.size) : node.path },
             node.name
           ),
           statusMeta && React.createElement(

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

@@ -51,12 +51,16 @@
 
   var globalsRegistered = false;
 
-  // Enumerate window for user-defined (non-native) globals and return a TypeScript
-  // declaration string.  Sprockets exposes every top-level var/function as a window
-  // property before Monaco initialises, so scanning window at registration time
-  // captures components, services, and helpers without any manual listing.
+  // Enumerate window for user-defined globals and return a TypeScript declaration string.
+  // Sprockets exposes every top-level var/function as a window property before Monaco
+  // initialises, so scanning at registration time captures all components and helpers.
+  //
+  // Filter: keep only plain writable data properties (configurable, writable, no getter).
+  // Browser built-ins are either non-configurable or accessor properties (hasGet), so
+  // this reliably separates them from user-assigned globals without a native-code test
+  // (which only works for functions, not objects like `document` or `location`).
   function buildWindowGlobalsShim() {
-    var alreadyDeclared = { React: 1, ReactDOM: 1, PropTypes: 1, MaterialUI: 1 };
+    var alreadyDeclared = { React: 1, ReactDOM: 1, PropTypes: 1, MaterialUI: 1, $: 1, jQuery: 1 };
     var lines = [];
     try {
       var keys = Object.keys(window);
@@ -67,11 +71,6 @@
         var value;
         try { value = window[key]; } catch (e) { continue; }
         if (value === null || value === undefined) continue;
-        if (typeof value === 'function') {
-          try {
-            if (/\[native code\]/.test(Function.prototype.toString.call(value))) continue;
-          } catch (e) { continue; }
-        }
         lines.push('declare var ' + key + ': any;');
       }
     } catch (e) {}
@@ -322,6 +321,30 @@
         event.stopPropagation();
       });
 
+      // Navigate to a Ruby symbol: modules/classes go to their definition file,
+      // lowercase symbols go to their def line.
+      function navigateToWord(word) {
+        if (/^[A-Z]/.test(word) && typeof FileService !== 'undefined' && FileService.getModuleMembers) {
+          FileService.getModuleMembers(word).then(function(data) {
+            if (!data || !data.file) return;
+            var filename = data.file.split('/').pop();
+            if (typeof TabManager !== 'undefined' && TabManager.openTab) {
+              TabManager.openTab(data.file, filename, 1);
+            }
+          }).catch(function() {});
+          return;
+        }
+        if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
+        FileService.getDefinition(word, 'ruby').then(function(data) {
+          var results = data && Array.isArray(data.results) ? data.results : [];
+          if (results.length === 0) return;
+          var r = results[0];
+          if (typeof TabManager !== 'undefined' && TabManager.openTab) {
+            TabManager.openTab(r.file, r.file.split('/').pop(), r.line);
+          }
+        }).catch(function() {});
+      }
+
       // Ctrl/Cmd+click — navigate to definition
       gotoMouseDisposable = editor.onMouseDown(function(event) {
         var ctrlOrCmd = event.event.ctrlKey || event.event.metaKey;
@@ -336,19 +359,9 @@
         if (!wordInfo || !wordInfo.word || wordInfo.word.length < 2) return;
         if (RUBY_KEYWORDS[wordInfo.word]) return;
         if (RUBY_CORE_METHODS[wordInfo.word]) return;
-        if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
 
         event.event.preventDefault();
-
-        FileService.getDefinition(wordInfo.word, 'ruby').then(function(data) {
-          var results = data && Array.isArray(data.results) ? data.results : [];
-          if (results.length === 0) return;
-          var r = results[0];
-          var filename = r.file.split('/').pop();
-          if (typeof TabManager !== 'undefined' && TabManager.openTab) {
-            TabManager.openTab(r.file, filename, r.line);
-          }
-        }).catch(function() {});
+        navigateToWord(wordInfo.word);
       });
 
       // F12 — go to definition from keyboard
@@ -365,17 +378,7 @@
           if (!wordInfo || !wordInfo.word || wordInfo.word.length < 2) return;
           if (RUBY_KEYWORDS[wordInfo.word]) return;
           if (RUBY_CORE_METHODS[wordInfo.word]) return;
-          if (typeof FileService === 'undefined' || !FileService.getDefinition) return;
-
-          FileService.getDefinition(wordInfo.word, 'ruby').then(function(data) {
-            var results = data && Array.isArray(data.results) ? data.results : [];
-            if (results.length === 0) return;
-            var r = results[0];
-            var filename = r.file.split('/').pop();
-            if (typeof TabManager !== 'undefined' && TabManager.openTab) {
-              TabManager.openTab(r.file, filename, r.line);
-            }
-          }).catch(function() {});
+          navigateToWord(wordInfo.word);
         }
       });
     }
@@ -482,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(
         [
@@ -494,6 +497,8 @@
           'declare var ReactDOM: any;',
           'declare var PropTypes: any;',
           'declare var MaterialUI: any;',
+          'declare var $: any;',
+          'declare var jQuery: any;',
           'interface Window { [key: string]: any; }'
         ].join('\n'),
         'inmemory://mbeditor/sprockets-globals.d.ts'
@@ -506,9 +511,53 @@
           'inmemory://mbeditor/window-globals.d.ts'
         );
       }
+
+      // 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.
+      //
+      // 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;
+        _severityPatchActive = true;
+        try {
+          uris.forEach(function(uri) {
+            var model = monaco.editor.getModel(uri);
+            if (!model) return;
+            [
+              { 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) {
+                var code = String(m.code);
+                return (m.severity === monaco.MarkerSeverity.Error && (entry.suppress[code] || entry.warn[code]));
+              });
+              if (!needsPatch) return;
+              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;
+              }));
+            });
+          });
+        } finally {
+          _severityPatchActive = false;
+        }
+      });
     }
 
-    // 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/app/controllers/mbeditor/editors_controller.rb

@@ -337,7 +337,8 @@ module Mbeditor
                     workspace_root,
                     symbol,
                     excluded_dirnames: excluded_dirnames,
-                    excluded_paths: excluded_paths
+                    excluded_paths:    excluded_paths,
+                    included_dirs:     ruby_def_include_dirs
                   )
                   ri = RiDefinitionService.call(symbol)
                   workspace + ri
@@ -360,7 +361,8 @@ module Mbeditor
       file = RubyDefinitionService.module_defined_in(
         workspace_root, name,
         excluded_dirnames: excluded_dirnames,
-        excluded_paths:    excluded_paths
+        excluded_paths:    excluded_paths,
+        included_dirs:     ruby_def_include_dirs
       )
       return render json: { name: name, methods: [] } unless file
 
@@ -383,14 +385,16 @@ module Mbeditor
       # Fast no-op on subsequent calls (mtime checks only).
       RubyDefinitionService.scan(workspace_root,
                                  excluded_dirnames: excluded_dirnames,
-                                 excluded_paths:    excluded_paths)
+                                 excluded_paths:    excluded_paths,
+                                 included_dirs:     ruby_def_include_dirs)
 
       module_names = RubyDefinitionService.includes_in_file(path)
       includes = module_names.filter_map do |mod_name|
         mod_file = RubyDefinitionService.module_defined_in(
           workspace_root, mod_name,
           excluded_dirnames: excluded_dirnames,
-          excluded_paths:    excluded_paths
+          excluded_paths:    excluded_paths,
+          included_dirs:     ruby_def_include_dirs
         )
         next unless mod_file
 
@@ -1068,7 +1072,8 @@ module Mbeditor
         if File.directory?(full)
           { name: name, type: "folder", path: rel, children: build_tree(full, depth: depth + 1) }
         else
-          { name: name, type: "file", path: rel }
+          size = File.size(full) rescue nil
+          { name: name, type: "file", path: rel, size: size }
         end
       end
     rescue Errno::EACCES
@@ -1083,6 +1088,10 @@ module Mbeditor
       excluded_paths.filter { |path| !path.include?("/") }
     end
 
+    def ruby_def_include_dirs
+      Array(Mbeditor.configuration.ruby_def_include_dirs).map(&:to_s).reject(&:blank?)
+    end
+
     def excluded_path?(relative_path, name)
       excluded_paths.any? do |pattern|
         if pattern.include?("/")

data/app/services/mbeditor/ruby_definition_service.rb

@@ -51,10 +51,11 @@ module Mbeditor
       attr_reader :file_cache, :mutex
       attr_accessor :cache_path
 
-      def call(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [])
+      def call(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
         new(workspace_root, symbol,
             excluded_dirnames: excluded_dirnames,
-            excluded_paths: excluded_paths).call
+            excluded_paths:    excluded_paths,
+            included_dirs:     included_dirs).call
       end
 
       # Load the JSON cache from disk exactly once per process (double-checked
@@ -122,20 +123,26 @@ module Mbeditor
       # Searches the cache (and triggers a workspace scan if needed) to find
       # which file in +workspace_root+ defines the given module or class name.
       # Returns the absolute file path string or nil.
-      def module_defined_in(workspace_root, module_name, excluded_dirnames: [], excluded_paths: [])
+      def module_defined_in(workspace_root, module_name, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
         load_disk_cache_once
+        root_prefix = workspace_root.to_s.chomp("/")
+        within_dirs = ->(path) {
+          return true if included_dirs.empty?
+          included_dirs.any? { |d| path.start_with?(File.join(root_prefix, d) + "/") }
+        }
         result = @mutex.synchronize do
-          @file_cache.find { |_path, entry| entry[:module_names]&.include?(module_name) }
+          @file_cache.find { |path, entry| within_dirs.call(path) && entry[:module_names]&.include?(module_name) }
         end
         return result[0] if result
 
         # Cache miss: scan workspace to populate cache entries with module_names.
         new(workspace_root, nil,
             excluded_dirnames: excluded_dirnames,
-            excluded_paths:    excluded_paths).scan_workspace
+            excluded_paths:    excluded_paths,
+            included_dirs:     included_dirs).scan_workspace
 
         result = @mutex.synchronize do
-          @file_cache.find { |_path, entry| entry[:module_names]&.include?(module_name) }
+          @file_cache.find { |path, entry| within_dirs.call(path) && entry[:module_names]&.include?(module_name) }
         end
         result ? result[0] : nil
       end
@@ -153,18 +160,20 @@ module Mbeditor
 
       # Convenience wrapper: scan the whole workspace to warm the cache.
       # Fast on subsequent calls (only re-parses files whose mtime changed).
-      def scan(workspace_root, excluded_dirnames: [], excluded_paths: [])
+      def scan(workspace_root, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
         new(workspace_root, nil,
             excluded_dirnames: excluded_dirnames,
-            excluded_paths:    excluded_paths).scan_workspace
+            excluded_paths:    excluded_paths,
+            included_dirs:     included_dirs).scan_workspace
       end
     end
 
-    def initialize(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [])
-      @workspace_root   = workspace_root.to_s.chomp("/")
-      @symbol           = symbol
+    def initialize(workspace_root, symbol, excluded_dirnames: [], excluded_paths: [], included_dirs: [])
+      @workspace_root    = workspace_root.to_s.chomp("/")
+      @symbol            = symbol
       @excluded_dirnames = Array(excluded_dirnames)
       @excluded_paths    = Array(excluded_paths)
+      @included_dirs     = Array(included_dirs)
     end
 
     # Walks the entire workspace and populates the per-file cache (including the
@@ -176,27 +185,29 @@ module Mbeditor
       files_scanned = 0
       evict_deleted_cache_entries
 
-      Find.find(@workspace_root) do |path|
-        if File.directory?(path)
-          dirname = File.basename(path)
-          rel_dir = relative_path(path)
-          Find.prune if path != @workspace_root && excluded_dir?(dirname, rel_dir)
-          next
-        end
-        next unless path.end_with?(".rb")
+      search_roots.each do |root|
+        Find.find(root) do |path|
+          if File.directory?(path)
+            dirname = File.basename(path)
+            rel_dir = relative_path(path)
+            Find.prune if path != root && excluded_dir?(dirname, rel_dir)
+            next
+          end
+          next unless path.end_with?(".rb")
 
-        rel = relative_path(path)
-        next if excluded_rel_path?(rel, File.basename(path))
+          rel = relative_path(path)
+          next if excluded_rel_path?(rel, File.basename(path))
 
-        files_scanned += 1
-        if files_scanned > MAX_FILES_SCANNED
-          Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
-          break
-        end
-        begin
-          cache_entry_for(path)
-        rescue StandardError
-          nil
+          files_scanned += 1
+          if files_scanned > MAX_FILES_SCANNED
+            Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
+            break
+          end
+          begin
+            cache_entry_for(path)
+          rescue StandardError
+            nil
+          end
         end
       end
 
@@ -212,46 +223,46 @@ module Mbeditor
 
       evict_deleted_cache_entries
 
-      Find.find(@workspace_root) do |path|
-        # Prune excluded directories
-        if File.directory?(path)
-          dirname = File.basename(path)
-          rel_dir = relative_path(path)
-          if path != @workspace_root && excluded_dir?(dirname, rel_dir)
-            Find.prune
+      search_roots.each do |root|
+        Find.find(root) do |path|
+          # Prune excluded directories
+          if File.directory?(path)
+            dirname = File.basename(path)
+            rel_dir = relative_path(path)
+            Find.prune if path != root && excluded_dir?(dirname, rel_dir)
+            next
           end
-          next
-        end
 
-        next unless path.end_with?(".rb")
+          next unless path.end_with?(".rb")
 
-        rel = relative_path(path)
-        next if excluded_rel_path?(rel, File.basename(path))
-
-        files_scanned += 1
-        if files_scanned > MAX_FILES_SCANNED
-          Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
-          break
-        end
+          rel = relative_path(path)
+          next if excluded_rel_path?(rel, File.basename(path))
 
-        begin
-          cached = cache_entry_for(path)
-          next unless cached
-
-          hit_lines = @symbol ? cached[:all_defs].fetch(@symbol, nil) : nil
-          next unless hit_lines && hit_lines.any?
+          files_scanned += 1
+          if files_scanned > MAX_FILES_SCANNED
+            Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
+            break
+          end
 
-          hit_lines.each do |def_line|
-            results << {
-              file:      rel,
-              line:      def_line,
-              signature: (cached[:lines][def_line - 1] || "").strip,
-              comments:  extract_comments(cached[:lines], def_line)
-            }
-            return results if results.length >= MAX_RESULTS
+          begin
+            cached = cache_entry_for(path)
+            next unless cached
+
+            hit_lines = @symbol ? cached[:all_defs].fetch(@symbol, nil) : nil
+            next unless hit_lines && hit_lines.any?
+
+            hit_lines.each do |def_line|
+              results << {
+                file:      rel,
+                line:      def_line,
+                signature: (cached[:lines][def_line - 1] || "").strip,
+                comments:  extract_comments(cached[:lines], def_line)
+              }
+              return results if results.length >= MAX_RESULTS
+            end
+          rescue StandardError
+            # Malformed file or unreadable; skip silently
           end
-        rescue StandardError
-          # Malformed file or unreadable; skip silently
         end
       end
 
@@ -386,6 +397,15 @@ module Mbeditor
       full_path.to_s.delete_prefix(@workspace_root).delete_prefix("/")
     end
 
+    def search_roots
+      return [@workspace_root] if @included_dirs.empty?
+
+      dirs = @included_dirs
+               .map { |d| File.join(@workspace_root, d) }
+               .select { |d| File.directory?(d) }
+      dirs.empty? ? [@workspace_root] : dirs
+    end
+
     def excluded_dir?(dirname, rel_dir)
       @excluded_dirnames.include?(dirname) ||
         @excluded_paths.any? do |pattern|

data/lib/mbeditor/configuration.rb

@@ -6,7 +6,8 @@ module Mbeditor
                   :redmine_enabled, :redmine_url, :redmine_api_key, :redmine_ticket_source,
                   :test_framework, :test_command, :test_timeout,
                   :authenticate_with,
-                  :lint_timeout, :base_branch_candidates, :git_timeout
+                  :lint_timeout, :base_branch_candidates, :git_timeout,
+                  :ruby_def_include_dirs
 
     def initialize
       @allowed_environments = [:development]
@@ -22,7 +23,8 @@ module Mbeditor
       @test_timeout     = 60  # seconds
       @lint_timeout     = 15  # seconds for RuboCop/haml-lint subprocesses
       @base_branch_candidates = %w[origin/develop origin/main origin/master develop main master]
-      @git_timeout      = nil # seconds; nil disables (no timeout on git subprocesses)
+      @git_timeout            = nil # seconds; nil disables (no timeout on git subprocesses)
+      @ruby_def_include_dirs  = %w[app/models app/controllers app/helpers app/concerns]
     end
   end
 end

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.1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  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