Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
d6cd6e9d
Commit
d6cd6e9d
authored
May 07, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add webpack_ prefix to entrypoint paths helper
parent
b5983a70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/helpers/webpack_helper.rb
app/helpers/webpack_helper.rb
+4
-4
No files found.
app/helpers/webpack_helper.rb
View file @
d6cd6e9d
...
@@ -2,7 +2,7 @@ require 'gitlab/webpack/manifest'
...
@@ -2,7 +2,7 @@ require 'gitlab/webpack/manifest'
module
WebpackHelper
module
WebpackHelper
def
webpack_bundle_tag
(
bundle
)
def
webpack_bundle_tag
(
bundle
)
javascript_include_tag
(
*
entrypoint_paths
(
bundle
))
javascript_include_tag
(
*
webpack_
entrypoint_paths
(
bundle
))
end
end
def
webpack_controller_bundle_tags
def
webpack_controller_bundle_tags
...
@@ -19,7 +19,7 @@ module WebpackHelper
...
@@ -19,7 +19,7 @@ module WebpackHelper
until
chunks
.
any?
||
route
.
empty?
until
chunks
.
any?
||
route
.
empty?
entrypoint
=
"pages.
#{
route
.
join
(
'.'
)
}
"
entrypoint
=
"pages.
#{
route
.
join
(
'.'
)
}
"
begin
begin
chunks
=
entrypoint_paths
(
entrypoint
,
extension:
'js'
)
chunks
=
webpack_
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
end
...
@@ -27,13 +27,13 @@ module WebpackHelper
...
@@ -27,13 +27,13 @@ module WebpackHelper
end
end
if
chunks
.
empty?
if
chunks
.
empty?
chunks
=
entrypoint_paths
(
"default"
,
extension:
'js'
)
chunks
=
webpack_
entrypoint_paths
(
"default"
,
extension:
'js'
)
end
end
javascript_include_tag
(
*
chunks
)
javascript_include_tag
(
*
chunks
)
end
end
def
entrypoint_paths
(
source
,
extension:
nil
,
exclude_duplicates:
true
)
def
webpack_
entrypoint_paths
(
source
,
extension:
nil
,
exclude_duplicates:
true
)
return
""
unless
source
.
present?
return
""
unless
source
.
present?
paths
=
Gitlab
::
Webpack
::
Manifest
.
entrypoint_paths
(
source
)
paths
=
Gitlab
::
Webpack
::
Manifest
.
entrypoint_paths
(
source
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment