Skip to content

Commit 3dee0eb

Browse files
committed
Upgraded to webpack4
1 parent 2111d29 commit 3dee0eb

File tree

4 files changed

+76
-19
lines changed

4 files changed

+76
-19
lines changed

manager/.babelrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"presets": [
3+
["env", {
4+
"targets": {
5+
"browsers": ["Chrome >= 65"]
6+
},
7+
"debug": false,
8+
"modules": false,
9+
"useBuiltIns": "usage"
10+
}]
11+
]
12+
}

manager/gulpfile.js

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22

33
'use strict';
44

5-
const path = require('path');
6-
const gulp = require('gulp');
7-
const gutil = require('gulp-util');
8-
const concat = require('gulp-concat-util');
9-
const runSequence = require('run-sequence');
10-
const webpack = require('webpack-stream');
11-
const imagemin = require('gulp-imagemin');
12-
const del = require('del');
13-
const bump = require('gulp-bump');
14-
const sass = require('gulp-sass');
15-
const ejs = require('gulp-ejs');
16-
const PACKAGE = require('./package.json');
5+
const path = require('path');
6+
const gulp = require('gulp');
7+
const gutil = require('gulp-util');
8+
const concat = require('gulp-concat-util');
9+
const runSequence = require('run-sequence');
10+
const webpack = require('webpack');
11+
const webpackStream = require('webpack-stream');
12+
const imagemin = require('gulp-imagemin');
13+
const del = require('del');
14+
const bump = require('gulp-bump');
15+
const sass = require('gulp-sass');
16+
const ejs = require('gulp-ejs');
17+
const PACKAGE = require('./package.json');
1718

1819
const assets = {
1920
views: {
@@ -123,7 +124,7 @@ gulp.task('scss', function () {
123124
*/
124125
gulp.task('js', function () {
125126
return gulp.src(assets.js.src)
126-
.pipe(webpack(require('./webpack.config.js')))
127+
.pipe(webpackStream(require('./webpack.config.js'), webpack))
127128
.pipe(gulp.dest(assets.js.dest))
128129
.on('error', handleError);
129130
});

manager/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"winston": "^2.4.0"
2020
},
2121
"devDependencies": {
22-
"@babel/core": "^7.0.0-beta.31",
23-
"@babel/preset-env": "^7.0.0-beta.31",
24-
"@babel/preset-es2015": "^7.0.0-beta.32",
25-
"babel-loader": "^8.0.0-beta.0",
22+
"babel-core": "^6.26.3",
23+
"babel-loader": "^7.1.4",
24+
"babel-minify-webpack-plugin": "^0.3.1",
25+
"babel-preset-env": "^1.7.0",
2626
"backbone": "1.3.3",
2727
"backbone-virtual-collection": "^0.6.15",
2828
"backbone.marionette": "3.4.1",
@@ -47,7 +47,8 @@
4747
"prepack-webpack-plugin": "^1.1.0",
4848
"run-sequence": "^2.2.0",
4949
"underscore": "^1.8.3",
50-
"webpack": "^3.8.1",
50+
"webpack": "^4.12.0",
51+
"webpack-cli": "^3.0.8",
5152
"webpack-stream": "^4.0.0",
5253
"webpack-visualizer-plugin": "^0.1.11"
5354
},

manager/webpack.config.js

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,33 @@
1+
const path = require('path');
12
const webpack = require('webpack');
23
const Visualizer = require('webpack-visualizer-plugin');
34

45
module.exports = {
6+
entry: {
7+
main: './src/frontend/js/main.js',
8+
},
9+
output: {
10+
path: path.resolve(__dirname, 'dist'),
11+
filename: '[name].js',
12+
publicPath: '/'
13+
},
14+
15+
module: {
16+
rules: [
17+
{
18+
test: /\.js$/,
19+
exclude: /node_modules/,
20+
use: {
21+
loader: 'babel-loader'
22+
}
23+
},
24+
{
25+
test: /\.ejs$/,
26+
loader: 'ejs-loader'
27+
}
28+
]
29+
},
30+
/*
531
context: __dirname + '/src/frontend/js',
632
entry: './main.js',
733
output: {
@@ -15,7 +41,7 @@ module.exports = {
1541
{
1642
test: /\.js$/,
1743
exclude: /(node_modules|bower_components)/,
18-
loader: 'babel-loader',
44+
loader: 'babel-loader'//,
1945
query: {
2046
presets: ['@babel/es2015']
2147
}
@@ -26,6 +52,22 @@ module.exports = {
2652
}
2753
]
2854
},
55+
*/
56+
plugins: [
57+
new webpack.ProvidePlugin({
58+
$: 'jquery',
59+
jQuery: 'jquery',
60+
_: 'underscore'
61+
}),
62+
new Visualizer({
63+
filename: '../webpack_stats.html'
64+
}),
65+
new webpack.optimize.LimitChunkCountPlugin({
66+
maxChunks: 1, // Must be greater than or equal to one
67+
minChunkSize: 999999999
68+
})
69+
]
70+
/*
2971
plugins: [
3072
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
3173
new webpack.optimize.LimitChunkCountPlugin({
@@ -49,4 +91,5 @@ module.exports = {
4991
}
5092
})
5193
]
94+
*/
5295
};

0 commit comments

Comments
 (0)