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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
01a2bd4a
Commit
01a2bd4a
authored
Dec 03, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify ee_component resolution
parent
ba8c55ee
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
.eslintrc.yml
.eslintrc.yml
+0
-1
config/webpack.config.js
config/webpack.config.js
+4
-6
No files found.
.eslintrc.yml
View file @
01a2bd4a
...
...
@@ -31,7 +31,6 @@ rules:
-
error
-
allowElseIf
:
true
import/no-cycle
:
warn
import/no-unresolved
:
warn
import/no-useless-path-segments
:
off
import/order
:
warn
lines-between-class-members
:
off
...
...
config/webpack.config.js
View file @
01a2bd4a
...
...
@@ -102,6 +102,7 @@ const alias = {
if
(
IS_EE
)
{
Object
.
assign
(
alias
,
{
ee
:
path
.
join
(
ROOT_PATH
,
'
ee/app/assets/javascripts
'
),
ee_component
:
path
.
join
(
ROOT_PATH
,
'
ee/app/assets/javascripts
'
),
ee_empty_states
:
path
.
join
(
ROOT_PATH
,
'
ee/app/views/shared/empty_states
'
),
ee_icons
:
path
.
join
(
ROOT_PATH
,
'
ee/app/views/shared/icons
'
),
ee_images
:
path
.
join
(
ROOT_PATH
,
'
ee/app/assets/images
'
),
...
...
@@ -283,15 +284,12 @@ module.exports = {
jQuery
:
'
jquery
'
,
}),
new
webpack
.
NormalModuleReplacementPlugin
(
/^ee_component
\/(
.*
)\.
vue/
,
function
(
resource
)
{
if
(
Object
.
keys
(
module
.
exports
.
resolve
.
alias
).
indexOf
(
'
ee
'
)
>=
0
)
{
resource
.
request
=
resource
.
request
.
replace
(
/^ee_component/
,
'
ee
'
);
}
else
{
!
IS_EE
&&
new
webpack
.
NormalModuleReplacementPlugin
(
/^ee_component
\/(
.*
)\.
vue/
,
resource
=>
{
resource
.
request
=
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts/vue_shared/components/empty_component.js
'
,
);
}
}),
new
CopyWebpackPlugin
([
...
...
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