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

ensure parent entrypoint is loaded if direct one is unavailable

Browse source
This commit is contained in:
Mike Greiling 2018-04-27 17:09:05 -05:00
parent f9e33f43c0
commit b2d90ea1fb
No known key found for this signature in database
GPG key ID: 0303DF507FA67596
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/webpack_helper.rb
View file

@ -15,12 +15,18 @@ module WebpackHelper
end end
route = [*controller.controller_path.split('/'), action].compact route = [*controller.controller_path.split('/'), action].compact
entrypoint = "pages.#{route.join('.')}"
until chunks.any? || route.empty?
entrypoint = "pages.#{route.join('.')}"
begin begin
chunks = entrypoint_paths(entrypoint, extension: 'js') chunks = entrypoint_paths(entrypoint, extension: 'js')
rescue Gitlab::Webpack::Manifest::AssetMissingError rescue Gitlab::Webpack::Manifest::AssetMissingError
# no bundle exists for this path # no bundle exists for this path
end
route.pop
end
if chunks.empty?
chunks = entrypoint_paths("default", extension: 'js') chunks = entrypoint_paths("default", extension: 'js')
end end