Merge pull request #217 from znz/run-js-mime-type

znz · web-flow · commit caeda4c4b998 · 2026-07-11T08:09:34.000+09:00
Rename js/run.mjs to js/run.js to survive strict MIME checking
diff --git a/data/bitclust/template.offline/layout b/data/bitclust/template.offline/layout
@@ -23,7 +23,7 @@
 <script src="<%=h custom_js_url('js/search_init.js') %>"></script>
 <% if run_ruby_wasm_url %>
 <meta name="rurema-run-ruby-wasm" content="<%=h run_ruby_wasm_url %>">
-<script type="module" src="<%=h custom_js_url('js/run.mjs') %>"></script>
+<script type="module" src="<%=h custom_js_url('js/run.js') %>"></script>
 <% end %>
 </head>
 <body>
diff --git a/data/bitclust/template/layout b/data/bitclust/template/layout
@@ -13,7 +13,7 @@
   <link rel="search" type="application/opensearchdescription+xml" title="<%= _('Ruby %s Reference Manual', ruby_version()) %>" href="<%=h opensearchdescription_url() %>">
 <% if run_ruby_wasm_url %>
   <meta name="rurema-run-ruby-wasm" content="<%=h run_ruby_wasm_url %>">
-  <script type="module" src="<%=h custom_js_url('js/run.mjs') %>"></script>
+  <script type="module" src="<%=h custom_js_url('js/run.js') %>"></script>
 <% end %>
 </head>
 <body>
diff --git a/lib/bitclust/subcommands/statichtml_command.rb b/lib/bitclust/subcommands/statichtml_command.rb
@@ -328,17 +328,17 @@ def create_search_index(outputdir, db, fdb)
       end
 
       # Copy the RUN-button script (statichtml --run-ruby-wasm). A themedir
-      # without js/run.mjs is tolerated: warn and skip instead of aborting the
+      # without js/run.js is tolerated: warn and skip instead of aborting the
       # whole build.
       def copy_run_ruby_wasm_script
-        run_mjs = @manager_config[:themedir] + "js" + "run.mjs"
-        unless run_mjs.file?
-          $stderr.puts "warning: #{run_mjs} not found; RUN button script not copied"
+        run_js = @manager_config[:themedir] + "js" + "run.js"
+        unless run_js.file?
+          $stderr.puts "warning: #{run_js} not found; RUN button script not copied"
           return
         end
         jsdir = @outputdir + "js"
         FileUtils.mkdir_p(jsdir) unless jsdir.directory?
-        FileUtils.cp(run_mjs.to_s, jsdir.to_s, :verbose => @verbose, :preserve => true)
+        FileUtils.cp(run_js.to_s, jsdir.to_s, :verbose => @verbose, :preserve => true)
       end
 
       def create_html_file(entry, manager, outputdir, db)
diff --git a/test/js/test_run.mjs b/test/js/test_run.mjs
@@ -1,8 +1,8 @@
-// QuickJS-based tests for the pure logic in theme/default/js/run.mjs.
+// QuickJS-based tests for the pure logic in theme/default/js/run.js.
 // Run with: qjs test/js/test_run.mjs   (see the "test:js" rake task)
 // Importing the module doubles as a syntax/eval smoke test: its DOM setup is
 // guarded by `typeof window !== 'undefined'`.
-import { createOnceLoader, PRELUDE, formatRunError, truncateOutput } from '../../theme/default/js/run.mjs'
+import { createOnceLoader, PRELUDE, formatRunError, truncateOutput } from '../../theme/default/js/run.js'
 
 let failures = 0
 function assert(cond, message) {
diff --git a/test/test_run_ruby_wasm.rb b/test/test_run_ruby_wasm.rb
@@ -32,13 +32,13 @@ def render(manager_options)
   def test_run_script_is_loaded_when_enabled
     html = render(:run_ruby_wasm => WASM_URL)
     assert_include(html, META_TAG)
-    assert_include(html, 'js/run.mjs')
+    assert_include(html, 'js/run.js')
   end
 
   def test_run_script_is_not_loaded_by_default
     html = render({})
     assert_not_include(html, 'rurema-run-ruby-wasm')
-    assert_not_include(html, 'run.mjs')
+    assert_not_include(html, 'run.js')
   end
 
   def test_wasm_url_is_html_escaped
diff --git a/test/test_statichtml_command.rb b/test/test_statichtml_command.rb
@@ -50,20 +50,20 @@ def test_option_is_parsed
     assert_equal(url, cmd.instance_variable_get(:@run_ruby_wasm))
   end
 
-  def test_run_mjs_is_copied
+  def test_run_js_is_copied
     Dir.mktmpdir do |dir|
       themedir = File.join(dir, 'theme')
       outputdir = File.join(dir, 'out')
       FileUtils.mkdir_p(File.join(themedir, 'js'))
       FileUtils.mkdir_p(outputdir)
-      File.write(File.join(themedir, 'js', 'run.mjs'), "// run\n")
+      File.write(File.join(themedir, 'js', 'run.js'), "// run\n")
       cmd = build_command(themedir, outputdir)
       cmd.send(:copy_run_ruby_wasm_script)
-      assert_true(File.file?(File.join(outputdir, 'js', 'run.mjs')))
+      assert_true(File.file?(File.join(outputdir, 'js', 'run.js')))
     end
   end
 
-  def test_theme_without_run_mjs_is_tolerated
+  def test_theme_without_run_js_is_tolerated
     Dir.mktmpdir do |dir|
       themedir = File.join(dir, 'theme')
       outputdir = File.join(dir, 'out')
@@ -73,11 +73,11 @@ def test_theme_without_run_mjs_is_tolerated
       orig_stderr, $stderr = $stderr, StringIO.new
       begin
         assert_nothing_raised { cmd.send(:copy_run_ruby_wasm_script) }
-        assert_match(/run\.mjs not found/, $stderr.string)
+        assert_match(/run\.js not found/, $stderr.string)
       ensure
         $stderr = orig_stderr
       end
-      assert_false(File.exist?(File.join(outputdir, 'js', 'run.mjs')))
+      assert_false(File.exist?(File.join(outputdir, 'js', 'run.js')))
     end
   end
 end
diff --git a/theme/default/js/run.js b/theme/default/js/run.js
@@ -1,5 +1,8 @@
 // RUN button for Ruby sample code: executes the sample in-browser with
-// ruby.wasm. Enabled per page via
+// ruby.wasm. Named .js rather than .mjs: module scripts are subject to
+// strict MIME checking, and servers whose MIME table lacks an "mjs" entry
+// (e.g. nginx before 1.21.4) serve .mjs as application/octet-stream, which
+// browsers refuse to execute. Enabled per page via
 //   <meta name="rurema-run-ruby-wasm" content="<ruby+stdlib.wasm URL>">
 // which the layout emits when statichtml was invoked with --run-ruby-wasm.
 // The wasm URL is chosen by the build side to match the documented Ruby
diff --git a/theme/default/style.css b/theme/default/style.css
@@ -142,7 +142,7 @@ pre.highlight {
     position: relative;
 }
 
-/* for RUN (js/run.mjs, statichtml --run-ruby-wasm) */
+/* for RUN (js/run.js, statichtml --run-ruby-wasm) */
 .highlight__run-button {
   float: right;
   margin: 0 0 0.25em 0.5em;

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ pre.highlight {`
`142`	`142`	`position: relative;`
`143`	`143`	`}`
`144`	`144`
`145`		`-/* for RUN (js/run.mjs, statichtml --run-ruby-wasm) */`
	`145`	`+/* for RUN (js/run.js, statichtml --run-ruby-wasm) */`
`146`	`146`	`.highlight__run-button {`
`147`	`147`	`float: right;`
`148`	`148`	`margin: 0 0 0.25em 0.5em;`