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
6dd90100
Commit
6dd90100
authored
Feb 08, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgrade to webpack 2.2.x
parent
0a36693c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
18 deletions
+17
-18
config/webpack.config.js
config/webpack.config.js
+14
-13
package.json
package.json
+3
-5
No files found.
config/webpack.config.js
View file @
6dd90100
...
@@ -48,24 +48,23 @@ var config = {
...
@@ -48,24 +48,23 @@ var config = {
devtool
:
'
inline-source-map
'
,
devtool
:
'
inline-source-map
'
,
module
:
{
module
:
{
loader
s
:
[
rule
s
:
[
{
{
test
:
/
\.(
js|es6
)
$/
,
test
:
/
\.(
js|es6
)
$/
,
exclude
:
/
(
node_modules|vendor
\/
assets
)
/
,
exclude
:
/
(
node_modules|vendor
\/
assets
)
/
,
loader
:
'
babel-loader
'
,
loader
:
'
babel-loader
'
,
query
:
{
options
:
{
presets
:
[
'
es2015
'
,
'
stage-2
'
]
presets
:
[
[
"
es2015
"
,
{
"
modules
"
:
false
}],
'
stage-2
'
]
}
}
},
},
{
{
test
:
/
\.(
js|es6
)
$/
,
test
:
/
\.(
js|es6
)
$/
,
exclude
:
/node_modules/
,
exclude
:
/node_modules/
,
loader
:
'
imports-loader
'
,
loader
:
'
imports-loader
'
,
query
:
'
this=>window
'
options
:
'
this=>window
'
},
{
test
:
/
\.
json$/
,
loader
:
'
json-loader
'
}
}
]
]
},
},
...
@@ -86,7 +85,7 @@ var config = {
...
@@ -86,7 +85,7 @@ var config = {
],
],
resolve
:
{
resolve
:
{
extensions
:
[
'
'
,
'
.js
'
,
'
.es6
'
,
'
.js.es6
'
],
extensions
:
[
'
.js
'
,
'
.es6
'
,
'
.js.es6
'
],
alias
:
{
alias
:
{
'
~
'
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
'
~
'
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
'
bootstrap/js
'
:
'
bootstrap-sass/assets/javascripts/bootstrap
'
,
'
bootstrap/js
'
:
'
bootstrap-sass/assets/javascripts/bootstrap
'
,
...
@@ -102,14 +101,16 @@ if (IS_PRODUCTION) {
...
@@ -102,14 +101,16 @@ if (IS_PRODUCTION) {
config
.
devtool
=
'
source-map
'
;
config
.
devtool
=
'
source-map
'
;
config
.
plugins
.
push
(
config
.
plugins
.
push
(
new
webpack
.
NoErrorsPlugin
(),
new
webpack
.
NoErrorsPlugin
(),
new
webpack
.
LoaderOptionsPlugin
({
minimize
:
true
,
debug
:
false
}),
new
webpack
.
optimize
.
UglifyJsPlugin
({
new
webpack
.
optimize
.
UglifyJsPlugin
({
compress
:
{
warnings
:
false
}
sourceMap
:
true
}),
}),
new
webpack
.
DefinePlugin
({
new
webpack
.
DefinePlugin
({
'
process.env
'
:
{
NODE_ENV
:
JSON
.
stringify
(
'
production
'
)
}
'
process.env
'
:
{
NODE_ENV
:
JSON
.
stringify
(
'
production
'
)
}
}),
})
new
webpack
.
optimize
.
DedupePlugin
(),
new
webpack
.
optimize
.
OccurrenceOrderPlugin
()
);
);
}
}
...
...
package.json
View file @
6dd90100
...
@@ -19,21 +19,19 @@
...
@@ -19,21 +19,19 @@
"
compression-webpack-plugin
"
:
"
^0.3.2
"
,
"
compression-webpack-plugin
"
:
"
^0.3.2
"
,
"
d3
"
:
"
3.5.11
"
,
"
d3
"
:
"
3.5.11
"
,
"
dropzone
"
:
"
4.2.0
"
,
"
dropzone
"
:
"
4.2.0
"
,
"
exports-loader
"
:
"
^0.6.3
"
,
"
imports-loader
"
:
"
^0.6.5
"
,
"
imports-loader
"
:
"
^0.6.5
"
,
"
jquery
"
:
"
2.2.1
"
,
"
jquery
"
:
"
2.2.1
"
,
"
jquery-ui
"
:
"
github:jquery/jquery-ui#1.11.4
"
,
"
jquery-ui
"
:
"
github:jquery/jquery-ui#1.11.4
"
,
"
jquery-ujs
"
:
"
1.2.1
"
,
"
jquery-ujs
"
:
"
1.2.1
"
,
"
json-loader
"
:
"
^0.5.4
"
,
"
mousetrap
"
:
"
1.4.6
"
,
"
mousetrap
"
:
"
1.4.6
"
,
"
pikaday
"
:
"
^1.5.1
"
,
"
pikaday
"
:
"
^1.5.1
"
,
"
select2
"
:
"
3.5.2-browserify
"
,
"
select2
"
:
"
3.5.2-browserify
"
,
"
stats-webpack-plugin
"
:
"
^0.4.
2
"
,
"
stats-webpack-plugin
"
:
"
^0.4.
3
"
,
"
underscore
"
:
"
1.8.3
"
,
"
underscore
"
:
"
1.8.3
"
,
"
vue
"
:
"
2.0.3
"
,
"
vue
"
:
"
2.0.3
"
,
"
vue-resource
"
:
"
0.9.3
"
,
"
vue-resource
"
:
"
0.9.3
"
,
"
webpack
"
:
"
^
1.14.0
"
,
"
webpack
"
:
"
^
2.2.1
"
,
"
webpack-dev-server
"
:
"
^
1.16.2
"
"
webpack-dev-server
"
:
"
^
2.3.0
"
},
},
"devDependencies"
:
{
"devDependencies"
:
{
"
eslint
"
:
"
^3.10.1
"
,
"
eslint
"
:
"
^3.10.1
"
,
...
...
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