jets 3.1.0 → 5.0.10

data/lib/jets/builders/code_builder.rb

@@ -26,13 +26,12 @@ module Jets::Builders
     end
 
     def build
-      check_ruby_version
       @version_purger.purge
       cache_check_message
 
       clean_start
-      compile_assets # easier to do before we copy the project because node and yarn has been likely setup in the that dir
-      compile_rails_assets
+      assets_precompile
+      run_webpack # easier to do before we copy the project because node and yarn has been likely setup in the that dir
       copy_project
       copy_ruby_version_file
       Dir.chdir("#{stage_area}/code") do
@@ -77,9 +76,10 @@ module Jets::Builders
     end
 
     def exist_on_s3?(filename)
-      return false if ENV['JETS_BUILD_NO_INTERNET']
+      return false if ENV['JETS_NO_INTERNET']
       s3_key = "jets/code/#{filename}"
       begin
+        Jets.logger.debug "Checking s3://#{s3_bucket}/#{s3_key}"
         s3.head_object(bucket: s3_bucket, key: s3_key)
         true
       rescue Aws::S3::Errors::NotFound, Aws::S3::Errors::Forbidden
@@ -95,7 +95,6 @@ module Jets::Builders
       # Reconfigure code
       store_s3_base_url
       disable_webpacker_middleware
-      copy_internal_jets_code
 
       # Code prep and zipping
       check_code_size!
@@ -117,32 +116,6 @@ module Jets::Builders
       CodeSize.check!
     end
 
-    # Materialized internal code into actually user Jets app as part of the deploy process.
-    # Examples of things that we might materialize:
-    #
-    #   Views
-    #   Simple Functions
-    #
-    # For functions,  We copy the files into the project because we cannot require
-    # simple functions directly since they are wrapped by an anonymous class.
-    def copy_internal_jets_code
-      files = []
-
-      mailers_controller = Jets::Router.has_controller?("Jets::MailersController")
-      if mailers_controller
-        files << "app/controllers/jets/mailers_controller.rb"
-        files << "app/views/jets/mailers"
-        files << "app/helpers/jets/mailers_helper.rb"
-      end
-
-      files.each do |relative_path|
-        src = File.expand_path("../internal/#{relative_path}", File.dirname(__FILE__))
-        dest = "#{"#{stage_area}/code"}/#{relative_path}"
-        FileUtils.mkdir_p(File.dirname(dest))
-        FileUtils.cp_r(src, dest)
-      end
-    end
-
     # Thanks https://stackoverflow.com/questions/9354595/recursively-getting-the-size-of-a-directory
     # Seems to overestimate a little bit but close enough.
     def dir_size(folder)
@@ -157,8 +130,9 @@ module Jets::Builders
     # At this point the minimal stack exists, so we can grab it with the AWS API.
     # We do not want to grab this as part of the live request because it is slow.
     def store_s3_base_url
+      return if Jets.config.mode == "job"
+      return unless gemfile_include?("sprockets-jets")
       write_s3_base_url("#{stage_area}/code/config/s3_base_url.txt")
-      write_s3_base_url("#{stage_area}/rack/config/s3_base_url.txt") if Jets.rack?
     end
 
     def write_s3_base_url(full_path)
@@ -175,12 +149,11 @@ module Jets::Builders
       #
       return Jets.config.assets.base_url if Jets.config.assets.base_url
 
+      # Note: subdomain form works with CORs but the subfolder form does not. Using subfolder form.
       region = Jets.aws.region
-
       asset_base_url = region == 'us-east-1' ?
-        "https://s3.amazonaws.com" :
-        "https://s3-#{region}.amazonaws.com"
-      "#{asset_base_url}/#{s3_bucket}/jets" # s3_base_url
+        "https://#{s3_bucket}.s3.amazonaws.com/jets" :
+        "https://#{s3_bucket}.s3-#{region}.amazonaws.com/jets"
     end
 
     def s3_bucket
@@ -193,25 +166,64 @@ module Jets::Builders
       FileUtils.touch(full_path)
     end
 
+    def assets_precompile
+      return if skip_assets?
+      return unless gemfile_include?("sprockets-jets")
+      sh "jets assets:precompile"
+    end
+
     # This happens in the current app directory not the tmp code for simplicity.
     # This is because the node and yarn has likely been set up correctly there.
-    def compile_assets
-      if ENV['JETS_SKIP_ASSETS']
-        puts "Skip compiling assets".color(:yellow) # useful for debugging
-        return
-      end
+    def run_webpack
+      return if skip_assets?
+      return unless gemfile_include?("jetpacker")
 
       headline "Compling assets in current project directory"
-      return unless webpacker_included?
-
       sh("yarn install")
+
+      ENV['WEBPACKER_ASSET_HOST'] = asset_host if Jets.config.assets.base_url
       webpack_command = File.exist?("#{Jets.root}/bin/webpack") ?
           "bin/webpack" :
           `which webpack`.strip
       sh "JETS_ENV=#{Jets.env} #{webpack_command}"
     end
 
-    def webpacker_included?
+    def skip_assets?
+      if ENV['JETS_SKIP_ASSETS']
+        puts "Skip compiling assets".color(:yellow) # useful for debugging
+        return true
+      end
+      Jets.config.mode == "job"
+    end
+
+    # Different url for these. Examples:
+    #
+    #   asset_host  https://demo-dev-s3bucket-lw5vq7ht8ip4.s3.us-west-2.amazonaws.com/jets/public/packs/media/images/boltops-0dd1c6bd.png
+    #   s3_base_url https://s3-us-west-2.amazonaws.com/demo-dev-s3bucket-lw5vq7ht8ip4/jets/packs/media/images/boltops-0dd1c6bd.png
+    #
+    # Interesting: asset_host works but s3_base_url does not for CORs. IE: reactjs or vuejs requests
+    # Thinking AWS configures the non-subdomain url endpoint to be more restrictive.
+    #
+    # Allow user to set assets.asset_host
+    #
+    #   Jets.application.configure do
+    #     config.assets.asset_host = "https://cloudfront.com/my/base/path"
+    #   end
+    #
+    def asset_host
+      assets = Jets.config.assets
+      return assets.base_url if assets.base_url && assets.base_url != "s3_endpoint"
+
+      # By default, will use the s3 url endpoint directly by convention
+      region = Jets.aws.region
+      asset_base_url = region == 'us-east-1' ?
+        "https://#{s3_bucket}.s3.amazonaws.com" :
+        "https://#{s3_bucket}.s3.#{region}.amazonaws.com"
+
+      "#{asset_base_url}/jets/public" # s3_base_url
+    end
+
+    def gemfile_include?(name)
       # Old code, leaving around for now:
       # Thanks: https://stackoverflow.com/questions/4195735/get-list-of-gems-being-used-by-a-bundler-project
       # webpacker_loaded = Gem.loaded_specs.keys.include?("webpacker")
@@ -220,56 +232,7 @@ module Jets::Builders
       # Checking this way because when using jets standalone for Afterburner mode we don't want to run into
       # bundler gem collisions.  TODO: figure out the a better way to handle the collisions.
       lines = IO.readlines("#{Jets.root}/Gemfile")
-      lines.detect { |l| l =~ /webpacker/ || l =~ /jetpacker/ }
-    end
-
-    # This happens in the current app directory not the tmp code for simplicity
-    # This is because the node likely been set up correctly there.
-    def compile_rails_assets
-      return unless Jets.rack? && rails? && !rails_api?
-
-      if ENV['JETS_SKIP_ASSETS']
-        puts "Skip compiling rack assets".color(:yellow) # useful for debugging
-        return
-      end
-
-      # Need to capture JETS_ROOT since can be changed by Turbo mode
-      jets_root = Jets.root
-      Bundler.with_unbundled_env do
-        # Switch gemfile for Afterburner mode
-        gemfile = ENV['BUNDLE_GEMFILE']
-        ENV['BUNDLE_GEMFILE'] = "#{jets_root}/rack/Gemfile"
-        sh "cd #{jets_root} && bundle install"
-        ENV['BUNDLE_GEMFILE'] = gemfile
-
-        rails_assets(:clobber, jets_root: jets_root)
-        rails_assets(:precompile, jets_root: jets_root)
-      end
-    end
-
-    def rails_assets(cmd, jets_root:)
-      # rake is available in both rails 4 and 5. rails command only in 5
-      command = "bundle exec rake assets:#{cmd} --trace"
-      command = "RAILS_ENV=#{Jets.env} #{command}" unless Jets.env.development?
-      sh("cd #{jets_root}/rack && #{command}")
-    end
-
-    # Rudimentary rails detection
-    # Duplicated in builders/reconfigure_rails.rb
-    def rails?
-      config_ru = "#{Jets.root}/rack/config.ru"
-      return false unless File.exist?(config_ru)
-      !IO.readlines(config_ru).grep(/Rails.application/).empty?
-    end
-
-    # Rudimentary rails api detection
-    # Duplicated in builders/reconfigure_rails.rb
-    # Another way of checking is loading a rails console and checking Rails.application.config.api_only
-    # Using this way for simplicity.
-    def rails_api?
-      config_app = "#{Jets.root}/rack/config/application.rb"
-      return false unless File.exist?(config_app)
-      !IO.readlines(config_app).grep(/config.api_only.*=.*true/).empty?
+      lines.detect { |l| l =~ /gem ['"]#{name}/ && l !~ /^\s*?#/ }
     end
 
     # Cleans out non-cached files like code-*.zip in Jets.build_root
@@ -293,7 +256,6 @@ module Jets::Builders
       FileUtils.rm_rf("#{stage_area}/code") # remove current code folder
       move_node_modules(Jets.root, Jets.build_root)
       begin
-        # puts "cp -r #{@full_project_path} #{"#{stage_area}/code"}".color(:yellow) # uncomment to debug
         Jets::Util.cp_r(@full_project_path, "#{stage_area}/code")
       ensure
         move_node_modules(Jets.build_root, Jets.root) # move node_modules directory back
@@ -317,12 +279,13 @@ module Jets::Builders
     # when they deploy a jets project in development mode
     def reconfigure_development_webpacker
       return unless Jets.env.development?
+      return unless gemfile_include?("jetpacker")
       headline "Reconfiguring webpacker development settings for AWS Lambda."
 
       webpacker_yml = "#{"#{stage_area}/code"}/config/webpacker.yml"
       return unless File.exist?(webpacker_yml)
 
-      config = YAML.load_file(webpacker_yml)
+      config = Jets::Util::Yamler.load_file(webpacker_yml)
       config["development"]["compile"] = false # force this to be false for deployment
       new_yaml = YAML.dump(config)
       IO.write(webpacker_yml, new_yaml)
@@ -339,11 +302,14 @@ module Jets::Builders
     memoize :rack_packager
 
     def package_ruby
-      return if Jets.poly_only?
+      if ENV['JETS_SKIP_PACKAGE']
+        puts "Skip packaging ruby".color(:yellow) # useful for developing handlers
+        return
+      end
+      return unless Jets.gem_layer?
 
       check_agree
       ruby_packager.install
-      reconfigure_rails # call here after "#{stage_area}/code" is available
       rack_packager.install
       ruby_packager.finish # by this time we have a /tmp/jets/demo/stage/code/vendor/gems
       rack_packager.finish
@@ -352,21 +318,16 @@ module Jets::Builders
     end
 
     def check_agree
-      agree = Jets::Gems::Agree.new
+      agree = Jets::Api::Agree.new
       agree.prompt
     end
 
     def build_lambda_layer
-      return if Jets.poly_only?
+      return unless Jets.gem_layer?
       lambda_layer = LambdaLayer.new
       lambda_layer.build
     end
 
-    # TODO: Move logic into plugin instead
-    def reconfigure_rails
-      ReconfigureRails.new("#{"#{stage_area}/code"}/rack").run
-    end
-
     def cache_check_message
       if File.exist?("#{Jets.build_root}/cache")
         puts "The #{Jets.build_root}/cache folder exists. Incrementally re-building the jets using the cache.  To clear the cache: rm -rf #{Jets.build_root}/cache"
@@ -379,28 +340,9 @@ module Jets::Builders
       FileUtils.cp_r(ruby_version_path, build_area)
     end
 
-    SUPPORTED_RUBY_VERSIONS = %w[2.5 2.7]
-    def check_ruby_version
-      return unless ENV['JETS_RUBY_CHECK'] == '0' || Jets.config.ruby.check == false
-      return if ruby_version_supported?
-      puts <<~EOL.color(:red)
-      You are using Ruby version #{RUBY_VERSION} which is not supported by Jets.
-      Please use one of the Jets supported ruby versions: #{SUPPORTED_RUBY_VERSIONS.join(' ')}
-      If you would like to skip this check you can set: JETS_RUBY_CHECK=0
-      EOL
-      exit 1
-    end
-
-    def ruby_version_supported?
-      md = RUBY_VERSION.match(/(\d+)\.(\d+)\.\d+/)
-      major, minor = md[1], md[2]
-      detected_ruby = [major, minor].join('.')
-      SUPPORTED_RUBY_VERSIONS.include?(detected_ruby)
-    end
-
     # Group all the path settings together here
     def self.tmp_code
-      Jets::Commands::Build.tmp_code
+      Jets::Cfn::Builder.tmp_code
     end
 
     def tmp_code

data/lib/jets/builders/code_size.rb

@@ -40,6 +40,7 @@ module Jets::Builders
     end
 
     def compute_size(path)
+      return 0 unless File.exist?(path)
       # -k option is required for macosx but not for linux
       out = `du -ks #{path}`
       out.split(' ').first.to_i # bytes

data/lib/jets/builders/gem_replacer.rb

@@ -1,14 +1,15 @@
 module Jets::Builders
   class GemReplacer
     extend Memoist
+    include Util
+
     def initialize(options)
       @options = options
     end
 
     def run
       # use_gemspec to resolve http-parser gem issue
-      use_gemspec = !Jets::Turbo.afterburner? # gemspec approach breaks afterburner mode
-      check = Jets::Gems::Check.new(use_gemspec: use_gemspec)
+      check = Jets::Api::Gems::Check.new(use_gemspec: true)
       if Jets.config.lambda.layers.empty?
         found_gems = check.run! # exits early if missing gems found
       else
@@ -18,7 +19,7 @@ module Jets::Builders
 
       # found gems will only have gems that were found
       found_gems.each do |gem_name|
-        gem_extractor = Jets::Gems::Extract::Gem.new(gem_name, @options)
+        gem_extractor = Jets::Api::Gems::Extract::Gem.new(gem_name, @options)
         gem_extractor.run
         rename_gem(gem_name)
       end
@@ -27,7 +28,7 @@ module Jets::Builders
     end
 
     def rename_gem(gem_name)
-      ruby_folder = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}"
+      ruby_folder = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Api::Gems.ruby_folder}"
       gems_folder = "#{ruby_folder}/gems"
       expr = "#{gems_folder}/#{gem_name}-x*-{darwin,linux}"
       src = Dir.glob(expr).first
@@ -37,15 +38,8 @@ module Jets::Builders
       FileUtils.mv(src, dest) unless File.exist?(dest) # looks like rename_gem actually runs twice
     end
 
-    def sh(command)
-      puts "=> #{command}".color(:green)
-      success = system(command)
-      abort("Command Failed: #{command}") unless success
-      success
-    end
-
     def ruby_folder
-      Jets::Gems.ruby_folder
+      Jets::Api::Gems.ruby_folder
     end
 
     # remove unnecessary files to reduce package size

data/lib/jets/builders/handler_generator.rb

@@ -45,6 +45,40 @@ module Jets::Builders
           generate_handler(vars)
         end
       end
+
+      if app_files.empty? && Jets.gem_layer?
+        # When there are no app files, still need to generate a shim for JetsController
+        lib = File.expand_path('../../..', __dir__)
+        path = "#{lib}/engines/internal/app/controllers/jets/public_controller.rb"
+        vars = Jets::Builders::ShimVars::App.new(path)
+        generate_handler(vars)
+      end
+    end
+
+    def generate_handler(vars)
+      template = handler_template(vars)
+      result = evaluate_template(template, vars)
+      dest = "#{tmp_code}/#{vars.dest_path}"
+
+      # Dont generate handles for all controllers if one_lambda_for_all_controllers
+      # Instead generate the same handler and use it. Writing to the same file
+      # multiple times but this is a simple way to implement this.
+      # It also keeps the logical in one spot.
+      if Jets.config.cfn.build.controllers == 'one_lambda_for_all_controllers' &&
+           dest.include?('handlers/controllers')
+        dest = "handlers/controller.rb"
+      end
+
+      FileUtils.mkdir_p(File.dirname(dest))
+      IO.write(dest, result)
+    end
+
+    def handler_template(vars)
+      if vars.process_type == "controller"
+        Jets.config.cfn.build.controllers + ".rb" # IE: templates/handlers/one_lambda_for_all_controllers.rb
+      else # job, rule, etc
+        "one_lambda_per_method.rb"
+      end
     end
 
     # source_path: app/functions/simple.rb
@@ -56,7 +90,7 @@ module Jets::Builders
     end
 
     def app_files
-      Jets::Commands::Build.app_files
+      Jets::Cfn::Builder.app_files
     end
 
     def poly_shims
@@ -64,7 +98,7 @@ module Jets::Builders
 
       app_files.each do |path|
         vars = Jets::Builders::ShimVars::App.new(path)
-        poly_tasks = vars.klass.tasks.select { |t| t.lang != :ruby }
+        poly_tasks = vars.klass.definitions.select { |d| d.lang != :ruby }
         poly_tasks.each do |task|
           source_path = get_source_path(path, task)
           if File.exist?(source_path)
@@ -96,11 +130,12 @@ module Jets::Builders
 
     def internal_shims
       jets_base_path if Jets.custom_domain?
-      s3_bucket_config if Jets.s3_event?
+      s3_bucket_config if Jets.s3_events?
     end
 
     def jets_base_path
-      copy_function_template("functions/jets/base_path.rb", stage_name: Jets::Resource::ApiGateway::Deployment.stage_name)
+      copy_function_template("functions/jets/base_path.rb", stage_name: Jets::Cfn::Resource::ApiGateway::Deployment.stage_name)
+      copy_function_template("functions/jets/base_path_mapping.rb")
     end
 
     def s3_bucket_config
@@ -109,8 +144,8 @@ module Jets::Builders
 
     # Copy code from internal folder to materialized app code
     def copy_function_template(path, vars={})
-      internal = File.expand_path("../internal", File.dirname(__FILE__))
-      src = "#{internal}/app/#{path}"
+      engines_internal_path = File.expand_path("../../../engines/internal", __dir__)
+      src = "#{engines_internal_path}/app/#{path}"
       result = Jets::Erb.result(src, vars)
       dest = "#{tmp_code}/handlers/#{path}"
       FileUtils.mkdir_p(File.dirname(dest))
@@ -124,7 +159,7 @@ module Jets::Builders
       source_path = fun.source_file
       unless source_path
         attributes = fun.template.values.first
-        function_name = attributes['Properties']['FunctionName']
+        function_name = attributes[:Properties][:FunctionName]
         puts "WARN: missing source file for: '#{function_name}' function".color(:yellow)
         return
       end
@@ -166,15 +201,8 @@ module Jets::Builders
       IO.write(dest, result)
     end
 
-    def generate_handler(vars)
-      result = evaluate_template("handler.rb", vars)
-      dest = "#{tmp_code}/#{vars.dest_path}"
-      FileUtils.mkdir_p(File.dirname(dest))
-      IO.write(dest, result)
-    end
-
     def evaluate_template(template_file, vars)
-      template_path = File.expand_path("../templates/#{template_file}", __FILE__)
+      template_path = File.expand_path("../templates/handlers/#{template_file}", __FILE__)
       Jets::Erb.result(template_path, vars: vars)
     end
 

data/lib/jets/builders/lambda_layer.rb

@@ -7,7 +7,7 @@ module Jets::Builders
     # Then replace the binary gems.
     def build
       consolidate_gems_to_opt
-      replace_compiled_gems unless Jets.config.gems.disable
+      replace_compiled_gems unless Jets.config.pro.disable
     end
 
     # Also restructure the folder from:
@@ -20,11 +20,6 @@ module Jets::Builders
       src = "#{stage_area}/code/vendor/gems/ruby/#{Jets.ruby_folder}"
       dest = "#{stage_area}/opt/ruby/gems/#{Jets.ruby_folder}"
       rsync_and_link(src, dest)
-
-      return unless Jets.rack?
-
-      src = "#{stage_area}/rack/vendor/gems/ruby/#{Jets.ruby_folder}"
-      rsync_and_link(src, dest)
     end
 
     def rsync_and_link(src, dest)
@@ -36,7 +31,7 @@ module Jets::Builders
 
       # Create symlink that will point to the gems in the Lambda Layer:
       #   stage/opt/ruby/gems/2.5.0 -> /opt/ruby/gems/2.5.0
-      FileUtils.ln_sf("/opt/ruby/gems/#{Jets::Gems.ruby_folder}", src)
+      FileUtils.ln_sf("/opt/ruby/gems/#{Jets::Api::Gems.ruby_folder}", src)
     end
 
     # replace_compiled_gems:

data/lib/jets/builders/purger.rb

@@ -2,7 +2,7 @@
 module Jets::Builders
   class Purger
     def initialize
-      @project_name = Jets.config.project_name
+      @project_name = Jets.project_name
       @version_file = "/tmp/jets/#{@project_name}/jets_version.txt"
     end
 

data/lib/jets/builders/rack_packager.rb

@@ -11,7 +11,7 @@ module Jets::Builders
     end
 
     def symlink_gems
-      ruby_folder = Jets::Gems.ruby_folder
+      ruby_folder = Jets::Api::Gems.ruby_folder
       # IE: @full_app_root: /tmp/jets/demo/stage/code/rack
       dest = "#{@full_app_root}/vendor/gems/ruby/#{ruby_folder}"
       FileUtils.mkdir_p(File.dirname(dest))

data/lib/jets/builders/ruby_packager.rb

@@ -3,9 +3,9 @@ require "bundler" # for clean_old_submodules only
 module Jets::Builders
   class RubyPackager
     include Util
-    
-    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/    
-    
+
+    GEM_REGEXP = /-(arm|x)\d+.*-(darwin|linux)/
+
     attr_reader :full_app_root
     def initialize(relative_app_root)
       @full_app_root = "#{build_area}/#{relative_app_root}"
@@ -16,6 +16,7 @@ module Jets::Builders
 
       clean_old_submodules
       bundle_install
+      bundle_check
       copy_bundle_config
       copy_cache_gems
     end
@@ -48,6 +49,7 @@ module Jets::Builders
 
       copy_gemfiles(full_project_path)
       copy_bundled_gems(full_project_path)
+      run_prebundle_copy
 
       # Uncomment out to always remove the cache/vendor/gems to debug
       # FileUtils.rm_rf("#{cache_area}/vendor/gems")
@@ -75,7 +77,39 @@ module Jets::Builders
       # For example we add the jets-rails to the Gemfile.
       copy_back_gemfile_lock
 
-      puts 'Bundle install success.'
+      puts 'Bundle install completed'
+    end
+
+    # Example `bundle check` error:
+    #
+    #     The following gems are missing
+    #     * date (3.3.3)
+    #     * timeout (0.3.2)
+    #     Install missing gems with `bundle install`
+    #
+    # Example success:
+    #
+    #     The Gemfile's dependencies are satisfied
+    #
+    def bundle_check
+      out = ''
+      Bundler.with_unbundled_env do
+        out = `cd #{cache_area} && bundle check 2>&1`
+      end
+      if out.include?("missing")
+        puts "Failed: bundle check".color(:red)
+        puts <<~EOL
+          This means something went wrong with the bundle install.
+          Jets will prevent the deployment to AWS Lambda.
+          It's better to error now instead of finding out on AWS Lambda.
+          The bundle install can fail for different system-specific reasons.
+          It could be an outdated or incompatible version of RubyGems and Ruby.
+
+          Related: https://community.boltops.com/t/could-not-find-timeout-0-3-1-in-any-of-the-sources/996
+
+        EOL
+        exit 1
+      end
     end
 
     def copy_back_gemfile_lock
@@ -126,17 +160,11 @@ module Jets::Builders
       Dir.glob("#{cache_area}/vendor/gems/ruby/2.5.0/bundler/gems/*").each do |path|
         sha = path.split('-').last[0..6] # only first 7 chars of the git sha
         unless git_shas.include?(sha)
-          # puts "Removing old submoduled gem: #{path}" # uncomment to see and debug
           FileUtils.rm_rf(path) # REMOVE old submodule directory
         end
       end
     end
 
-    def copy_bundled_gems(full_project_path)
-      src = "#{full_project_path}/bundled_gems"
-      return unless File.exist?(src)
-      Jets::Util.cp_r(src, "#{cache_area}/bundled_gems")
-    end
 
     def copy_gemfiles(full_project_path)
       FileUtils.mkdir_p(cache_area)
@@ -149,6 +177,22 @@ module Jets::Builders
       FileUtils.cp(gemfile_lock, dest)
     end
 
+    def copy_bundled_gems(full_project_path)
+      src = "#{full_project_path}/bundled_gems"
+      return unless File.exist?(src)
+      Jets::Util.cp_r(src, "#{cache_area}/bundled_gems")
+    end
+
+    def run_prebundle_copy
+      paths = Jets.config.build.prebundle_copy
+      paths = Array(paths)
+      paths.each do |path|
+        src = "#{@full_app_root}/#{path}"
+        return unless File.exist?(src)
+        Jets::Util.cp_r(src, "#{cache_area}/#{path}")
+      end
+    end
+
     # Remove the BUNDLED WITH line since we don't control the bundler gem version on AWS Lambda
     # And this can cause issues with require 'bundler/setup'
     def rewrite_gemfile_lock(gemfile_lock)

data/lib/jets/builders/shim_vars/app.rb

@@ -57,22 +57,26 @@ module Jets::Builders::ShimVars
     end
 
     def lang(meth)
-      klass.tasks.find
+      klass.definitions.find
     end
 
     # This gets called in the node shim js template
-    # IE handlers/controllers/posts_controller.index
+    # Example: handlers/controllers/posts_controller.index
     def handler_for(meth)
+      "#{handler_base}.#{meth}"
+    end
+
+    # Base portion of handler path.
+    # Example: handlers/controllers/posts_controller
+    def handler_base
       # possibly not include _function
       underscored_name = @relative_path.sub(%r{app/(\w+)/},'').sub('.rb','')
-      "handlers/#{process_type.pluralize}/#{underscored_name}.#{meth}"
+      "handlers/#{process_type.pluralize}/#{underscored_name}"
     end
 
     # Example return: "handlers/controllers/posts.js"
-    # TODO: rename this to dest_path or something better now since using native ruby
     def dest_path
-      @relative_path
-        .sub("app", "handlers")
+      @relative_path.sub("app", "handlers")
     end
   end
 end