catalyst-rails 0.1.0 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0345647f1600899692a28f86ba64bee05a2adae74642c6811ea4407749ed2c7
-  data.tar.gz: 6216abe9d5636d97d68b85dea0748799bf6eaa8f81335fb81c83b0573fb4cfe8
+  metadata.gz: 12cc6ca1565fb8e3c4321bcc233fb5acde2ccbbe11c6e21e9a7f0f1a5fe7d68e
+  data.tar.gz: d21bae4fbec785d6452c0cfb0ea921c1a2faaa162d617fd2c4690605037ef10c
 SHA512:
-  metadata.gz: 0b1fe8900c64bb2a5897cfce78276fbb2bec7f4a0b53d380161a6393566565e33129b1cd62552ac99e9e40b1f9c2f86fff6ec9e8d6dd138554acd7182eb35de0
-  data.tar.gz: 624c6253b5e8e6e0249e3529244fd2bd5b116cb5971dfb9baf31a82f4cbf32ca4dfecb30d97f4169ce58b9a2f6ceba12430b595191be9677e1e5f58b884d14ec
+  metadata.gz: 52667390f225ad5ff5697d57bbbb371b4dca9ecc79ec3f0da1c0b901d66508633abe21d8253f0c76b0610fad7cfd37e9475892b6f48295b686d0315eb557dae6
+  data.tar.gz: 51e1b1fab5a2110ee356d28805219581be119da97338cd585decbefabb612a073c367c5da8cecc322d82ac1b24ab6b7bb50eb8fc0890d1708d9279bfd020d0f3

data/lib/catalyst-rails.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'dry-configurable'
@@ -6,32 +7,55 @@ require 'open3'
 module Catalyst
   extend Dry::Configurable
 
-  default_environment = if ENV['NODE_ENV']
-    ENV['NODE_ENV'].to_sym
-  elsif defined? Rails
-    Rails.env.to_sym
+  def self.default_environment
+    if ENV['NODE_ENV']
+      ENV['NODE_ENV'].to_sym
+    elsif defined?(Rails)
+      Rails.env.to_sym
+    end
   end
 
-  default_manifest_path = if defined? Rails
-    File.expand_path('./public/assets/manifest.json', Dir.pwd)
+  def self.default_manifest_path
+    return unless defined?(Rails)
+
+    File.expand_path('./public/assets/catalyst.manifest.json', Dir.pwd)
   end
 
-  setting :environment, default_environment
-  setting :manifest_path, default_manifest_path
-  setting :assets_host, ENV.fetch('HOST') { nil }
-  setting :assets_host_protocol, 'https'
-  setting :dev_server_host, ENV.fetch('DEV_SERVER_HOST') { 'localhost' }
-  setting :dev_server_port, ENV.fetch('DEV_SERVER_PORT') { 8080 }.to_i
-  setting :running_feature_tests, -> {
-    !defined?(RSpec) || RSpec.world.all_example_groups.any? do |group|
-      group.metadata[:type] == :system
+  def self.default_assets_host
+    if defined?(Rails) && !Rails.env.production? && ENV['PORT']
+      "localhost:#{ENV['PORT']}"
+    else
+      ENV.fetch('HOST', nil)
     end
-  }
+  end
 
-  def self.log(message, level = :info)
-    message = message.split("\n").reduce('') do |reduction, line|
-      reduction + "\e[35m[Catalyst]\e[0m #{line}\n"
-    end
+  def self.default_assets_host_protocol
+    !defined?(Rails) || Rails.env.production? ? 'https' : 'http'
+  end
+
+  setting :pwd, Dir.pwd
+  setting :environment, default_environment
+  setting :manifest_path, default_manifest_path
+  setting :assets_host, default_assets_host
+  setting :assets_host_protocol, default_assets_host_protocol
+  setting :dev_server_host, ENV.fetch('DEV_SERVER_HOST', 'localhost')
+  setting :dev_server_port, ENV.fetch('DEV_SERVER_PORT', 8080).to_i
+  setting :dev_server_protocol, ENV.fetch('DEV_SERVER_PROTOCOL', 'http')
+  setting :running_feature_tests,
+          lambda {
+            !defined?(RSpec) || RSpec
+              .world
+              .all_example_groups
+              .any? { |group| group.metadata[:type] == :system }
+          }
+
+  def self.log(message)
+    message =
+      message
+        .split("\n")
+        .reduce('') do |reduction, line|
+          reduction + "\e[35m[Catalyst]\e[0m #{line}\n"
+        end
 
     puts message
   end
@@ -69,12 +93,10 @@ module Catalyst
     $catalyst_server_pid = wait_thr.pid
 
     Thread.new do
-      begin
-        while line = stdout.gets
-          puts line
-        end
-      rescue IOError
+      while (line = stdout.gets)
+        puts line
       end
+    rescue IOError
     end
 
     at_exit do
@@ -85,25 +107,26 @@ module Catalyst
   end
 
   def self.check_for_yarn!
-    unless system 'which yarn > /dev/null 2>&1'
-      raise NotInstalled, <<~MESSAGE
-        The yarn binary is not available in this directory.
-        Please follow the instructions here to install it:
-        https://yarnpkg.com/lang/en/docs/install
-      MESSAGE
-    end
+    raise NotInstalled, <<~MESSAGE unless system 'which yarn > /dev/null 2>&1'
+      The yarn binary is not available in this directory.
+      Please follow the instructions here to install it:
+      https://yarnpkg.com/lang/en/docs/install
+    MESSAGE
   end
 
   def self.check_for_catalyst!
     check_for_yarn!
 
-    unless system 'yarn run which catalyst > /dev/null 2>&1'
-      raise NotInstalled, <<~MESSAGE
-        The catalyst binary is not available in this directory.
-        Please follow the instructions here to install it:
-        https://github.com/friendsoftheweb/catalyst
-      MESSAGE
+    if File.exist?(File.join(Dir.pwd, 'node_modules/catalyst/lib/bin.js'))
+      return
     end
+
+    raise NotInstalled, <<~MESSAGE
+      The Catalyst binary is not available in this directory or you are using an unsupported version of Catalyst.
+
+      Please follow the instructions here to install it:
+      https://github.com/friendsoftheweb/catalyst
+    MESSAGE
   end
 end
 
@@ -112,4 +135,4 @@ require_relative './catalyst/errors'
 require_relative './catalyst/builder'
 require_relative './catalyst/helpers'
 require_relative './catalyst/manifest'
-require_relative './catalyst/railtie' if defined? Rails
+require_relative './catalyst/railtie' if defined?(::Rails::Railtie)

data/lib/catalyst/builder.rb

@@ -1,7 +1,9 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'singleton'
 require 'forwardable'
+require 'fileutils'
 require_relative './config'
 
 module Catalyst
@@ -16,18 +18,20 @@ module Catalyst
     end
 
     def build!(environment = nil)
-      Catalyst.check_for_catalyst!
-
       environment ||= Catalyst.config.environment
 
-      case environment
-      when :test
-        test_build!
-      when :production
-        production_build!
-      else
-        raise ArgumentError,
-              'Invalid environment. Must be one of: :test, :production.'
+      FileUtils.cd(Catalyst.config.pwd) do
+        Catalyst.check_for_catalyst!
+
+        case environment
+        when :test
+          test_build!
+        when :production
+          production_build!
+        else
+          raise ArgumentError,
+                'Invalid environment. Must be one of: :test, :production.'
+        end
       end
     end
 
@@ -69,20 +73,26 @@ module Catalyst
     end
 
     def production_build!
-      unless system("NODE_ENV=production #{BUILD_COMMAND}")
-        Catalyst.log('Failed to compile assets!')
+      return if system("NODE_ENV=production #{BUILD_COMMAND}")
 
-        exit 1
-      end
+      Catalyst.log('Failed to compile assets!')
+
+      exit 1
     end
 
     def assets_last_modified
-      asset_paths.lazy.map { |path| File.ctime(path) }.max || Time.now
+      asset_paths
+        .lazy
+        .select { |path| File.exist?(path) }
+        .map { |path| File.ctime(path) }
+        .max || Time.now
     end
 
     def asset_paths
       if ::Catalyst::Config.context_path
-        Dir.glob(File.join(::Catalyst::Config.context_path, '**/*.{js,ts,tsx,scss}')) + [
+        Dir.glob(
+          File.join(::Catalyst::Config.context_path, '**/*.{js,ts,tsx,scss}')
+        ) + [
           File.join(Dir.pwd, 'package.json'),
           File.join(Dir.pwd, 'yarn.lock'),
           File.join(Dir.pwd, 'catalyst.config.json')
@@ -93,16 +103,18 @@ module Catalyst
     end
 
     def assets_last_built_file_path
-      if defined?(Rails)
-        Rails.root.join('tmp/assets-last-built')
-      end
+      Rails.root.join('tmp/assets-last-built') if defined?(Rails)
     end
 
     def assets_last_built
       if assets_last_built_file_path.nil?
         Time.at(0)
       else
-        File.mtime(assets_last_built_file_path) rescue Time.at(0)
+        begin
+          File.mtime(assets_last_built_file_path)
+        rescue StandardError
+          Time.at(0)
+        end
       end
     end
   end

data/lib/catalyst/config.rb

@@ -1,5 +1,7 @@
+# typed: strict
 # frozen_string_literal: true
 
+require 'sorbet-runtime'
 require 'singleton'
 require 'forwardable'
 require 'json'
@@ -7,8 +9,16 @@ require_relative './errors'
 
 module Catalyst
   class Config
-    CATALYST_CONFIG_PATH = File.expand_path('./catalyst.config.json', Dir.pwd)
-    PACKAGE_PATH = File.expand_path('./package.json', Dir.pwd)
+    extend T::Sig
+    sig { returns(String) }
+    def self.catalyst_config_path
+      File.expand_path('./catalyst.config.json', Catalyst.config.pwd)
+    end
+
+    sig { returns(String) }
+    def self.package_path
+      File.expand_path('./package.json', Catalyst.config.pwd)
+    end
 
     include Singleton
 
@@ -17,27 +27,36 @@ module Catalyst
       def_delegators :instance, :context_path
     end
 
+    sig { void }
     def initialize
-      @values = if File.exists?(CATALYST_CONFIG_PATH)
-        JSON.parse(File.read(CATALYST_CONFIG_PATH))
-      elsif File.exists?(PACKAGE_PATH)
-        JSON.parse(File.read(PACKAGE_PATH))['catalyst']
-      else
-        raise ::Catalyst::MissingConfig,
-              "Missing 'catalyst.config.json' or 'package.json' file in: #{Dir.pwd}"
-      end
-
-      if @values.nil?
-        raise ::Catalyst::MissingConfig, <<~MESSAGE
-          Missing "catalyst" config in package.json file.
-          Please follow the instructions here to set up Catalyst:
-          https://github.com/friendsoftheweb/catalyst
-        MESSAGE
-      end
+      @values =
+        T.let(
+          if File.exist?(self.class.catalyst_config_path)
+            JSON.parse(File.read(self.class.catalyst_config_path))
+          elsif File.exist?(self.class.package_path)
+            JSON.parse(File.read(self.class.package_path))['catalyst']
+          else
+            raise ::Catalyst::MissingConfig,
+                  "Missing 'catalyst.config.json' or 'package.json' file in: #{
+                    Catalyst.config.pwd
+                  }"
+          end,
+          T::Hash[String, T.untyped]
+        )
+
+      raise ::Catalyst::MissingConfig, <<~MESSAGE if @values.nil?
+        Missing "catalyst" config in package.json file.
+        Please follow the instructions here to set up Catalyst:
+        https://github.com/friendsoftheweb/catalyst
+      MESSAGE
     end
 
+    sig { returns(String) }
     def context_path
-      File.join(Dir.pwd, @values['contextPath'] || @values['rootPath'])
+      File.join(
+        Catalyst.config.pwd,
+        @values['contextPath'] || @values['rootPath']
+      )
     end
   end
 end

data/lib/catalyst/content_type.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+# typed: strict
+
+require 'sorbet-runtime'
+
+module Catalyst
+  module ContentType
+    extend T::Sig
+
+    sig { params(filename: String).returns(Symbol) }
+    def self.for_filename(filename)
+      case File.extname(filename)
+      when /\.(js)\z/
+        :script
+      when /\.(css)\z/
+        :style
+      when /\.(png|jpe?g|gif|svg|webp)\z/
+        :image
+      when /\.(woff2?|ttf|eot)\z/
+        :font
+      when /\.(mp4|webm)\z/
+        :video
+      else
+        raise StandardError,
+              "Could not automatically determine the content type for: #{
+                filename
+              }"
+      end
+    end
+  end
+end

data/lib/catalyst/errors.rb

@@ -1,3 +1,4 @@
+# typed: strong
 # frozen_string_literal: true
 
 module Catalyst

data/lib/catalyst/helpers.rb

@@ -1,15 +1,21 @@
+# typed: true
 # frozen_string_literal: true
 
+require 'sorbet-runtime'
 require 'action_view'
 require_relative './manifest'
+require_relative './content_type'
 
 module Catalyst
   module Helpers
+    extend T::Sig
+    include Kernel
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::OutputSafetyHelper
 
+    sig { params(path: T.any(String, Symbol), common: T::Boolean).returns(String) }
     def catalyst_javascript_include_tag(path, common: true)
-      path = path.to_s.sub(/\.js\z/, '') + '.js'
+      path = "#{path.to_s.sub(/\.js\z/, '')}.js"
 
       if catalyst_referenced_files.include?(path)
         raise ::Catalyst::Manifest::DuplicateAssetReference,
@@ -18,29 +24,34 @@ module Catalyst
 
       catalyst_referenced_files << path
 
-      if !common
-        return content_tag(
-          :script,
-          nil,
-          type: 'text/javascript',
-          crossorigin: 'anonymous',
-          src: ::Catalyst::Manifest[path]
+      unless common
+        return(
+          content_tag(
+            :script,
+            nil,
+            type: 'text/javascript',
+            crossorigin: 'anonymous',
+            src: catalyst_asset_url(path)
+          )
         )
       end
 
-      safe_join([
-        catalyst_javascript_vendor_include_tag,
-        catalyst_javascript_common_include_tag,
-        content_tag(
-          :script,
-          nil,
-          type: 'text/javascript',
-          crossorigin: 'anonymous',
-          src: ::Catalyst::Manifest[path]
-        )
-      ])
+      safe_join(
+        [
+          catalyst_javascript_vendor_include_tag,
+          catalyst_javascript_common_include_tag,
+          content_tag(
+            :script,
+            nil,
+            type: 'text/javascript',
+            crossorigin: 'anonymous',
+            src: catalyst_asset_url(path)
+          )
+        ]
+      )
     end
 
+    sig { returns(T.nilable(String)) }
     def catalyst_javascript_vendor_include_tag
       path = 'vendor-dll.js'
 
@@ -50,20 +61,21 @@ module Catalyst
       catalyst_javascript_include_tag(path)
     end
 
+    sig { returns(T.nilable(String)) }
     def catalyst_javascript_common_include_tag
       path = 'common.js'
 
-      return nil if catalyst_referenced_files.include?(path)
+      return if catalyst_referenced_files.include?(path)
+      return unless ::Catalyst.development? || ::Catalyst::Manifest.has?(path)
 
-      if ::Catalyst.development? || ::Catalyst::Manifest.has?(path)
-        catalyst_javascript_include_tag(path)
-      end
+      catalyst_javascript_include_tag(path)
     end
 
+    sig { params(path: T.any(String, Symbol)).returns(T.nilable(String)) }
     def catalyst_stylesheet_link_tag(path)
       return nil if ::Catalyst.development?
 
-      path = path.to_s.sub(/\.css\z/, '') + '.css'
+      path = "#{path.to_s.sub(/\.css\z/, '')}.css"
 
       if catalyst_referenced_files.include?(path)
         raise ::Catalyst::Manifest::DuplicateAssetReference,
@@ -72,37 +84,116 @@ module Catalyst
 
       catalyst_referenced_files << path
 
-      safe_join([
-        catalyst_common_stylesheet_link_tag,
-        content_tag(
-          :link,
-          nil,
-          href: ::Catalyst::Manifest[path],
-          media: 'screen',
-          rel: 'stylesheet'
-        )
-      ])
+      safe_join(
+        [
+          catalyst_common_stylesheet_link_tag,
+          content_tag(
+            :link,
+            nil,
+            href: catalyst_asset_url(path),
+            media: 'screen',
+            rel: 'stylesheet'
+          )
+        ]
+      )
     end
 
+    sig { returns(T.nilable(String)) }
     def catalyst_common_stylesheet_link_tag
       path = 'common.css'
 
       return nil if catalyst_referenced_files.include?(path)
 
-      if ::Catalyst::Manifest.has?(path)
-        catalyst_stylesheet_link_tag(path)
-      end
+      catalyst_stylesheet_link_tag(path) if ::Catalyst::Manifest.has?(path)
+    end
+
+    sig { params(entry_name: T.any(String, Symbol)).returns(T.untyped) }
+    def catalyst_link_tags_for(entry_name)
+      safe_join(
+        [
+          catalyst_preload_link_tags_for(entry_name),
+          catalyst_prefetch_link_tags_for(entry_name)
+        ].flatten
+      )
+    end
+
+    sig { params(entry_name: T.any(String, Symbol)).returns(T.untyped) }
+    def catalyst_preload_link_tags_for(entry_name)
+      safe_join(
+        ::Catalyst::Manifest
+          .preload_urls_for(entry_name)
+          .map do |url|
+            content_tag(
+              :link,
+              nil,
+              {
+                href: catalyst_asset_url(url),
+                rel: 'preload',
+                as: ::Catalyst::ContentType.for_filename(url)
+              }
+            )
+          end
+      )
+    end
+
+    sig { params(entry_name: T.any(String, Symbol)).returns(T.untyped) }
+    def catalyst_prefetch_link_tags_for(entry_name)
+      safe_join(
+        ::Catalyst::Manifest
+          .prefetch_urls_for(entry_name)
+          .map do |url|
+            content_tag(
+              :link,
+              nil,
+              {
+                href: catalyst_asset_url(url),
+                rel: 'prefetch',
+                as: ::Catalyst::ContentType.for_filename(url)
+              }
+            )
+          end
+      )
+    end
+
+    sig { params(path: String).returns(T.untyped) }
+    def catalyst_preload_link_tag(path)
+      content_tag(
+        :link,
+        nil,
+        {
+          href: catalyst_asset_url(path),
+          rel: 'preload',
+          as: ::Catalyst::ContentType.for_filename(path)
+        }
+      )
+    end
+
+    sig { params(path: String).returns(T.untyped) }
+    def catalyst_prefetch_link_tag(path)
+      content_tag(
+        :link,
+        nil,
+        {
+          href: catalyst_asset_url(path),
+          rel: 'prefetch',
+          as: ::Catalyst::ContentType.for_filename(path)
+        }
+      )
     end
 
+    sig { params(path: T.any(String, Symbol)).returns(T.nilable(String)) }
     def catalyst_asset_path(path)
       ::Catalyst::Manifest[path]
     end
 
+    sig { params(path: T.any(String, Symbol)).returns(T.nilable(String)) }
     def catalyst_asset_url(path)
       if ::Catalyst.development? || ::Catalyst.config.assets_host.nil?
         catalyst_asset_path(path)
       else
-        "#{Catalyst.config.assets_host_protocol}://#{Catalyst.config.assets_host}#{catalyst_asset_path(path)}"
+        "#{Catalyst.config.assets_host_protocol}://#{
+          Catalyst.config.assets_host
+        }#{catalyst_asset_path(path)}"
       end
     end
 

data/lib/catalyst/manifest.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require 'singleton'
@@ -10,58 +11,112 @@ module Catalyst
     AssetMissing = Class.new(::Catalyst::CatalystError)
     DuplicateAssetReference = Class.new(::Catalyst::CatalystError)
 
+    extend T::Sig
     include Singleton
 
     class << self
       extend Forwardable
-      def_delegators :instance, :[], :has?
+
+      def_delegators :instance,
+                     :[],
+                     :has?,
+                     :preload_urls_for,
+                     :prefetch_urls_for
     end
 
+    sig { void }
     def initialize
       if Catalyst.development?
-        @manifest = {}
+        @manifest = T.let({}, T::Hash[String, T.untyped])
       else
         if Catalyst.config.manifest_path.nil?
           raise 'Missing "manifest_path" configuration.'
         end
 
-        @manifest = JSON.parse(File.read(Catalyst.config.manifest_path))
+        @manifest =
+          T.let(
+            JSON.parse(File.read(Catalyst.config.manifest_path)),
+            T::Hash[String, T.untyped]
+          )
       end
     end
 
+    sig { params(path: T.any(String, Symbol)).returns(T::Boolean) }
     def has?(path)
-      path = path.to_s.gsub(/\A\/+/, '')
+      path = path.to_s.gsub(%r{\A/+}, '')
 
-      if Catalyst.development?
-        false
-      else
-        @manifest.key?(path)
-      end
+      Catalyst.development? ? false : assets.key?(path)
     end
 
+    sig { params(path: T.any(String, Symbol)).returns(String) }
     def [](path)
-      path = path.to_s.gsub(/\A\/+/, '')
+      path = path.to_s.gsub(%r{\A/+}, '')
 
       if Catalyst.development?
+        dev_server_protocol = Catalyst.config.dev_server_protocol
         dev_server_host = Catalyst.config.dev_server_host
         dev_server_port = Catalyst.config.dev_server_port
 
+        if dev_server_protocol.nil?
+          raise ::Catalyst::CatalystError,
+                'Missing "dev_server_protocol" configuration.'
+        end
+
         if dev_server_host.nil?
-          raise 'Missing "dev_server_host" configuration.'
+          raise ::Catalyst::CatalystError,
+                'Missing "dev_server_host" configuration.'
         end
 
         if dev_server_port.nil?
-          raise 'Missing "dev_server_port" configuration.'
+          raise ::Catalyst::CatalystError,
+                'Missing "dev_server_port" configuration.'
         end
 
-        return "http://#{dev_server_host}:#{dev_server_port}/#{path}"
+        "#{dev_server_protocol}://#{dev_server_host}:#{dev_server_port}/#{path}"
+      elsif assets.key?(path)
+        T.must(assets[path])
       else
-        if @manifest.key?(path)
-          return @manifest[path]
-        else
-          raise AssetMissing, "Couldn't find an asset for path: #{path}"
-        end
+        raise AssetMissing, "Couldn't find an asset for path: #{path}"
       end
     end
+
+    sig { params(entry_name: T.any(String, Symbol)).returns(T::Array[String]) }
+    def preload_urls_for(entry_name)
+      return [] if Catalyst.development?
+
+      entry_name = entry_name.to_s
+
+      return [] unless preload.key?(entry_name)
+
+      T.must(preload[entry_name])
+    end
+
+    sig { params(entry_name: T.any(String, Symbol)).returns(T::Array[String]) }
+    def prefetch_urls_for(entry_name)
+      return [] if Catalyst.development?
+
+      entry_name = entry_name.to_s
+
+      return [] unless prefetch.key?(entry_name)
+
+      T.must(prefetch[entry_name])
+    end
+
+    private
+
+    sig { returns(T::Hash[String, String]) }
+    def assets
+      @manifest['assets'] || {}
+    end
+
+    sig { returns(T::Hash[String, T::Array[String]]) }
+    def preload
+      @manifest['preload'] || {}
+    end
+
+    sig { returns(T::Hash[String, T::Array[String]]) }
+    def prefetch
+      @manifest['prefetch'] || {}
+    end
   end
 end

data/lib/catalyst/railtie.rb

@@ -1,5 +1,7 @@
+# typed: ignore
 # frozen_string_literal: true
 
+require 'rails'
 require_relative './helpers'
 
 module Catalyst
@@ -8,8 +10,6 @@ module Catalyst
       ActionView::Base.include(::Catalyst::Helpers)
     end
 
-    rake_tasks do
-      load File.expand_path('./tasks/build.rake', __dir__)
-    end
+    rake_tasks { load File.expand_path('./tasks/build.rake', __dir__) }
   end
 end

data/lib/catalyst/tasks/build.rake

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 namespace :catalyst do
   desc 'Build assets with Catalyst'
   task :build do
-    if File.exists?('./public/assets/manifest.json')
+    if File.exist?('./public/assets/manifest.json')
       Catalyst.log('Removing previous assets...')
 
       manifest = JSON.parse(File.read('./public/assets/manifest.json'))
 
-      manifest.values.each do |asset_path|
+      manifest.each_value do |asset_path|
         system "rm -f ./public/assets/#{asset_path}*"
       end
     end

data/lib/catalyst/version.rb

@@ -1,7 +1,8 @@
+# typed: true
 # frozen_string_literal: true
 
 module Catalyst
   def self.version
-    Gem::Version.new('0.1.0')
+    Gem::Version.new('2.0.0.beta2')
   end
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: catalyst-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Dan Martens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -25,25 +45,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: actionview
+  name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<="
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: sorbet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: 
 email: dan@friendsoftheweb.com
 executables: []
@@ -53,6 +95,7 @@ files:
 - lib/catalyst-rails.rb
 - lib/catalyst/builder.rb
 - lib/catalyst/config.rb
+- lib/catalyst/content_type.rb
 - lib/catalyst/errors.rb
 - lib/catalyst/helpers.rb
 - lib/catalyst/manifest.rb
@@ -71,15 +114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby helpers for the "catalyst" node package