utopia 2.26.0 → 2.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d94f472431ddf09a1bb0002c02e1e94fb7cacf720bf93054286f5616c5ae9f7d
-  data.tar.gz: bf9576183c19dd53684c3a0f21c90aa8a785cb8301ef1ce712aea08890ed3918
+  metadata.gz: 4d142b51cf9876426ffa4bba1a96f824ee893ed59dbebc5d55da8f1aa617518e
+  data.tar.gz: 05765bc2e4761191eea490c934bf2379bc8593eec31bd93cca22b26ef2009b6e
 SHA512:
-  metadata.gz: 86a05f2d63c9f2e1cb140816329dec2c6ac22e1b03b505dbfb3b43efb316a05407f8c1004501a00751cfcded37ceee31f0d30743a1f07f78c38350afb1500094
-  data.tar.gz: facdc1eaea6987c92664ba4434ef8d19adfb62f990236c5fa84f03d732b7d80840ac7541d546d4ce1c555c1d47755cb41f36d28e7a2fa9a257b8bdeecb6ae00f
+  metadata.gz: 7b06e3f6d0e6f2ccd664bb1e3eab879eb9aa6a5e7dda45983132dab7902c29f87f6f2723732da3e3848a2145c10022645485454125fb0a2c03ce585ae81f66c5
+  data.tar.gz: 4c916eef819a9760e8469d362daba187c168f8e5f5dee799fa5900c1a8a32f2b30aaccf2f8c0f3a263a4e470c92f8d599af6b99d3bbd80b0227d3a73d7869e99

data/bake/utopia/node.rb

@@ -3,6 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2016-2025, by Samuel Williams.
 
+NPM = ENV["NPM"] || "npm"
+
 def update
 	require "fileutils"
 	require "utopia/path"
@@ -17,7 +19,11 @@ def update
 	
 	install_root = root + "public/_components"
 	
-	package_paths = expand_package_paths(package_root)
+	# Fetch only production dependencies using `npm ls --production`
+	production_packages = fetch_production_packages(package_root)
+	package_paths = expand_package_paths(package_root).select do |path|
+		production_packages.include?(path.basename.to_s)
+	end
 	
 	package_paths.each do |package_path|
 		package_directory = package_path.relative_path_from(package_root)
@@ -41,6 +47,28 @@ end
 
 private
 
+def fetch_production_packages(package_root)
+	require "json"
+	require "open3"
+	
+	stdout, _status = Open3.capture2(NPM, "ls", "--production", "--json", chdir: package_root.to_s)
+	
+	json = JSON.parse(stdout)
+	
+	flatten_package_dependencies(json).sort.uniq
+end
+
+def flatten_package_dependencies(json, into = [])
+	if json["dependencies"]
+		json["dependencies"].each do |name, details|
+			into << name
+			flatten_package_dependencies(details, into)
+		end
+	end
+	
+	return into
+end
+
 def expand_package_paths(root, into = [])
 	paths = root.children.select(&:directory?)
 	

data/lib/utopia/exceptions/handler.rb

@@ -3,6 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2014-2025, by Samuel Williams.
 
+require 'console'
+
 module Utopia
 	module Exceptions
 		# A middleware which catches exceptions and performs an internal redirect.
@@ -22,68 +24,31 @@ module Utopia
 				super
 			end
 			
-			# Generate a very simple fatal error response. This function should be unlikely to fail. Additionally, it generates a lowest common denominator response which should be suitable as a response to any kind of request. Ideally, this response is also not good or useful for any kind of higher level browser or API client, as this is not a normal error path but one that represents broken behaviour.
-			def fatal_error(env, exception)
-				body = StringIO.new
-				
-				write_exception_to_stream(body, env, exception)
-				body.rewind
-				
-				return [500, {HTTP::CONTENT_TYPE => "text/plain"}, body]
-			end
-			
-			def log_exception(env, exception)
-				# An error has occurred, log it:
-				output = env["rack.errors"] || $stderr
-				write_exception_to_stream(output, env, exception, true)
-			end
-			
 			def call(env)
 				begin
 					return @app.call(env)
 				rescue Exception => exception
-					log_exception(env, exception)
+					Console.warn(self, "An error occurred while processing the request.", error: exception)
 					
-					# If the error occurred while accessing the error handler, we finish with a fatal error:
-					if env[Rack::PATH_INFO] == @location
-						return fatal_error(env, exception)
-					else
-						begin
-							# We do an internal redirection to the error location:
-							error_request = env.merge(Rack::PATH_INFO => @location, Rack::REQUEST_METHOD => Rack::GET)
-							error_response = @app.call(error_request)
-							
-							return [500, error_response[1], error_response[2]]
-						rescue Exception
-							# If redirection fails, we also finish with a fatal error:
-							return fatal_error(env, exception)
-						end
+					begin
+						# We do an internal redirection to the error location:
+						error_request = env.merge(
+							Rack::PATH_INFO => @location,
+							Rack::REQUEST_METHOD => Rack::GET,
+							"utopia.exception" => exception,
+						)
+						
+						error_response = @app.call(error_request)
+						error_response[0] = 500
+						
+						return error_response
+					rescue Exception => exception
+						# If redirection fails, we also finish with a fatal error:
+						Console.error(self, "An error occurred while invoking the error handler.", error: exception)
+						return [500, {"content-type" => "text/plain"}, ["An error occurred while processing the request."]]
 					end
 				end
 			end
-			
-			private
-			
-			def write_exception_to_stream(stream, env, exception, include_backtrace = false)
-				buffer = []
-				
-				buffer << "While requesting resource #{env[Rack::PATH_INFO].inspect}, a fatal error occurred:"
-				
-				while exception != nil
-					buffer << "\t#{exception.class.name}: #{exception.to_s}"
-					
-					if include_backtrace
-						exception.backtrace.each do |line|
-							buffer << "\t\t#{line}"
-						end
-					end
-					
-					exception = exception.cause
-				end
-				
-				# We do this in one go so that lines don't get mixed up.
-				stream.puts buffer.join("\n")
-			end
 		end
 	end
 end

data/lib/utopia/exceptions/mailer.rb

@@ -66,6 +66,21 @@ module Utopia
 				:user_agent,
 			]
 			
+			ENV_KEYS = [
+				"PATH_INFO",
+				"REQUEST_METHOD",
+				"REQUEST_PATH",
+				"REQUEST_URI",
+				"SCRIPT_NAME",
+				"QUERY_STRING",
+				"SERVER_PROTOCOL",
+				"SERVER_NAME",
+				"SERVER_PORT",
+				"REMOTE_ADDR",
+				"CONTENT_TYPE",
+				"CONTENT_LENGTH",
+			]
+			
 			def generate_backtrace(io, exception, prefix: "Exception")
 				io.puts "#{prefix} #{exception.class.name}: #{exception.to_s}"
 				
@@ -104,6 +119,13 @@ module Utopia
 				
 				io.puts
 				
+				ENV_KEYS.each do |key|
+					value = env[key]
+					io.puts "env[#{key.inspect}]: #{value.inspect}"
+				end
+				
+				io.puts
+				
 				env.select{|key,_| key.start_with? "HTTP_"}.each do |key, value|
 					io.puts "#{key}: #{value.inspect}"
 				end

data/lib/utopia/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2009-2024, by Samuel Williams.
 
 module Utopia
-	VERSION = "2.26.0"
+	VERSION = "2.27.0"
 end

data/readme.md

@@ -13,7 +13,19 @@ Utopia is a website generation framework which provides a robust set of tools to
 
 ## Usage
 
-Please see the [project documentation](https://socketry.github.io/utopia).
+Please see the [project documentation](https://github.com/ioquatix/utopia) for more details.
+
+  - [Getting Started](https://github.com/ioquatix/utopiaguides/getting-started/index) - This guide explains how to set up a `utopia` website for local development and deployment.
+
+  - [Middleware](https://github.com/ioquatix/utopiaguides/middleware/index) - This guide gives an overview of the different Rack middleware used by Utopia.
+
+  - [Server Setup](https://github.com/ioquatix/utopiaguides/server-setup/index) - This guide explains how to deploy a `utopia` web application.
+
+  - [Installing JavaScript Libraries](https://github.com/ioquatix/utopiaguides/integrating-with-javascript/index) - Utopia integrates with Yarn and provides a [bake task](https://github.com/ioquatix/bake) to simplify deployment packages distributed using `yarn` that implement the `dist` sub-directory convention.
+
+  - [What is XNode?](https://github.com/ioquatix/utopiaguides/what-is-xnode/index) - This guide explains the `xnode` view layer and how it can be used to build efficient websites.
+
+  - [Updating Utopia](https://github.com/ioquatix/utopiaguides/updating-utopia/index) - This guide explains how to update existing `utopia` websites.
 
 ## See Also
 

data/releases.md

@@ -0,0 +1,6 @@
+# Releases
+
+## v2.27.0
+
+  - Improved error logging using `Console` gem.
+      - Only install `npm ls --production` dependencies into \`public/\_components

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.27.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2025-01-28 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -277,6 +277,7 @@ files:
 - lib/utopia/version.rb
 - license.md
 - readme.md
+- releases.md
 - setup/server/git/hooks/post-receive
 - setup/site/.gitignore
 - setup/site/Guardfile