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
4a5e6813
Commit
4a5e6813
authored
Mar 28, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract IS_EE config helper
(cherry picked from commit
baa671a3
)
parent
5db40a5b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
config/helpers/is_ee_env.js
config/helpers/is_ee_env.js
+9
-0
config/webpack.config.js
config/webpack.config.js
+1
-5
No files found.
config/helpers/is_ee_env.js
0 → 100644
View file @
4a5e6813
const
fs
=
require
(
'
fs
'
);
const
path
=
require
(
'
path
'
);
const
ROOT_PATH
=
path
.
resolve
(
__dirname
,
'
../..
'
);
module
.
exports
=
process
.
env
.
EE
!==
undefined
?
JSON
.
parse
(
process
.
env
.
EE
)
:
fs
.
existsSync
(
path
.
join
(
ROOT_PATH
,
'
ee
'
));
config/webpack.config.js
View file @
4a5e6813
const
fs
=
require
(
'
fs
'
);
const
path
=
require
(
'
path
'
);
const
glob
=
require
(
'
glob
'
);
const
webpack
=
require
(
'
webpack
'
);
...
...
@@ -12,10 +11,7 @@ const ROOT_PATH = path.resolve(__dirname, '..');
const
CACHE_PATH
=
process
.
env
.
WEBPACK_CACHE_PATH
||
path
.
join
(
ROOT_PATH
,
'
tmp/cache
'
);
const
IS_PRODUCTION
=
process
.
env
.
NODE_ENV
===
'
production
'
;
const
IS_DEV_SERVER
=
process
.
argv
.
join
(
'
'
).
indexOf
(
'
webpack-dev-server
'
)
!==
-
1
;
const
IS_EE
=
process
.
env
.
EE
!==
undefined
?
JSON
.
parse
(
process
.
env
.
EE
)
:
fs
.
existsSync
(
path
.
join
(
ROOT_PATH
,
'
ee
'
));
const
IS_EE
=
require
(
'
./helpers/is_ee_env
'
);
const
DEV_SERVER_HOST
=
process
.
env
.
DEV_SERVER_HOST
||
'
localhost
'
;
const
DEV_SERVER_PORT
=
parseInt
(
process
.
env
.
DEV_SERVER_PORT
,
10
)
||
3808
;
const
DEV_SERVER_LIVERELOAD
=
IS_DEV_SERVER
&&
process
.
env
.
DEV_SERVER_LIVERELOAD
!==
'
false
'
;
...
...
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