klenod-plugin-javascript 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f6fde74797bd463bec37b1ab4cc4e5bac90f10bea16522e1d1d582febc201d1
-  data.tar.gz: 86e3c4ece111fb18e552b824d5b631b7faf6c6c9672f50580b4034a1472a2c53
+  metadata.gz: 30e11e7339a1726052d296fcb54854f6d014c611cd4c48094933e0cc6b74080f
+  data.tar.gz: 359efb21736cf969f54d02576d06a822e9797a654d9ca11fbb1b33de9ebeb007
 SHA512:
-  metadata.gz: f68198a77686d51e58ca1422e2d6c10028c22bc38b3da98e63a1a04954a2cbb09da7ca7a2d9072a9690c462d32df974f6fcc16d0823f59b772de6fc0ed103beb
-  data.tar.gz: 549bb4fd0d8c944c1706b0b844cc5a79513866b98c494337bf17ed3bb217eaf42150303f74f7e15693dd8343bec5bcde9470f12f02c754713a2feeb3fd31c8e2
+  metadata.gz: '05876d2ec618520716b30663a7b87088f8cf2a206a71f093e49222eb09bcb5f301861ae38bebb5b3f0b986ed873cb596247a943f494d6c75414be83091c92b88'
+  data.tar.gz: 7c250eb557f9b10c72a90b175cacab02948a92c838264865aca533769d4670dd0eda1275bb0b4c0ae0a64cdac26db0053de784e3162c65d36ce9fc20bcaf8a92

data/ext/native/Cargo.lock

@@ -43,9 +43,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
 
 [[package]]
 name = "ast_node"
-version = "5.0.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb025ef00a6da925cf40870b9c8d008526b6004ece399cb0974209720f0b194"
+checksum = "edf54a7a1bf98e127c22e9e2b9d19619092c74283fdc14e4d67da69780f90db6"
 dependencies = [
  "quote",
  "swc_macros_common",
@@ -302,9 +302,9 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "hstr"
-version = "3.0.6"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bb87e4b300d73412f6dcc7022ee7741452b51b155c2b06e5994d0770c2dbe2"
+checksum = "23efb2e58d2f27a96edfa907c26016deb120b7ac8c66a19d2748f0e9c145f3cb"
 dependencies = [
  "hashbrown 0.14.5",
  "new_debug_unreachable",
@@ -865,17 +865,6 @@ version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
-[[package]]
-name = "smartstring"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg",
- "static_assertions",
- "version_check",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
@@ -901,9 +890,9 @@ dependencies = [
 
 [[package]]
 name = "swc_allocator"
-version = "4.0.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7eefd2c8b228a8c73056482b2ae4b3a1071fbe07638e3b55ceca8570cc48bb"
+checksum = "eb41c2f41afa7357a86109f7e058f6b140ab415b8cd196c1a7b54f2703c85417"
 dependencies = [
  "allocator-api2",
  "bumpalo",
@@ -913,9 +902,9 @@ dependencies = [
 
 [[package]]
 name = "swc_atoms"
-version = "9.0.3"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "845f31910b5236db42dba106e8277681098d183b9b65b8dfa88ca8abe464aeff"
+checksum = "c70a493080ceb12dabddb96905a3ddac679fbe9c71ddc81a2a769126e8cde7c4"
 dependencies = [
  "hstr",
  "once_cell",
@@ -924,9 +913,9 @@ dependencies = [
 
 [[package]]
 name = "swc_common"
-version = "23.0.2"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176fb11b1abd0a175e8ac47d4b061c5c8a9ae13b9196f30d44fe5db9cb7dfcbd"
+checksum = "142d2a06cafce623859ca799f5d1935bb8a886f18b66a2585ddeadff210121d0"
 dependencies = [
  "anyhow",
  "ast_node",
@@ -949,9 +938,9 @@ dependencies = [
 
 [[package]]
 name = "swc_config"
-version = "5.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ee60aaa4eaea81fb9c730e64a0b88c363b5c237b774d114c97cba82f8655fdb"
+checksum = "733985ad1340ea469d0d4366bae9664aa8f246006fa822a7d9365b41e48d7986"
 dependencies = [
  "anyhow",
  "bytes-str",
@@ -975,9 +964,9 @@ dependencies = [
 
 [[package]]
 name = "swc_core"
-version = "73.0.0"
+version = "77.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f32ff8b6aad9a785a5861489a62576262e22d702fbc2f2c134e69278b7e934a3"
+checksum = "400701fb0bc3d13d1d0a1de6f58d91489fa9007eb3c584057bb2adb637fa9a5d"
 dependencies = [
  "swc_allocator",
  "swc_atoms",
@@ -993,9 +982,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_ast"
-version = "25.0.0"
+version = "29.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a207e09f23885ff1f4354ebfdd4e715ccd4a68fca2e7e0df09baafbca850762e"
+checksum = "5a6fd43fc7e90b9d5b252af666c147f5e2ee692add2b075f7f0d6fc2f5357bb6"
 dependencies = [
  "bitflags",
  "is-macro",
@@ -1012,9 +1001,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_codegen"
-version = "28.0.2"
+version = "32.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5a2fbf46c8cc66e112b6d8226ae0dacc6b983589df6192b38c7669d7721e02a"
+checksum = "a1b19a1d9f059fb77b0bc321688c7af59fe687a975581379456962586959c5d1"
 dependencies = [
  "ascii",
  "compact_str",
@@ -1030,6 +1019,7 @@ dependencies = [
  "swc_common",
  "swc_ecma_ast",
  "swc_ecma_codegen_macros",
+ "swc_ecma_utils",
  "tracing",
 ]
 
@@ -1046,9 +1036,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_hooks"
-version = "0.9.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3085866c59066b1346b50a70e12f28b9c06e44048370f7b20a25a769be92a0"
+checksum = "f3abc7b19ffc01d358fe6dfce904cc0a9c30c4db6deed11011b67c320f71682c"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -1058,18 +1048,18 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_parser"
-version = "41.1.2"
+version = "45.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f6c9c63026f4d1a70c3c6703446d42ce7b0fe83d4c33b6fe985faf96753f3e"
+checksum = "52c29766d4f60c867b48e4d433a4d6c1247f86e4fd1e5ca2babcdd2128806f91"
 dependencies = [
  "bitflags",
+ "compact_str",
  "either",
  "num-bigint",
  "phf",
  "rustc-hash",
  "seq-macro",
  "serde",
- "smartstring",
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
@@ -1078,9 +1068,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_base"
-version = "45.0.0"
+version = "49.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b61d73ff2b8c5d023cd97ff0026a50edf4e70f72d6acf93d65d7a6a9bde4a86a"
+checksum = "9c5b5b6a31a512d23854cb6fabc9347596bde4106cd3a65dc4f9072bbb0514b4"
 dependencies = [
  "better_scoped_tls",
  "indexmap",
@@ -1100,9 +1090,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_react"
-version = "51.0.0"
+version = "55.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a71661a8f91f22d2dd33add8d08f0bbef0e942868d6fad1e664593c10c9d8f74"
+checksum = "4d051cd9043cd7ca24eb154606e6a6914ed13d0dca686bd681a5277d99a8e4c7"
 dependencies = [
  "base64",
  "bytes-str",
@@ -1125,9 +1115,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_typescript"
-version = "51.0.0"
+version = "55.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74bf3cc7e20997e2918144504ecebc0f0c79af13cfa04feac5a55699e2cb5a5d"
+checksum = "f6ff33eb8a13dced33261de7778097e18ac33e2ff0ffe7b071f1837b54679d61"
 dependencies = [
  "bytes-str",
  "rustc-hash",
@@ -1143,9 +1133,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_utils"
-version = "31.0.2"
+version = "35.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04108a8cd1db73a46e8703e146568e4966b4afbecd238fe5cc4a10bf7e39a42e"
+checksum = "a0cf1613b3f833d4713998914154e8335eacbec9a3ceb328ee37dc7618cdb468"
 dependencies = [
  "dragonbox_ecma",
  "indexmap",
@@ -1162,9 +1152,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_visit"
-version = "25.0.0"
+version = "29.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f9cb1e958e57fa6427c106674a12190c4578684beee783e3a0508f048d1b372"
+checksum = "a830a070fea84a3a8a8c556463f0551e3bfc6cf2f8bdeecd62fa753e22a72289"
 dependencies = [
  "new_debug_unreachable",
  "num-bigint",

data/ext/native/Cargo.toml

@@ -9,4 +9,4 @@ crate-type = ["cdylib"]
 
 [dependencies]
 magnus = "0.8.2"
-swc_core = { version = "73.0.0", features = ["common", "ecma_ast", "ecma_codegen", "ecma_parser", "ecma_parser_typescript", "ecma_transforms_react", "ecma_transforms_typescript", "ecma_visit"] }
+swc_core = { version = "77.1.2", features = ["common", "ecma_ast", "ecma_codegen", "ecma_parser", "ecma_parser_typescript", "ecma_transforms_react", "ecma_transforms_typescript", "ecma_visit"] }

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

@@ -107,7 +107,7 @@ module Klenod
             imports = result.metadata[:javascript_imports]
             return result unless source && imports
 
-            edit = rewrite_imports(module_id, source, original_source, imports, resolved_dependencies, dependency_records)
+            edit = rewrite_imports(module_id, source, original_source, imports, resolved_dependencies, dependency_records, context)
             source_map_asset = nil
             code = edit.code
             custom_element_descriptor = nil
@@ -121,7 +121,7 @@ module Klenod
             if source_maps_enabled?(context)
               source_map_json = edit.source_map.to_json
               source_map_hash = Hashing.short(source_map_json)
-              source_map_output_path = "/assets/#{asset_name(module_id)}.#{source_map_hash}.js.map"
+              source_map_output_path = "/#{asset_name(module_id)}.#{source_map_hash}.js.map"
               source_map_asset =
                 Asset.new(
                   module_id.path,
@@ -136,10 +136,10 @@ module Klenod
             end
 
             hash = Hashing.short(code)
-            output_path = "/assets/#{asset_name(module_id)}.#{hash}.js"
+            output_path = "/#{asset_name(module_id)}.#{hash}.js"
             asset_javascript_assets = asset_javascript_assets(resolved_dependencies, dependency_records)
             metadata = {type: :javascript}
-            css_preload_assets = css_preload_assets(resolved_dependencies, dependency_records)
+            css_preload_assets = css_preload_assets(resolved_dependencies, dependency_records, context)
             metadata[:preload_assets] = css_preload_assets unless css_preload_assets.empty?
             asset =
               Asset.new(
@@ -151,13 +151,14 @@ module Klenod
                 CONTENT_TYPE,
                 metadata
               )
+            asset.url = context.asset_url(asset.output_path)
 
             result.with(
-              code: module_source(output_path, custom_element_descriptor: custom_element_descriptor&.merge(asset_path: output_path)),
+              code: module_source(asset.url, custom_element_descriptor: custom_element_descriptor&.merge(asset_path: asset.url)),
               assets: [asset, source_map_asset, *asset_javascript_assets].compact,
               metadata: result.metadata.merge(
-                javascript_asset_path: output_path,
-                javascript_custom_element_descriptor: custom_element_descriptor&.merge(asset_path: output_path)
+                javascript_asset_path: asset.url,
+                javascript_custom_element_descriptor: custom_element_descriptor&.merge(asset_path: asset.url)
               )
             )
           end
@@ -245,7 +246,7 @@ module Klenod
             SourceLocation.new(match[:path], match[:line].to_i, match[:column].to_i)
           end
 
-          def rewrite_imports(module_id, source, original_source, imports, resolved_dependencies, dependency_records)
+          def rewrite_imports(module_id, source, original_source, imports, resolved_dependencies, dependency_records, context)
             resolved_by_range =
               resolved_dependencies.to_h do |resolved_dependency|
                 metadata = resolved_dependency.dependency.metadata
@@ -259,23 +260,23 @@ module Klenod
                 dependency, record = resolved_by_range[[import.start_offset, import.end_offset]]
                 next [] unless dependency
 
-                import_edits(module_id, source, dependency, record)
+                import_edits(module_id, source, dependency, record, context)
               end
 
             SourceMap::Editor.new(source, identity_source_map(module_id, source, original_source)).apply(edits)
           end
 
-          def import_edits(module_id, source, dependency, record)
+          def import_edits(module_id, source, dependency, record, context)
             if (stylesheet_asset = css_javascript_stylesheet_asset(record))
               validate_css_import!(module_id, source, dependency)
-              edits = [SourceMap::Edit.replace(dependency.metadata.fetch(:start_offset), dependency.metadata.fetch(:end_offset), stylesheet_asset.output_path)]
+              edits = [SourceMap::Edit.replace(dependency.metadata.fetch(:start_offset), dependency.metadata.fetch(:end_offset), stylesheet_asset.url)]
               if dependency.metadata.fetch(:attributes)[:type].nil?
                 edits << SourceMap::Edit.replace(dependency.metadata.fetch(:attribute_insert_offset), dependency.metadata.fetch(:attribute_insert_offset), %( with { type: "css" }))
               end
               return edits
             end
 
-            if (asset_path = asset_javascript_asset_path(record))
+            if (asset_path = asset_javascript_asset_path(record, context))
               validate_asset_import!(module_id, source, dependency)
               return [SourceMap::Edit.replace(dependency.metadata.fetch(:start_offset), dependency.metadata.fetch(:end_offset), asset_path)]
             end
@@ -283,8 +284,9 @@ module Klenod
             [SourceMap::Edit.replace(dependency.metadata.fetch(:start_offset), dependency.metadata.fetch(:end_offset), record.metadata.fetch(:javascript_asset_path))]
           end
 
-          def asset_javascript_asset_path(record)
-            asset_javascript_metadata_asset(record)&.output_path
+          def asset_javascript_asset_path(record, _context)
+            asset = asset_javascript_metadata_asset(record)
+            asset&.url
           end
 
           def asset_javascript_assets(resolved_dependencies, dependency_records)
@@ -322,11 +324,11 @@ module Klenod
             record.assets.find { it.metadata[:type] == :css_javascript_stylesheet } || record.assets.find { it.metadata[:type] == :css }
           end
 
-          def css_preload_assets(resolved_dependencies, dependency_records)
+          def css_preload_assets(resolved_dependencies, dependency_records, context)
             resolved_dependencies.filter_map do |resolved_dependency|
               record = dependency_records.fetch(resolved_dependency.dependency.id)
               asset = css_javascript_stylesheet_asset(record)
-              {path: asset.output_path, as: "style"} if asset
+              {path: asset.url, as: "style"} if asset
             end.uniq
           end
 

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klenod-plugin-javascript
 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:
   - - ">="