middleman-importmap 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d2cf6f5b1ec7a75c1d1804a59ddfe9317ca0bea4bada33a998affbda971b53
-  data.tar.gz: cf66b660cc46ee27519c7ec312c8b638bc7ed5de75834caa091c6553e1a5b423
+  metadata.gz: 0f7ea7bfde0f17d3f72c92d067e68b5dcb52cd107c915143199e47b63e10ad3b
+  data.tar.gz: 6a18fc68762a8c2bc380484d21570ae1f55d8e2d3487507adda24c8429dac004
 SHA512:
-  metadata.gz: 9e5c0575ee611a0c1ddcc87b5ac2f5811e9331226370757bbb5004be29d134a72620c3699208272ff346b192e89f2bcf0b4e4c9e5438aaa50e6f0b4f83023230
-  data.tar.gz: 5695733d93e805c27357c894b852cd4ea90d129c1d02f3e3182d25ebe5f7549e43c0f1d36439aa892b40697e85e896c771e811e265a0113d15f9942e3a7700fb
+  metadata.gz: 1d6c40acd3b02ad10c296c2727d28343325b14b001317d078125bf52f579178b50874e0e31cbf5af2e502ab1f25acaf6c203e1eeac39ba49c10c3ad574f0117a
+  data.tar.gz: 2fdd84511385291c0db34be7c3b5902a78de648ede1768abcabead1d55ff41435155e9b6ddafa1917c9ec26c448ad4c79dc008a56f7ab2a38bb174f1dedf90c3

data/lib/middleman-importmap/extension.rb

@@ -1,13 +1,20 @@
 # frozen_string_literal: true
 
-require "erb"
-require "yaml"
-require "middleman-core"
+require 'erb'
+require 'yaml'
+require 'middleman-core'
 
 module Middleman
   class ImportmapExtension < Extension
-    option :entrypoint, "site", "define js entrypoint file"
-    option :use_shim, true, "use importmapdefine js entrypoint file"
+    option :entrypoint, 'site', 'define js entrypoint file'
+    option :importmap, 'importmap.yml', 'define importmap file'
+    option :use_shim, true, 'use ES module shim'
+    option :shim_src, 'https://ga.jspm.io/npm:es-module-shims@1.8.2/dist/es-module-shims.js', 'define ES module shim source path'
+
+    expose_to_template :javascript_importmap_tags,
+                       :javascript_importmap_shim_tag,
+                       :javascript_inline_importmap_tag,
+                       :javascript_inline_module_tag 
 
     def initialize(app, options_hash = {}, &block)
       super
@@ -15,33 +22,51 @@ module Middleman
 
     def after_configuration; end
 
-    helpers do
-      def javascript_importmap_tags(entrypoint = "site", shim: true)
-        [
-          javascript_importmap_shim_tag,
-          javascript_inline_importmap_tag,
-          javascript_inline_module_tag(entrypoint),
-        ].join
-      end
+    def javascript_importmap_tags(entrypoint = options.entrypoint, 
+                                    importmap: options.importmap,
+                                         shim: options.use_shim,
+                                     shim_src: options.shim_src)
+      [
+        (javascript_importmap_shim_tag(shim_src) if shim),
+        javascript_inline_importmap_tag(importmap, shim: shim),
+        javascript_inline_module_tag(entrypoint, shim: shim)
+      ].join
+    end
 
-      def javascript_importmap_shim_tag
-        template = File.join(File.dirname(__FILE__), "views/javascript_impotmap_shim_tag.html.erb")
-        erb = ERB.new(File.read(template))
-        erb.result
-      end
+    def javascript_importmap_shim_tag(shim_src = options.shim_src)
+      template = File.join(File.dirname(__FILE__), 'views/javascript_importmap_shim_tag.html.erb')
+      
+      erb = ERB.new(File.read(template))
+      erb.result_with_hash(src: shim_src)
+    end
 
-      def javascript_inline_importmap_tag(importmap = "importmap.yml")
-        template = File.join(File.dirname(__FILE__), "views/javascript_inline_impotmap_tag.html.erb")
-        importmap_config = YAML.load_file(File.join(app.root_path, importmap), symbolize_names: true)
+    def javascript_inline_importmap_tag(importmap = options.importmap, shim: options.use_shim)
+      template = File.join(File.dirname(__FILE__), 'views/javascript_inline_importmap_tag.html.erb')
+      importmap_config = load_importmap(File.join(app.root_path, importmap))
 
-        erb = ERB.new(File.read(template))
-        erb.result_with_hash(importmap: importmap_config)
-      end
+      erb = ERB.new(File.read(template))
+      erb.result_with_hash(importmap: importmap_config, 
+                                type: shim ? "importmap-shim" : "importmap")
+    end
+
+    def javascript_inline_module_tag(entrypoint = options.entrypoint, shim: options.use_shim)
+      template = File.join(File.dirname(__FILE__), 'views/javascript_inline_module_tag.html.erb')
+      
+      erb = ERB.new(File.read(template))
+      erb.result_with_hash(entrypoint: entrypoint, 
+                                 type: shim ? "module-shim" : "module")
+    end
+
+    private
 
-      def javascript_inline_module_tag(entrypoint)
-        template = File.join(File.dirname(__FILE__), "views/javascript_inline_module_tag.html.erb")
-        erb = ERB.new(File.read(template))
-        erb.result_with_hash(entrypoint: entrypoint)
+    def load_importmap(path)
+      if path.end_with?('.yml', '.yaml')
+        importmap = YAML.load_file(path, symbolize_names: true)
+        JSON.pretty_generate(importmap)
+      elsif path.end_with?('.json')
+        File.read(path)
+      else
+        raise "Importmap format must be YAML or JSON"
       end
     end
   end

data/lib/middleman-importmap/version.rb

@@ -2,6 +2,6 @@
 
 module Middleman
   module Importmap
-    VERSION = "0.3.0"
+    VERSION = '0.6.0'
   end
 end

data/lib/middleman-importmap/views/{javascript_impotmap_shim_tag.html.erb → javascript_importmap_shim_tag.html.erb}

@@ -1,7 +1,6 @@
-
 <script
   async
   data-turbo-track="reload"
-  src="https://ga.jspm.io/npm:es-module-shims@1.5.4/dist/es-module-shims.js"
+  src="<%= src %>"
   crossorigin="anonymous"
 ></script>

data/lib/middleman-importmap/views/javascript_inline_importmap_tag.html.erb

@@ -0,0 +1,3 @@
+<script type="<%= type %>">
+  <%= importmap %>
+</script>

data/lib/middleman-importmap/views/javascript_inline_module_tag.html.erb

@@ -1,4 +1,4 @@
 <script
-  type="module-shim"
+  type="<%= type %>"
   src="/javascripts/<%= entrypoint %>.js"
 ></script>

data/lib/middleman-importmap.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "middleman-core"
+require 'middleman-core'
 
 Middleman::Extensions.register(:importmap) do
-  require "middleman-importmap/extension"
-  ::Middleman::ImportmapExtension
+  require 'middleman-importmap/extension'
+  Middleman::ImportmapExtension
 end

data/lib/middleman_extension.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "middleman-importmap"
+require 'middleman-importmap'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-importmap
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Vinciguerra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -34,13 +34,14 @@ files:
 - lib/middleman-importmap.rb
 - lib/middleman-importmap/extension.rb
 - lib/middleman-importmap/version.rb
-- lib/middleman-importmap/views/javascript_impotmap_shim_tag.html.erb
-- lib/middleman-importmap/views/javascript_inline_impotmap_tag.html.erb
+- lib/middleman-importmap/views/javascript_importmap_shim_tag.html.erb
+- lib/middleman-importmap/views/javascript_inline_importmap_tag.html.erb
 - lib/middleman-importmap/views/javascript_inline_module_tag.html.erb
 - lib/middleman_extension.rb
 homepage: https://github.com/dvinciguerra/middleman-importmap
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: Middleman Importmap extension

data/lib/middleman-importmap/views/javascript_inline_impotmap_tag.html.erb

@@ -1,3 +0,0 @@
-<script type="importmap-shim">
-  <%= JSON.pretty_generate(importmap) %>
-</script>