mbeditor 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 141c77f551fd195ca9003f28b527f22f29d735fa70e1a1f80f638ad5739edf2d
-  data.tar.gz: 479f09a85f6c11c76f014ec85f269d5597bee72eb9e10135e65df275046a4fac
+  metadata.gz: 2a6414a87f25b938891d8e0de50d55442fe0b416450105f5b5b9b01b882798ec
+  data.tar.gz: f4b440dfe943a96e448cf88646443b8618d36fd3e1ee8957864d77458c2464cc
 SHA512:
-  metadata.gz: d1015d5ca772fd35e20c83837ca54d4751ff3b09f0c1978a0d5e55bbb7ba392107e461bb7656ae7ac8158babb55289579afe15d9772f07024229ce6f77b1cb62
-  data.tar.gz: 4194a9575055264e59b6f1922bfb7fa225c64242e9de8c406ca43a4c1995397b711204471994651d9b94da6b4ae0a02958f9d48833436af7e5f4dddb083990c9
+  metadata.gz: d1331d96e131f19e34d72919edce2b3d5e868e2a37776fa3230cd4a825c60f966b4aeae881e5624b87d2ddbd57971fa785e890e6f67f64bdf32e9e740892aa54
+  data.tar.gz: 7d3c20115f90d5ca2ede013ab230b3ead7a19352a582f68157edf288b9c9302c46620ee432b69e188ad2c65f0424b53c8c8b1085502b16aa811ec7f823fa2add

data/CHANGELOG.md

@@ -5,10 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.2.2] - 2026-04-02
+## [0.2.4] - 2026-04-02
+
+### Added
+- **Global service exposure** — `SearchService` and `GitService` are now attached to the `window` object so host-app scripts can call them directly.
+- **Loading indicator** — editor now shows a loading state while assets initialise.
+
+### Changed
+- **Service worker** — simplified to a minimal implementation; removed the caching layer that was causing stale-asset issues.
+- **Monaco Handlebars language** — updated language definition for improved syntax coverage and structure.
+
+### Fixed
+- Test suite clean-up following recent service and SW changes.
+
+## [0.2.3] - 2026-04-02
 
 ### Changed
-- Bumped the gem version for the next tagged release.
+- Released the current mainline commit as the latest tagged version.
 
 ## [0.2.1] - 2026-04-01
 

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

@@ -1,3 +1,4 @@
+//= require mbeditor/application_iife_head
 //= require mbeditor/editor_store
 //= require mbeditor/file_icon
 //= require mbeditor/file_service
@@ -19,3 +20,4 @@
 //= require mbeditor/components/QuickOpenDialog
 //= require mbeditor/components/TabBar
 //= require mbeditor/components/MbeditorApp
+//= require mbeditor/application_iife_tail

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

@@ -0,0 +1,4 @@
+// Mbeditor app IIFE — React and ReactDOM are injected from window.MbeditorRuntime
+// so that mbeditor never reads from or writes to window.React / window.ReactDOM,
+// protecting the host application's globals.
+(function(React, ReactDOM) {

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

@@ -0,0 +1,3 @@
+window.SearchService = SearchService;
+window.GitService = GitService;
+})(window.MbeditorRuntime.React, window.MbeditorRuntime.ReactDOM);

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

@@ -475,14 +475,14 @@ var EditorPanel = function EditorPanel(_ref) {
       formatOnType: true
     });
 
-    monacoRef.current = editor;
-    window.__mbeditorActiveEditor = editor;
-    setEditorReady(true);
-
     if (tab.viewState) {
       editor.restoreViewState(tab.viewState);
     }
 
+    monacoRef.current = editor;
+    window.__mbeditorActiveEditor = editor;
+    setEditorReady(true);
+
     // Stash the workspace-relative path on the model so code-action providers
     // can identify which file they are operating on without needing React state.
     var modelObj = editor.getModel();
@@ -503,11 +503,14 @@ var EditorPanel = function EditorPanel(_ref) {
       editorPluginDisposable = window.MbeditorEditorPlugins.attachEditorFeatures(editor, language);
     }
 
-    // Column selection only when Alt is held during drag.
-    // We toggle Monaco's columnSelection option on Alt+mousedown and reset on mouseup.
+    // Column selection only when Ctrl/Cmd is held during drag.
+    // We toggle Monaco's columnSelection option on Ctrl/Cmd+mousedown and reset on mouseup.
+    // Alt+mousedown without Ctrl/Cmd is suppressed (preventDefault stops Monaco's built-in Alt+drag).
     var onColumnMouseDown = function(ev) {
-      if (ev.altKey && !ev.ctrlKey && !ev.metaKey) {
+      if (ev.ctrlKey || ev.metaKey) {
         editor.updateOptions({ columnSelection: true });
+      } else if (ev.altKey) {
+        ev.preventDefault();
       }
     };
     var onColumnMouseUp = function() {
@@ -903,8 +906,7 @@ var EditorPanel = function EditorPanel(_ref) {
   // Map a test method name to the best-matching line in the source file.
   // Extracts keywords from the test name and scores each source line.
   var mapTestToSourceLine = function(testName, sourceContent) {
-    // Strip Minitest-style "ClassName#" prefix before the usual transformations
-    var name = (testName || '').replace(/^\w+#/, '').replace(/^test_/, '').replace(/^(it |should )/, '');
+    var name = (testName || '').replace(/^test_/, '').replace(/^(it |should )/, '');
     var tokens = name.split('_').filter(function(t) { return t.length > 1; });
     if (tokens.length === 0) return 1;
 

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

@@ -385,7 +385,8 @@
       indentationRules: {
         increaseIndentPattern: /^\s*(def|class|module|if|unless|case|while|until|for|begin|elsif|else|rescue|ensure|when)\b/,
         decreaseIndentPattern: /^\s*(end|elsif|else|rescue|ensure|when)\b/
-      }
+      },
+      wordPattern: /[a-zA-Z_]\w*[!?]?/
     });
 
     // Override Monaco's built-in Ruby tokenizer with a comprehensive Monarch grammar
@@ -695,7 +696,7 @@
     // Calls the backend /definition endpoint (Ripper-based) and renders
     // the method signature and any preceding # comments as hover markdown.
     monaco.languages.registerHoverProvider('ruby', {
-      provideHover: function provideHover(model, position) {
+      provideHover: function provideHover(model, position, token) {
         var wordInfo = model.getWordAtPosition(position);
         if (!wordInfo) return null;
 
@@ -707,6 +708,11 @@
         var currentFile = model._mbeditorPath || null;
 
         return FileService.getDefinition(word, 'ruby').then(function(data) {
+          // If the hover was cancelled while the request was in flight (e.g. the
+          // user moved the mouse away), return null so Monaco's CancelablePromise
+          // wrapper resolves cleanly instead of throwing "Canceled".
+          if (token && token.isCancellationRequested) return null;
+
           var results = data && Array.isArray(data.results) ? data.results : [];
           // Filter out results that are in the file currently being edited —
           // showing a hover for a method you can already see adds no value.

data/app/assets/stylesheets/mbeditor/application.css

@@ -845,4 +845,29 @@
 .cdiff-hunk { background: rgba(86,156,214,0.08);  color: #569cd6; font-style: italic; }
 .cdiff-meta { color: #666; font-size: 11px; }
 .cdiff-file-header { color: #9db0c7; }
+
+/* ── Loading indicator ───────────────────────────────────────────────── */
+#mbeditor-loading {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  height: 100vh;
+  background: #1e1e1e;
+  color: #858585;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 13px;
+  gap: 14px;
+}
+.mbeditor-spinner {
+  width: 28px;
+  height: 28px;
+  border: 2px solid rgba(255,255,255,0.08);
+  border-top-color: #569cd6;
+  border-radius: 50%;
+  animation: mbeditor-spin 0.75s linear infinite;
+}
+@keyframes mbeditor-spin {
+  to { transform: rotate(360deg); }
+}
 .cdiff-ctx  { color: #9d9d9d; }

data/app/controllers/mbeditor/editors_controller.rb

@@ -207,7 +207,7 @@ module Mbeditor
       language = params[:language].to_s.strip
 
       return render json: { results: [] } if symbol.blank?
-      return render json: { error: "Invalid symbol" }, status: :bad_request unless symbol.match?(/\A[a-zA-Z0-9_]{1,60}\z/)
+      return render json: { error: "Invalid symbol" }, status: :bad_request unless symbol.match?(/\A[a-zA-Z_]\w{0,59}[!?]?\z/)
 
       results = case language
                 when "ruby"

data/app/views/layouts/mbeditor/application.html.erb

@@ -17,40 +17,40 @@
   <title>Mbeditor — <%= Rails.root.basename %></title>
 
   <!-- ── Fonts and Styles ──────────────────────────────── -->
-  <%= stylesheet_link_tag "fontawesome.min", media: "all" %>
-  <%= stylesheet_link_tag "mbeditor/application", media: "all" %>
+  <%= stylesheet_link_tag "fontawesome.min", media: "all", preload_links_header: false %>
+  <%= stylesheet_link_tag "mbeditor/application", media: "all", preload_links_header: false %>
 
-  <!-- ── Vendor JS (order matters) ─────────────────────── -->
-  <script src="<%= asset_path('react.min.js') %>"></script>
-  <script src="<%= asset_path('react-dom.min.js') %>"></script>
-  <script src="<%= asset_path('axios.min.js') %>"></script>
-  <script src="<%= asset_path('lodash.min.js') %>"></script>
-  <script src="<%= asset_path('minisearch.min.js') %>"></script>
-  <script src="<%= asset_path('marked.min.js') %>"></script>
-  <!-- ── Monaco loader ─────────────────────────────────── -->
+  <!-- ── Vendor JS (deferred — only needed inside Monaco callback) ── -->
+  <script defer src="<%= asset_path('react.min.js') %>"></script>
+  <script defer src="<%= asset_path('react-dom.min.js') %>"></script>
+  <script defer src="<%= asset_path('axios.min.js') %>"></script>
+  <script defer src="<%= asset_path('lodash.min.js') %>"></script>
+  <script defer src="<%= asset_path('minisearch.min.js') %>"></script>
+  <script defer src="<%= asset_path('marked.min.js') %>"></script>
+  <!-- ── Monaco loader (sync — inline body script calls require()) ── -->
   <% base_path = request.script_name.to_s.sub(%r{/$}, '') %>
-  <script>var require = { paths: { vs: '<%= json_escape("#{base_path}/monaco-editor/vs") %>', 'monaco-vim': '<%= json_escape(asset_path("monaco-vim.js").sub(/\.js$/, "")) %>', 'monaco-editor/esm/vs': '<%= json_escape("#{base_path}/monaco-editor/vs") %>' } };</script>
+  <script>var require = { paths: { vs: '<%= json_escape("#{base_path}/monaco-editor/vs") %>', 'monaco-editor/esm/vs': '<%= json_escape("#{base_path}/monaco-editor/vs") %>', 'monaco-vim': '<%= json_escape(asset_path("monaco-vim.js").sub(/\.js$/, "")) %>' } };</script>
   <script src="<%= "#{base_path}/monaco-editor/vs/loader.js" %>"></script>
-  <!-- ── Emmet + Extra themes (non-AMD, load before app) ── -->
-  <script src="<%= asset_path('emmet.js') %>"></script>
-  <script src="<%= asset_path('monaco-themes-bundle.js') %>"></script>
+  <!-- ── Emmet + Extra themes (non-AMD, deferred — used inside Monaco callback) ── -->
+  <script defer src="<%= asset_path('emmet.js') %>"></script>
+  <script defer src="<%= asset_path('monaco-themes-bundle.js') %>"></script>
 </head>
 <body data-rails-root="<%= Rails.root.to_s %>" data-mbeditor-version="<%= Mbeditor::VERSION %>">
   <script>
     window.MBEDITOR_BASE_PATH = "<%= json_escape(base_path) %>";
-
-    // Monaco's restoreViewState cancels its own internal rendering promises and
-    // those cancellations surface as "Canceled: Canceled" unhandled rejections.
-    // This is a known Monaco quirk — the cancellation is intentional and benign.
-    // Suppress it here so it doesn't pollute the console.
-    window.addEventListener('unhandledrejection', function(event) {
-      if (event.reason && event.reason.name === 'Canceled' && event.reason.message === 'Canceled') {
-        event.preventDefault();
-      }
-    });
+    // Snapshot any React the host app may already have before our deferred scripts run.
+    window._mbeditorHostReact    = window.React;
+    window._mbeditorHostReactDOM = window.ReactDOM;
+    // Set by DOMContentLoaded, which fires after all deferred scripts have executed.
+    window._mbeditorDOMReady = false;
+    document.addEventListener('DOMContentLoaded', function() { window._mbeditorDOMReady = true; }, { once: true });
   </script>
 
   <div id="mbeditor-root">
+    <div id="mbeditor-loading">
+      <div class="mbeditor-spinner"></div>
+      <div class="mbeditor-loading-text">Loading editor&hellip;</div>
+    </div>
     <%= yield %>
   </div>
 
@@ -65,7 +65,7 @@
       }
     };
 
-    // Load Prettier scripts sequentially with define temporarily hidden so their
+    // Load Prettier scripts in parallel with define temporarily hidden so their
     // UMD wrapper sets window.prettier / window.prettierPlugins instead of
     // registering as AMD modules via Monaco's loader.  Then load Monaco and the
     // app once all Prettier scripts are ready.
@@ -79,40 +79,63 @@
         '<%= asset_path("prettier-plugin-markdown.js") %>'
       ];
 
-      function loadSequential(srcs, done) {
-        if (!srcs.length) return done();
-        var s = document.createElement('script');
-        s.src = srcs[0];
-        s.onload = function() { loadSequential(srcs.slice(1), done); };
-        document.head.appendChild(s);
-      }
-
       var _define = window.define;
       window.define = undefined;
+      var pending = prettierScripts.length;
+
+      function onAllPrettierLoaded() {
+        // Deferred vendor scripts (React, ReactDOM, etc.) run before DOMContentLoaded.
+        // Restoring window.define before they execute would cause them to register
+        // as AMD modules instead of setting window globals, so wait for DOMContentLoaded first.
+        function proceed() {
+          // Store mbeditor's React/ReactDOM under a private namespace so the
+          // app bundle can use them without touching window.React / window.ReactDOM.
+          window.MbeditorRuntime = {
+            React:    window.React,
+            ReactDOM: window.ReactDOM
+          };
+          // Restore whatever the host app had before our deferred scripts ran.
+          window.React    = window._mbeditorHostReact;
+          window.ReactDOM = window._mbeditorHostReactDOM;
 
-      loadSequential(prettierScripts, function() {
-        window.define = _define;
+          window.define = _define;
 
-        // Wait for Monaco to load before initializing application scripts
-        require(['vs/editor/editor.main'], function() {
-          // Register custom themes from the vendored bundle
-          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 appScript = document.createElement('script');
-          appScript.src = '<%= asset_path("mbeditor/application.js") %>';
-          appScript.onload = function() {
-            var root = document.getElementById('mbeditor-root');
-            if (window.MbeditorApp && window.ReactDOM) {
-              window.ReactDOM.render(React.createElement(window.MbeditorApp), root);
-            } else {
-              console.error("Failed to mount: MbeditorApp or ReactDOM is undefined.");
+          // Wait for Monaco to load before initializing application scripts
+          require(['vs/editor/editor.main'], function() {
+            // Register custom themes from the vendored bundle
+            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]);
+              });
             }
-          };
-          document.body.appendChild(appScript);
-        });
+            var appScript = document.createElement('script');
+            appScript.src = '<%= asset_path("mbeditor/application.js") %>';
+            appScript.onload = function() {
+              var root = document.getElementById('mbeditor-root');
+              var _R  = window.MbeditorRuntime.React;
+              var _RD = window.MbeditorRuntime.ReactDOM;
+              if (window.MbeditorApp && _R && _RD) {
+                _RD.render(_R.createElement(window.MbeditorApp), root);
+              } else {
+                console.error("Failed to mount: MbeditorApp or MbeditorRuntime is undefined.");
+              }
+            };
+            document.body.appendChild(appScript);
+          });
+        }
+
+        if (window._mbeditorDOMReady) {
+          proceed();
+        } else {
+          document.addEventListener('DOMContentLoaded', proceed, { once: true });
+        }
+      }
+
+      prettierScripts.forEach(function(src) {
+        var s = document.createElement('script');
+        s.src = src;
+        s.onload = function() { if (--pending === 0) onAllPrettierLoaded(); };
+        document.head.appendChild(s);
       });
     })();
   </script>

data/lib/mbeditor/version.rb

@@ -1,3 +1,3 @@
 module Mbeditor
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/public/monaco-editor/vs/basic-languages/handlebars/handlebars.js

@@ -4,437 +4,209 @@
  * Released under the MIT license
  * https://github.com/microsoft/monaco-editor/blob/main/LICENSE.txt
  *-----------------------------------------------------------------------------*/
+define("vs/basic-languages/handlebars/handlebars", ["require", "require"], (require) => {
+"use strict";
+var moduleExports = (() => {
+  var monaco = require("vs/editor/editor.api");
 
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+  var EMPTY_ELEMENTS = ["area", "base", "br", "col", "embed", "hr", "img", "input", "keygen", "link", "menuitem", "meta", "param", "source", "track", "wbr"];
 
-// src/fillers/monaco-editor-core.ts
-var monaco_editor_core_exports = {};
-__reExport(monaco_editor_core_exports, monaco_editor_core_star);
-import * as monaco_editor_core_star from "../../editor/editor.api.js";
-
-// src/basic-languages/handlebars/handlebars.ts
-var EMPTY_ELEMENTS = [
-  "area",
-  "base",
-  "br",
-  "col",
-  "embed",
-  "hr",
-  "img",
-  "input",
-  "keygen",
-  "link",
-  "menuitem",
-  "meta",
-  "param",
-  "source",
-  "track",
-  "wbr"
-];
-var conf = {
-  wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,
-  comments: {
-    blockComment: ["{{!--", "--}}"]
-  },
-  brackets: [
-    ["<!--", "-->"],
-    ["<", ">"],
-    ["{{", "}}"],
-    ["{", "}"],
-    ["(", ")"]
-  ],
-  autoClosingPairs: [
-    { open: "{", close: "}" },
-    { open: "[", close: "]" },
-    { open: "(", close: ")" },
-    { open: '"', close: '"' },
-    { open: "'", close: "'" }
-  ],
-  surroundingPairs: [
-    { open: "<", close: ">" },
-    { open: '"', close: '"' },
-    { open: "'", close: "'" }
-  ],
-  onEnterRules: [
-    {
-      beforeText: new RegExp(
-        `<(?!(?:${EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`,
-        "i"
-      ),
-      afterText: /^<\/(\w[\w\d]*)\s*>$/i,
-      action: {
-        indentAction: monaco_editor_core_exports.languages.IndentAction.IndentOutdent
-      }
+  var conf = {
+    wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\$\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\s]+)/g,
+    comments: {
+      blockComment: ["{{!--", "--}}"]
     },
-    {
-      beforeText: new RegExp(
-        `<(?!(?:${EMPTY_ELEMENTS.join("|")}))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$`,
-        "i"
-      ),
-      action: { indentAction: monaco_editor_core_exports.languages.IndentAction.Indent }
-    }
-  ]
-};
-var language = {
-  defaultToken: "",
-  tokenPostfix: "",
-  // ignoreCase: true,
-  // The main tokenizer for our languages
-  tokenizer: {
-    root: [
-      [/\{\{!--/, "comment.block.start.handlebars", "@commentBlock"],
-      [/\{\{!/, "comment.start.handlebars", "@comment"],
-      [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.root" }],
-      [/<!DOCTYPE/, "metatag.html", "@doctype"],
-      [/<!--/, "comment.html", "@commentHtml"],
-      [/(<)(\w+)(\/>)/, ["delimiter.html", "tag.html", "delimiter.html"]],
-      [/(<)(script)/, ["delimiter.html", { token: "tag.html", next: "@script" }]],
-      [/(<)(style)/, ["delimiter.html", { token: "tag.html", next: "@style" }]],
-      [/(<)([:\w]+)/, ["delimiter.html", { token: "tag.html", next: "@otherTag" }]],
-      [/(<\/)(\w+)/, ["delimiter.html", { token: "tag.html", next: "@otherTag" }]],
-      [/</, "delimiter.html"],
-      [/\{/, "delimiter.html"],
-      [/[^<{]+/]
-      // text
-    ],
-    doctype: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.comment"
-        }
-      ],
-      [/[^>]+/, "metatag.content.html"],
-      [/>/, "metatag.html", "@pop"]
-    ],
-    comment: [
-      [/\}\}/, "comment.end.handlebars", "@pop"],
-      [/./, "comment.content.handlebars"]
-    ],
-    commentBlock: [
-      [/--\}\}/, "comment.block.end.handlebars", "@pop"],
-      [/./, "comment.content.handlebars"]
-    ],
-    commentHtml: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.comment"
-        }
-      ],
-      [/-->/, "comment.html", "@pop"],
-      [/[^-]+/, "comment.content.html"],
-      [/./, "comment.content.html"]
-    ],
-    otherTag: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.otherTag"
-        }
-      ],
-      [/\/?>/, "delimiter.html", "@pop"],
-      [/"([^"]*)"/, "attribute.value"],
-      [/'([^']*)'/, "attribute.value"],
-      [/[\w\-]+/, "attribute.name"],
-      [/=/, "delimiter"],
-      [/[ \t\r\n]+/]
-      // whitespace
-    ],
-    // -- BEGIN <script> tags handling
-    // After <script
-    script: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.script"
-        }
-      ],
-      [/type/, "attribute.name", "@scriptAfterType"],
-      [/"([^"]*)"/, "attribute.value"],
-      [/'([^']*)'/, "attribute.value"],
-      [/[\w\-]+/, "attribute.name"],
-      [/=/, "delimiter"],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@scriptEmbedded.text/javascript",
-          nextEmbedded: "text/javascript"
-        }
-      ],
-      [/[ \t\r\n]+/],
-      // whitespace
-      [
-        /(<\/)(script\s*)(>)/,
-        ["delimiter.html", "tag.html", { token: "delimiter.html", next: "@pop" }]
-      ]
-    ],
-    // After <script ... type
-    scriptAfterType: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.scriptAfterType"
-        }
-      ],
-      [/=/, "delimiter", "@scriptAfterTypeEquals"],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@scriptEmbedded.text/javascript",
-          nextEmbedded: "text/javascript"
-        }
-      ],
-      // cover invalid e.g. <script type>
-      [/[ \t\r\n]+/],
-      // whitespace
-      [/<\/script\s*>/, { token: "@rematch", next: "@pop" }]
-    ],
-    // After <script ... type =
-    scriptAfterTypeEquals: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.scriptAfterTypeEquals"
-        }
-      ],
-      [
-        /"([^"]*)"/,
-        {
-          token: "attribute.value",
-          switchTo: "@scriptWithCustomType.$1"
-        }
-      ],
-      [
-        /'([^']*)'/,
-        {
-          token: "attribute.value",
-          switchTo: "@scriptWithCustomType.$1"
-        }
-      ],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@scriptEmbedded.text/javascript",
-          nextEmbedded: "text/javascript"
-        }
-      ],
-      // cover invalid e.g. <script type=>
-      [/[ \t\r\n]+/],
-      // whitespace
-      [/<\/script\s*>/, { token: "@rematch", next: "@pop" }]
-    ],
-    // After <script ... type = $S2
-    scriptWithCustomType: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.scriptWithCustomType.$S2"
-        }
-      ],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@scriptEmbedded.$S2",
-          nextEmbedded: "$S2"
-        }
-      ],
-      [/"([^"]*)"/, "attribute.value"],
-      [/'([^']*)'/, "attribute.value"],
-      [/[\w\-]+/, "attribute.name"],
-      [/=/, "delimiter"],
-      [/[ \t\r\n]+/],
-      // whitespace
-      [/<\/script\s*>/, { token: "@rematch", next: "@pop" }]
-    ],
-    scriptEmbedded: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInEmbeddedState.scriptEmbedded.$S2",
-          nextEmbedded: "@pop"
-        }
-      ],
-      [/<\/script/, { token: "@rematch", next: "@pop", nextEmbedded: "@pop" }]
-    ],
-    // -- END <script> tags handling
-    // -- BEGIN <style> tags handling
-    // After <style
-    style: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.style"
-        }
-      ],
-      [/type/, "attribute.name", "@styleAfterType"],
-      [/"([^"]*)"/, "attribute.value"],
-      [/'([^']*)'/, "attribute.value"],
-      [/[\w\-]+/, "attribute.name"],
-      [/=/, "delimiter"],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@styleEmbedded.text/css",
-          nextEmbedded: "text/css"
-        }
-      ],
-      [/[ \t\r\n]+/],
-      // whitespace
-      [
-        /(<\/)(style\s*)(>)/,
-        ["delimiter.html", "tag.html", { token: "delimiter.html", next: "@pop" }]
-      ]
-    ],
-    // After <style ... type
-    styleAfterType: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.styleAfterType"
-        }
-      ],
-      [/=/, "delimiter", "@styleAfterTypeEquals"],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@styleEmbedded.text/css",
-          nextEmbedded: "text/css"
-        }
-      ],
-      // cover invalid e.g. <style type>
-      [/[ \t\r\n]+/],
-      // whitespace
-      [/<\/style\s*>/, { token: "@rematch", next: "@pop" }]
-    ],
-    // After <style ... type =
-    styleAfterTypeEquals: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.styleAfterTypeEquals"
-        }
-      ],
-      [
-        /"([^"]*)"/,
-        {
-          token: "attribute.value",
-          switchTo: "@styleWithCustomType.$1"
-        }
-      ],
-      [
-        /'([^']*)'/,
-        {
-          token: "attribute.value",
-          switchTo: "@styleWithCustomType.$1"
-        }
-      ],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@styleEmbedded.text/css",
-          nextEmbedded: "text/css"
-        }
-      ],
-      // cover invalid e.g. <style type=>
-      [/[ \t\r\n]+/],
-      // whitespace
-      [/<\/style\s*>/, { token: "@rematch", next: "@pop" }]
-    ],
-    // After <style ... type = $S2
-    styleWithCustomType: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInSimpleState.styleWithCustomType.$S2"
-        }
-      ],
-      [
-        />/,
-        {
-          token: "delimiter.html",
-          next: "@styleEmbedded.$S2",
-          nextEmbedded: "$S2"
-        }
-      ],
-      [/"([^"]*)"/, "attribute.value"],
-      [/'([^']*)'/, "attribute.value"],
-      [/[\w\-]+/, "attribute.name"],
-      [/=/, "delimiter"],
-      [/[ \t\r\n]+/],
-      // whitespace
-      [/<\/style\s*>/, { token: "@rematch", next: "@pop" }]
-    ],
-    styleEmbedded: [
-      [
-        /\{\{/,
-        {
-          token: "@rematch",
-          switchTo: "@handlebarsInEmbeddedState.styleEmbedded.$S2",
-          nextEmbedded: "@pop"
-        }
-      ],
-      [/<\/style/, { token: "@rematch", next: "@pop", nextEmbedded: "@pop" }]
-    ],
-    // -- END <style> tags handling
-    handlebarsInSimpleState: [
-      [/\{\{\{?/, "delimiter.handlebars"],
-      [/\}\}\}?/, { token: "delimiter.handlebars", switchTo: "@$S2.$S3" }],
-      { include: "handlebarsRoot" }
-    ],
-    handlebarsInEmbeddedState: [
-      [/\{\{\{?/, "delimiter.handlebars"],
-      [
-        /\}\}\}?/,
-        {
-          token: "delimiter.handlebars",
-          switchTo: "@$S2.$S3",
-          nextEmbedded: "$S3"
-        }
-      ],
-      { include: "handlebarsRoot" }
-    ],
-    handlebarsRoot: [
-      [/"[^"]*"/, "string.handlebars"],
-      [/[#/][^\s}]+/, "keyword.helper.handlebars"],
-      [/else\b/, "keyword.helper.handlebars"],
-      [/[\s]+/],
-      [/[^}]/, "variable.parameter.handlebars"]
+    brackets: [
+      ["<!--", "-->"],
+      ["<", ">"],
+      ["{{", "}}"],
+      ["{", "}"],
+      ["(", ")"]
+    ],
+    autoClosingPairs: [
+      { open: "{", close: "}" },
+      { open: "[", close: "]" },
+      { open: "(", close: ")" },
+      { open: '"', close: '"' },
+      { open: "'", close: "'" }
+    ],
+    surroundingPairs: [
+      { open: "<", close: ">" },
+      { open: '"', close: '"' },
+      { open: "'", close: "'" }
+    ],
+    onEnterRules: [
+      {
+        beforeText: new RegExp(
+          "<(?!(?:" + EMPTY_ELEMENTS.join("|") + "))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$",
+          "i"
+        ),
+        afterText: /^<\/(\w[\w\d]*)\s*>$/i,
+        action: {
+          indentAction: monaco.languages.IndentAction.IndentOutdent
+        }
+      },
+      {
+        beforeText: new RegExp(
+          "<(?!(?:" + EMPTY_ELEMENTS.join("|") + "))(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$",
+          "i"
+        ),
+        action: { indentAction: monaco.languages.IndentAction.Indent }
+      }
     ]
-  }
-};
-export {
-  conf,
-  language
-};
+  };
+
+  var language = {
+    defaultToken: "",
+    tokenPostfix: "",
+    tokenizer: {
+      root: [
+        [/\{\{!--/, "comment.block.start.handlebars", "@commentBlock"],
+        [/\{\{!/, "comment.start.handlebars", "@comment"],
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.root" }],
+        [/<!DOCTYPE/, "metatag.html", "@doctype"],
+        [/<!--/, "comment.html", "@commentHtml"],
+        [/(<)(\w+)(\/>)/, ["delimiter.html", "tag.html", "delimiter.html"]],
+        [/(<)(script)/, ["delimiter.html", { token: "tag.html", next: "@script" }]],
+        [/(<)(style)/, ["delimiter.html", { token: "tag.html", next: "@style" }]],
+        [/(<)([:\w]+)/, ["delimiter.html", { token: "tag.html", next: "@otherTag" }]],
+        [/(<\/)(\w+)/, ["delimiter.html", { token: "tag.html", next: "@otherTag" }]],
+        [/</, "delimiter.html"],
+        [/\{/, "delimiter.html"],
+        [/[^<{]+/]
+      ],
+      doctype: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.comment" }],
+        [/[^>]+/, "metatag.content.html"],
+        [/>/, "metatag.html", "@pop"]
+      ],
+      comment: [
+        [/\}\}/, "comment.end.handlebars", "@pop"],
+        [/./, "comment.content.handlebars"]
+      ],
+      commentBlock: [
+        [/--\}\}/, "comment.block.end.handlebars", "@pop"],
+        [/./, "comment.content.handlebars"]
+      ],
+      commentHtml: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.comment" }],
+        [/-->/, "comment.html", "@pop"],
+        [/[^-]+/, "comment.content.html"],
+        [/./, "comment.content.html"]
+      ],
+      otherTag: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.otherTag" }],
+        [/\/?>/, "delimiter.html", "@pop"],
+        [/"([^"]*)"/, "attribute.value"],
+        [/'([^']*)'/, "attribute.value"],
+        [/[\w\-]+/, "attribute.name"],
+        [/=/, "delimiter"],
+        [/[ \t\r\n]+/]
+      ],
+      script: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.script" }],
+        [/type/, "attribute.name", "@scriptAfterType"],
+        [/"([^"]*)"/, "attribute.value"],
+        [/'([^']*)'/, "attribute.value"],
+        [/[\w\-]+/, "attribute.name"],
+        [/=/, "delimiter"],
+        [/>/, { token: "delimiter.html", next: "@scriptEmbedded.text/javascript", nextEmbedded: "text/javascript" }],
+        [/[ \t\r\n]+/],
+        [/(<\/)(script\s*)(>)/, ["delimiter.html", "tag.html", { token: "delimiter.html", next: "@pop" }]]
+      ],
+      scriptAfterType: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.scriptAfterType" }],
+        [/=/, "delimiter", "@scriptAfterTypeEquals"],
+        [/>/, { token: "delimiter.html", next: "@scriptEmbedded.text/javascript", nextEmbedded: "text/javascript" }],
+        [/[ \t\r\n]+/],
+        [/<\/script\s*>/, { token: "@rematch", next: "@pop" }]
+      ],
+      scriptAfterTypeEquals: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.scriptAfterTypeEquals" }],
+        [/"([^"]*)"/, { token: "attribute.value", switchTo: "@scriptWithCustomType.$1" }],
+        [/'([^']*)'/, { token: "attribute.value", switchTo: "@scriptWithCustomType.$1" }],
+        [/>/, { token: "delimiter.html", next: "@scriptEmbedded.text/javascript", nextEmbedded: "text/javascript" }],
+        [/[ \t\r\n]+/],
+        [/<\/script\s*>/, { token: "@rematch", next: "@pop" }]
+      ],
+      scriptWithCustomType: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.scriptWithCustomType.$S2" }],
+        [/>/, { token: "delimiter.html", next: "@scriptEmbedded.$S2", nextEmbedded: "$S2" }],
+        [/"([^"]*)"/, "attribute.value"],
+        [/'([^']*)'/, "attribute.value"],
+        [/[\w\-]+/, "attribute.name"],
+        [/=/, "delimiter"],
+        [/[ \t\r\n]+/],
+        [/<\/script\s*>/, { token: "@rematch", next: "@pop" }]
+      ],
+      scriptEmbedded: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInEmbeddedState.scriptEmbedded.$S2", nextEmbedded: "@pop" }],
+        [/<\/script/, { token: "@rematch", next: "@pop", nextEmbedded: "@pop" }]
+      ],
+      style: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.style" }],
+        [/type/, "attribute.name", "@styleAfterType"],
+        [/"([^"]*)"/, "attribute.value"],
+        [/'([^']*)'/, "attribute.value"],
+        [/[\w\-]+/, "attribute.name"],
+        [/=/, "delimiter"],
+        [/>/, { token: "delimiter.html", next: "@styleEmbedded.text/css", nextEmbedded: "text/css" }],
+        [/[ \t\r\n]+/],
+        [/(<\/)(style\s*)(>)/, ["delimiter.html", "tag.html", { token: "delimiter.html", next: "@pop" }]]
+      ],
+      styleAfterType: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.styleAfterType" }],
+        [/=/, "delimiter", "@styleAfterTypeEquals"],
+        [/>/, { token: "delimiter.html", next: "@styleEmbedded.text/css", nextEmbedded: "text/css" }],
+        [/[ \t\r\n]+/],
+        [/<\/style\s*>/, { token: "@rematch", next: "@pop" }]
+      ],
+      styleAfterTypeEquals: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.styleAfterTypeEquals" }],
+        [/"([^"]*)"/, { token: "attribute.value", switchTo: "@styleWithCustomType.$1" }],
+        [/'([^']*)'/, { token: "attribute.value", switchTo: "@styleWithCustomType.$1" }],
+        [/>/, { token: "delimiter.html", next: "@styleEmbedded.text/css", nextEmbedded: "text/css" }],
+        [/[ \t\r\n]+/],
+        [/<\/style\s*>/, { token: "@rematch", next: "@pop" }]
+      ],
+      styleWithCustomType: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInSimpleState.styleWithCustomType.$S2" }],
+        [/>/, { token: "delimiter.html", next: "@styleEmbedded.$S2", nextEmbedded: "$S2" }],
+        [/"([^"]*)"/, "attribute.value"],
+        [/'([^']*)'/, "attribute.value"],
+        [/[\w\-]+/, "attribute.name"],
+        [/=/, "delimiter"],
+        [/[ \t\r\n]+/],
+        [/<\/style\s*>/, { token: "@rematch", next: "@pop" }]
+      ],
+      styleEmbedded: [
+        [/\{\{/, { token: "@rematch", switchTo: "@handlebarsInEmbeddedState.styleEmbedded.$S2", nextEmbedded: "@pop" }],
+        [/<\/style/, { token: "@rematch", next: "@pop", nextEmbedded: "@pop" }]
+      ],
+      handlebarsInSimpleState: [
+        [/\{\{\{?/, "delimiter.handlebars"],
+        [/\}\}\}?/, { token: "delimiter.handlebars", switchTo: "@$S2.$S3" }],
+        { include: "handlebarsRoot" }
+      ],
+      handlebarsInEmbeddedState: [
+        [/\{\{\{?/, "delimiter.handlebars"],
+        [/\}\}\}?/, { token: "delimiter.handlebars", switchTo: "@$S2.$S3", nextEmbedded: "$S3" }],
+        { include: "handlebarsRoot" }
+      ],
+      handlebarsRoot: [
+        [/"[^"]*"/, "string.handlebars"],
+        [/[#/][^\s}]+/, "keyword.helper.handlebars"],
+        [/else\b/, "keyword.helper.handlebars"],
+        [/[\s]+/],
+        [/[^}]/, "variable.parameter.handlebars"]
+      ]
+    }
+  };
+
+  var result = {};
+  result.conf = conf;
+  result.language = language;
+  return result;
+})();
+return moduleExports;
+});

data/public/sw.js

@@ -1,8 +1,10 @@
-// Minimal service worker for installability without intercepting requests.
-self.addEventListener('install', function() {
-	self.skipWaiting();
+// Minimal service worker for Mbeditor. Registers the SW scope without
+// intercepting fetch requests — the browser handles all network traffic normally.
+
+self.addEventListener('install', function(event) {
+  self.skipWaiting();
 });
 
 self.addEventListener('activate', function(event) {
-	event.waitUntil(self.clients.claim());
+  event.waitUntil(self.clients.claim());
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Oliver Noonan
@@ -55,6 +55,8 @@ files:
 - CHANGELOG.md
 - README.md
 - app/assets/javascripts/mbeditor/application.js
+- app/assets/javascripts/mbeditor/application_iife_head.js
+- app/assets/javascripts/mbeditor/application_iife_tail.js
 - app/assets/javascripts/mbeditor/components/CodeReviewPanel.js
 - app/assets/javascripts/mbeditor/components/CollapsibleSection.js
 - app/assets/javascripts/mbeditor/components/CombinedDiffViewer.js