klenod-plugin-css 0.0.5-aarch64-linux-gnu → 0.0.6-aarch64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d4c8a65e165f190ddb1d7033cbebc31334879df7e837424fca9a06ad227bbb
-  data.tar.gz: c58dd3a249b08d7e46b4a1c403c1706d14dbe17d622e10bbed814dd1d11d54d6
+  metadata.gz: e17116641d615df51795551cd38ae9d0200799007813cf2594d82d6410024b17
+  data.tar.gz: 1b85d30a6d83112dd1275d367eda8179fe17c8fb04defc8001249ded0a1d399f
 SHA512:
-  metadata.gz: 32f2abed037f3966b25b7b03568b7e6bfc105f85b8c843f5dd416a99c7cecb2907b50a03dcd1d69563f3bb073862d3ffe3fd984024f638e2f8e8077f2eeef898
-  data.tar.gz: 6a3f86f648422d1021fa4bebdb135cf2730c5ae30faf9c7dd0baee90408c2eae9bb8e54dc6edbdee5b48186a73e703ab8454411b5afc8d0f35713be8ed90abdf
+  metadata.gz: 54521ae89174878e39b8a1416e75e3c4fd1a88fecf643d78a14a662c0b621fcd8d26469d09a8a0b272ba988b64cae26b332b64b1cdbfe705b3ab1ca809b78b50
+  data.tar.gz: ce3947995fd7dfe249fea6fa8021a7c75ccf1013a368e9fe4680b04a8ac59858249b64daa1cdc6956a1c158ba4afdf0923306cc78b28d06077b7a6b25daaec87

data/lib/klenod/build/plugins/css_plugin.rb

@@ -114,20 +114,22 @@ module Klenod
                 resolved_dependencies,
                 dependency_records,
                 result.metadata.fetch(:external_dependencies),
+                context,
                 import_asset_type: :css_javascript_stylesheet
               )
               javascript_asset, javascript_source_map_asset = css_asset_pair(module_id, javascript_css_edit, :css_javascript_stylesheet, {}, context)
+              javascript_asset.url = context.asset_url(javascript_asset.output_path)
 
               return result.with(
-                code: "Default = #{javascript_asset.output_path.inspect}\n",
+                code: "Default = #{javascript_asset.url.inspect}\n",
                 assets: [javascript_asset, javascript_source_map_asset, *result.assets].compact,
                 metadata: result.metadata.merge(
-                  css_javascript_stylesheet_path: javascript_asset.output_path
+                  css_javascript_stylesheet_path: javascript_asset.url
                 )
               )
             end
 
-            css_edit = finalized_css_edit(css_result, resolved_dependencies, dependency_records, result.metadata.fetch(:external_dependencies))
+            css_edit = finalized_css_edit(css_result, resolved_dependencies, dependency_records, result.metadata.fetch(:external_dependencies), context)
             classes = finalized_css_selectors(css_result, resolved_dependencies, dependency_records)
             asset, source_map_asset = css_asset_pair(
               module_id,
@@ -136,12 +138,13 @@ module Klenod
               {classes: classes, variables: css_result.variables},
               context
             )
+            asset.url = context.asset_url(asset.output_path)
 
             result.with(
-              code: ruby_module_source(classes, asset.output_path, styles_dependency: result.dependencies.fetch(0)),
+              code: ruby_module_source(classes, asset.url, styles_dependency: result.dependencies.fetch(0)),
               assets: [asset, source_map_asset, *result.assets].compact,
               metadata: result.metadata.merge(
-                css_asset_path: asset.output_path,
+                css_asset_path: asset.url,
                 css_classes: classes
               )
             )
@@ -293,8 +296,8 @@ module Klenod
             false
           end
 
-          def finalized_css_edit(css_result, resolved_dependencies, dependency_records, external_dependencies, import_asset_type: :css)
-            replace_dependencies(css_result, resolved_dependencies, dependency_records, external_dependencies, import_asset_type:)
+          def finalized_css_edit(css_result, resolved_dependencies, dependency_records, external_dependencies, context, import_asset_type: :css)
+            replace_dependencies(css_result, resolved_dependencies, dependency_records, external_dependencies, context, import_asset_type:)
               .then { replace_variable_references(css_result, it, resolved_dependencies, dependency_records) }
               .then { remove_empty_imports(it) }
           end
@@ -352,7 +355,7 @@ module Klenod
             offsets
           end
 
-          def replace_dependencies(css_result, resolved_dependencies, dependency_records, external_dependencies, import_asset_type:)
+          def replace_dependencies(css_result, resolved_dependencies, dependency_records, external_dependencies, context, import_asset_type:)
             dependencies_by_placeholder =
               resolved_dependencies.filter_map do |resolved_dependency|
                 next unless resolved_dependency.dependency.metadata.key?(:placeholder)
@@ -368,7 +371,7 @@ module Klenod
                   else
                     resolved_dependency = dependencies_by_placeholder.fetch(css_dependency.placeholder)
                     record = dependency_records.fetch(resolved_dependency.dependency.id)
-                    replacement_for_dependency(resolved_dependency, record, import_asset_type:)
+                    replacement_for_dependency(resolved_dependency, record, context, import_asset_type:)
                   end
 
                 [css_dependency.placeholder, replacement]
@@ -410,7 +413,7 @@ module Klenod
               source_map_json = source_map.to_json
               source_map_hash = Hashing.short(source_map_json)
               suffix = (type == :css) ? "" : ".javascript"
-              source_map_output_path = "/assets/#{asset_name(module_id)}#{suffix}.#{source_map_hash}.css.map"
+              source_map_output_path = "/#{asset_name(module_id)}#{suffix}.#{source_map_hash}.css.map"
               source_map_asset =
                 Asset.new(
                   module_id.path,
@@ -426,7 +429,7 @@ module Klenod
 
             hash = Hashing.short(css)
             suffix = (type == :css) ? "" : ".javascript"
-            output_path = "/assets/#{asset_name(module_id)}#{suffix}.#{hash}.css"
+            output_path = "/#{asset_name(module_id)}#{suffix}.#{hash}.css"
             asset =
               Asset.new(
                 module_id.path,
@@ -481,7 +484,7 @@ module Klenod
             end
           end
 
-          def replacement_for_dependency(resolved_dependency, record, import_asset_type:)
+          def replacement_for_dependency(resolved_dependency, record, context, import_asset_type:)
             case resolved_dependency.dependency.kind
             when :css_import
               css_asset = record.assets.find { |asset| asset.metadata[:type] == import_asset_type }
@@ -489,14 +492,14 @@ module Klenod
               unless css_asset
                 raise UnsupportedFileError, "CSS @import #{resolved_dependency.dependency.specifier.inspect} from #{resolved_dependency.dependency.importer_id} resolved to module #{record.id}, which does not emit a CSS asset"
               end
-              return (import_asset_type == :css) ? "" : css_asset.output_path
+              return (import_asset_type == :css) ? "" : css_asset.url
             when :asset_url
               unless record.assets.first
                 raise UnsupportedFileError, "CSS url() #{resolved_dependency.dependency.specifier.inspect} from #{resolved_dependency.dependency.importer_id} resolved to module #{record.id}, which does not emit an asset"
               end
             end
 
-            record.assets.first&.output_path || record.id.to_s
+            record.assets.first ? record.assets.first.url : record.id.to_s
           end
 
           def external_url?(value)

data/lib/klenod/plugin/css/version.rb

@@ -4,7 +4,7 @@ module Klenod
   module Build
     module Plugins
       module CSSPlugin
-        VERSION = "0.0.5"
+        VERSION = "0.0.6"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klenod-plugin-css
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: aarch64-linux-gnu
 authors:
 - Andrés Alin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-09-04 00:00:00.000000000 Z
+date: 2026-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: klenod-build
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -63,9 +63,6 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: 4.0.6
   - - ">="
     - !ruby/object:Gem::Version
       version: '4.0'