kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

add webpack_ prefix to entrypoint paths helper

This commit is contained in:
Mike Greiling 2018-05-07 11:19:54 -05:00
parent b5983a700e
commit d6cd6e9dc6
No known key found for this signature in database
GPG Key ID: 0303DF507FA67596
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/webpack_helper.rb
View File

@ -2,7 +2,7 @@ require 'gitlab/webpack/manifest'
module WebpackHelper
def webpack_bundle_tag(bundle)
javascript_include_tag(*entrypoint_paths(bundle))
javascript_include_tag(*webpack_entrypoint_paths(bundle))
end
def webpack_controller_bundle_tags
@ -19,7 +19,7 @@ module WebpackHelper
until chunks.any? || route.empty?
entrypoint = "pages.#{route.join('.')}"
begin
chunks = entrypoint_paths(entrypoint, extension: 'js')
chunks = webpack_entrypoint_paths(entrypoint, extension: 'js')
rescue Gitlab::Webpack::Manifest::AssetMissingError
# no bundle exists for this path
end
@ -27,13 +27,13 @@ module WebpackHelper
end
if chunks.empty?
chunks = entrypoint_paths("default", extension: 'js')
chunks = webpack_entrypoint_paths("default", extension: 'js')
end
javascript_include_tag(*chunks)
end
def entrypoint_paths(source, extension: nil, exclude_duplicates: true)
def webpack_entrypoint_paths(source, extension: nil, exclude_duplicates: true)
return "" unless source.present?
paths = Gitlab::Webpack::Manifest.entrypoint_paths(source)