utopia 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b209f640f2956c9d656cbac537793f828bb7dd398b9e7a2df41f3591aedd2aa6
-  data.tar.gz: 3d4ad85f0e311e7ec907e51bc837fad936658648f718986d2049c05b8e9391a3
+  metadata.gz: c16b554d772d132bd1820ec17f402bbdf2d3720a5c6965f8673c0f06054f1c29
+  data.tar.gz: d6d839b6d55e3aff38507b9c4324d2631eb5a6b7f64eaeddb7e6b30185409b0a
 SHA512:
-  metadata.gz: 93c77c5abbef5ed5436b00220acdaeec1a774d23ea6e3418ebe0c29b5511b7da4439902bccbc264c4111ba5f5bb529e30e0215a93bc94cd6607f4ee89445ec2e
-  data.tar.gz: 59463ee050dec081e27b81829c79515e3845a7f15cab56cfbca7763a317ce11a864f4b019dca9ac276f95068ed7f5bb2ab21ad7923a5c40535faf79c033639ff
+  metadata.gz: ab0202e8f8259c62856341332dcc7f37532535e968e90b75dceb4e8370eee7092ac5e7cdc4e3a2072f0394ba87b39994c18fa2ca1f17864d9f04f5974847a9b2
+  data.tar.gz: 14260960ab36d1cea1cabc02b6c43c29661efefb6e3e1566ef7e61ce87ba9f6525e111f9182e3beeac0a973bf303c147a71d3edc65d1cb75153c3c7377e7f2a8

data/lib/utopia/import_map.rb

@@ -268,13 +268,7 @@ module Utopia
 		# 	page_map = import_map.relative_to("/foo/bar/")
 		# 	# Base becomes: "../../_components/"
 		def relative_to(path)
-			if @base
-				# Calculate the relative path from the page to the base
-				relative_path = @base.path.relative(path)
-				resolved_base = Protocol::URL::Relative.new(relative_path)
-			else
-				resolved_base = nil
-			end
+			resolved_base = @base&.relative_to(path)
 			
 			instance = self.class.new(@imports.dup, @integrity.dup, @scopes.dup, base: resolved_base)
 			
@@ -285,10 +279,12 @@ module Utopia
 		#
 		# @parameter value [String] The import URL or path value.
 		# @parameter base [Protocol::URL | Nil] The base URL context for resolving relative paths.
-		# @returns [Protocol::URL | String] The resolved URL object or original string.
+		# @returns [Protocol::URL] The resolved URL.
 		private def resolve_value(value, base)
+			value = Protocol::URL[value]
+			
 			if base
-				base + Protocol::URL[value]
+				base + value
 			else
 				value
 			end
@@ -303,7 +299,7 @@ module Utopia
 			result = {}
 			
 			imports.each do |specifier, value|
-				result[specifier] = resolve_value(value, base).to_s
+				result[specifier] = resolve_value(value, base).to_s(explicit: true)
 			end
 			
 			result

data/lib/utopia/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Utopia
-	VERSION = "3.0.2"
+	VERSION = "3.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -203,14 +203,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement