klenod-plugin-css 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb9976f912b6deb06f5cbe3e818e9e3ff1a86f5a831935586cd280ed6a16d3ac
-  data.tar.gz: f14a14ac6767936d0b61023b0c4108674905249d2b9af6bb5ff04cc58f59e862
+  metadata.gz: bb6a9c2b39e44a14ae05b4445444231509e1aa1a0380acc9fe51177814127a9c
+  data.tar.gz: 47a183b31475bb5bd18ca1edb3b685ab3bfb3d586757d04a71352aab251e3848
 SHA512:
-  metadata.gz: 92684fb63ab4e27ba65461fe6c679bb4a5bed4bd8027020eba9bf5690fc23c12ced7d354671ab3e4613247a19b2d93659cd8b78167cadc458886dbe6845d70c7
-  data.tar.gz: aec16c1e4e04af450e713d1286e7b16ce0a6af3f601251faafcabec9b3ebfc7701b8832b3da3b2343486ba36441e258187086665a6dcb45ca0fa90361d87951b
+  metadata.gz: e1ee8bab41c9af460f9c22634b128813387984c505ae86445f250dec8148c60d7d4e86588f2c0dd6c29cb550ec0045945aa2834f39c13e1cf75b5388ff4a9fca
+  data.tar.gz: 9a52f63c9a834f3c174ce3ce2ae0f5cb668c5d5658bde162c5d460854570ba8363b591795087779174e219656daae876782f32b8ace18d9f78019db951f4e932

data/ext/native/Cargo.lock

@@ -37,9 +37,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.22.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
 [[package]]
 name = "base64-simd"
@@ -91,11 +91,11 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.10.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
 dependencies = [
- "generic-array",
+ "hybrid-array",
 ]
 
 [[package]]
@@ -158,6 +158,12 @@ dependencies = [
  "libloading",
 ]
 
+[[package]]
+name = "const-oid"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
+
 [[package]]
 name = "const-str"
 version = "1.1.0"
@@ -175,9 +181,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.17"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566"
 dependencies = [
  "libc",
 ]
@@ -209,12 +215,11 @@ checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.7"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
 dependencies = [
- "generic-array",
- "typenum",
+ "hybrid-array",
 ]
 
 [[package]]
@@ -280,11 +285,12 @@ dependencies = [
 
 [[package]]
 name = "digest"
-version = "0.10.7"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
 dependencies = [
  "block-buffer",
+ "const-oid",
  "crypto-common",
 ]
 
@@ -351,16 +357,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.17"
@@ -411,6 +407,15 @@ version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
+[[package]]
+name = "hybrid-array"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "707114b52a152fa7bdb290cd7cd5912d9467273b6d74e21b8d81aca1f8533f6b"
+dependencies = [
+ "typenum",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.14.1"
@@ -1037,9 +1042,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.9"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
 dependencies = [
  "cfg-if",
  "cpufeatures",

data/ext/native/Cargo.toml

@@ -8,10 +8,10 @@ name = "native"
 crate-type = ["cdylib"]
 
 [dependencies]
-base64 = "0.22.1"
+base64 = "0.23.1"
 cssparser = "0.37.0"
 lightningcss = { version = "1.0.0-alpha.70", features = ["serde", "visitor", "sourcemap"] }
 magnus = "0.8.2"
 parcel_sourcemap = { version = "2.1.1", features = ["json"] }
 serde_json = "1.0.149"
-sha2 = "0.10.9"
+sha2 = "0.11.0"

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-plugin-css
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrés Alin
@@ -15,14 +15,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: rb_sys
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 4.0.6
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="