bridgetown-routes 1.3.0.beta1 → 1.3.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7680b47ada9e0bd8c8cc83fe466cad48c9cef456d8bcc35aaa834e9667ebc062
-  data.tar.gz: ff02c996ca420933d0416b00cb3a6468dd258da0756524ab76395132c44134d4
+  metadata.gz: 63095e5a9aa30c225d1bb261d8084ba547268b8fbe008321259dcdde5a88cb8b
+  data.tar.gz: 689739c2c7bde0c94892655c507e580bf3cce83807a64507ddd3c05f41cc0d51
 SHA512:
-  metadata.gz: 7cd30eb9153c26f7502e598788e5a1b9612103a22a9017bc2817f6477d6db2edb5fe68f11d542a2a3256be33b96b456b0f4ccb60c99d4c13f46d373d8e5bba52
-  data.tar.gz: 76dbfd075066d08ff1a7779bb53bd8d1a9b107029251308ce82b8c44538d8decd404d0cb82be3911cd9a5d89cf93a8b0f08af508fd70b3599366299836b180fa
+  metadata.gz: b4d72eba92b2ca4c7df0932ee9e502eea7405679228a1f36ab6061451cfff5b744d63277e409280f2b33da7a95e5fba8931aa56ee8e4d22a8d3a922bb257f9d9
+  data.tar.gz: 2c8eefae612e4f07b935c3b7b063b186c637fb1f6de2c5970ea4db8d237454b19ce23af880d3ba9d2375b5890a9107971024d88cbcdc099f57d23bd10d0d72f3

data/lib/bridgetown-routes/manifest.rb

@@ -4,7 +4,7 @@ module Bridgetown
   module Routes
     module Manifest
       class << self
-        def generate_manifest(site) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+        def generate_manifest(site) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity
           return @route_manifest[site.label] if @route_manifest && Bridgetown.env.production?
 
           new_manifest = []
@@ -22,15 +22,7 @@ module Bridgetown
                 next
               end
 
-              # @type [String]
-              file_slug = file.delete_prefix("#{routes_dir}/").then do |f|
-                [File.dirname(f), File.basename(f, ".*")].join("/").delete_prefix("./")
-              end.delete_suffix("/index")
-              segment_keys = []
-              file_slug.gsub!(%r{\[([^/]+)\]}) do |_segment|
-                segment_keys << Regexp.last_match(1)
-                ":#{Regexp.last_match(1)}"
-              end
+              file_slug, segment_keys = file_slug_and_segments(site, routes_dir, file)
 
               # generate localized file slugs
               localized_file_slugs = generate_localized_file_slugs(site, file_slug)
@@ -74,6 +66,25 @@ module Bridgetown
 
         private
 
+        def file_slug_and_segments(site, routes_dir, file)
+          # @type [String]
+          file_slug = file.delete_prefix("#{routes_dir}/").then do |f|
+            if routes_dir.start_with?(
+              File.expand_path(site.config[:islands_dir], site.config.source)
+            )
+              f = "#{site.config[:islands_dir].delete_prefix("_")}/#{f}"
+            end
+            [File.dirname(f), File.basename(f, ".*")].join("/").delete_prefix("./")
+          end.delete_suffix("/index")
+          segment_keys = []
+          file_slug.gsub!(%r{\[([^/]+)\]}) do |_segment|
+            segment_keys << Regexp.last_match(1)
+            ":#{Regexp.last_match(1)}"
+          end
+
+          [file_slug, segment_keys]
+        end
+
         def generate_localized_file_slugs(site, file_slug)
           site.config.available_locales.map do |locale|
             if locale == site.config.default_locale && !site.config.prefix_default_locale

data/lib/bridgetown-routes.rb

@@ -15,7 +15,7 @@ Bridgetown.initializer :"bridgetown-routes" do |config|
   config.init :ssr # ensure we already have touchdown!
 
   config.routes ||= {}
-  config.routes.source_paths ||= ["_routes"]
+  config.routes.source_paths ||= ["_routes", "#{config.islands_dir}/routes"]
   config.routes.extensions ||= %w(rb md serb erb liquid)
 
   config.only :server do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-routes
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta1
+  version: 1.3.0.beta2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta1
+        version: 1.3.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta1
+        version: 1.3.0.beta2
 - !ruby/object:Gem::Dependency
   name: roda-route_list
   requirement: !ruby/object:Gem::Requirement