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
21dd33be
Commit
21dd33be
authored
Feb 15, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pick up option from gdk to disable webpack dev server livereload
Fix
https://gitlab.com/gitlab-org/gitlab-ce/issues/28204
parent
14527293
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
changelogs/unreleased/28204-option-to-disable-webpack-dev-server-livereload.yml
...28204-option-to-disable-webpack-dev-server-livereload.yml
+4
-0
config/webpack.config.js
config/webpack.config.js
+2
-0
No files found.
changelogs/unreleased/28204-option-to-disable-webpack-dev-server-livereload.yml
0 → 100644
View file @
21dd33be
---
title
:
Pick up option from GDK to disable webpack dev server livereload
merge_request
:
author
:
config/webpack.config.js
View file @
21dd33be
...
@@ -10,6 +10,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
...
@@ -10,6 +10,7 @@ var ROOT_PATH = path.resolve(__dirname, '..');
var
IS_PRODUCTION
=
process
.
env
.
NODE_ENV
===
'
production
'
;
var
IS_PRODUCTION
=
process
.
env
.
NODE_ENV
===
'
production
'
;
var
IS_DEV_SERVER
=
process
.
argv
[
1
].
indexOf
(
'
webpack-dev-server
'
)
!==
-
1
;
var
IS_DEV_SERVER
=
process
.
argv
[
1
].
indexOf
(
'
webpack-dev-server
'
)
!==
-
1
;
var
DEV_SERVER_PORT
=
parseInt
(
process
.
env
.
DEV_SERVER_PORT
,
10
)
||
3808
;
var
DEV_SERVER_PORT
=
parseInt
(
process
.
env
.
DEV_SERVER_PORT
,
10
)
||
3808
;
var
DEV_SERVER_LIVERELOAD
=
process
.
env
.
DEV_SERVER_LIVERELOAD
!==
'
false
'
;
var
config
=
{
var
config
=
{
context
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
context
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
...
@@ -120,6 +121,7 @@ if (IS_DEV_SERVER) {
...
@@ -120,6 +121,7 @@ if (IS_DEV_SERVER) {
port
:
DEV_SERVER_PORT
,
port
:
DEV_SERVER_PORT
,
headers
:
{
'
Access-Control-Allow-Origin
'
:
'
*
'
},
headers
:
{
'
Access-Control-Allow-Origin
'
:
'
*
'
},
stats
:
'
errors-only
'
,
stats
:
'
errors-only
'
,
inline
:
DEV_SERVER_LIVERELOAD
};
};
config
.
output
.
publicPath
=
'
//localhost:
'
+
DEV_SERVER_PORT
+
config
.
output
.
publicPath
;
config
.
output
.
publicPath
=
'
//localhost:
'
+
DEV_SERVER_PORT
+
config
.
output
.
publicPath
;
}
}
...
...
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