Skip to content

Commit 48c2779

Browse files
theustheus
committed
⬆️ Upgrading dependencies
1 parent 6e18e5e commit 48c2779

4 files changed

Lines changed: 1876 additions & 1061 deletions

File tree

‎gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ gulp.task('compile', ['doc'], function () {
6262
});
6363

6464
gulp.task('doc', function (done) {
65-
exec('npm run doc:generate', function (err) {
65+
exec('node .\\node_modules\\documentation\\bin\\documentation.js build src/MenuChef.js -f json --shallow -o doc.json', function (err) {
6666
if (err) return done(err);
6767
done();
6868
});

‎package.json‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,43 +8,41 @@
88
},
99
"devDependencies": {
1010
"babel-core": "^6.23.1",
11-
"babel-loader": "^6.3.2",
11+
"babel-loader": "^7.1.2",
1212
"babel-preset-es2015": "^6.22.0",
1313
"chai": "^3.5.0",
1414
"collect.js": "^3.0.46",
1515
"concurrently": "^3.5.0",
16-
"css-loader": "^0.26.1",
16+
"css-loader": "^0.28.7",
1717
"documentation": "^4.0.0-rc.1",
18-
"extract-loader": "^0.1.0",
18+
"extract-loader": "^1.0.1",
1919
"gulp": "^3.9.1",
2020
"gulp-twig": "^0.7.0",
21-
"html-loader": "^0.4.4",
22-
"husky": "^0.13.3",
21+
"html-loader": "^0.5.1",
22+
"husky": "^0.14.3",
23+
"import-fresh": "^2.0.0",
2324
"lodash-es": "^4.17.4",
2425
"mocha-phantomjs": "^4.1.0",
2526
"mocha-phantomjs-core": "^2.1.1",
2627
"node-sass": "^4.5.0",
2728
"sass-loader": "^6.0.1",
28-
"standard": "^8.6.0",
29-
"standard-loader": "^5.0.0",
30-
"style-loader": "^0.13.1",
31-
"uglify-js": "git://github.com/mishoo/UglifyJS2.git#harmony",
32-
"uglifyjs-webpack-plugin": "^0.3.0",
33-
"webpack": "^2.2.1",
34-
"webpack-dev-server": "^2.4.1",
35-
"import-fresh": "^2.0.0",
36-
"slugg": "^1.2.1"
29+
"slugg": "^1.2.1",
30+
"standard": "^10.0.3",
31+
"standard-loader": "^6.0.1",
32+
"style-loader": "^0.19.0",
33+
"webpack": "^3.8.1",
34+
"webpack-dev-server": "^2.4.1"
3735
},
3836
"scripts": {
3937
"start": "npm run dev",
40-
"dev": "concurrently -k \"npm run webpack:watch\" \"npm run site:dev\"",
38+
"dev": "concurrently -k --names \"WEBPACK,GULP\" -c \"bgYellow.bold,bgRed.bold\" \"npm run webpack:watch\" \"npm run site:dev\"",
4139
"webpack:build": "webpack --colors",
4240
"webpack:watch": "webpack -w --colors",
4341
"webpack:dev": "webpack-dev-server",
4442
"build": "npm run webpack:build && npm run site:build",
4543
"test": "mocha-phantomjs .\\test\\index.html",
4644
"precommit": "npm test",
47-
"doc:generate": "documentation build src/MenuChef.js -f json --shallow -o doc.json",
45+
"doc:generate": "gulp doc",
4846
"site:build": "gulp",
4947
"site:dev": "gulp dev"
5048
},

‎webpack.config.babel.js‎

Lines changed: 74 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,80 @@
11
const webpack = require('webpack');
22
const path = require('path');
3-
const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
43
const pkg = require('./package.json');
54

6-
module.exports = function () {
7-
return {
8-
devtool: 'source-map',
9-
entry: {
10-
MenuChef: './src/MenuChef.js'
11-
},
12-
output: {
13-
path: path.join(__dirname, './dist'),
14-
filename: '[name].js'
15-
},
16-
module: {
17-
rules: [
18-
{
19-
enforce: 'pre',
20-
test: /\.js$/,
21-
loader: 'standard-loader',
22-
exclude: /(node_modules)/,
23-
},
24-
{
25-
test: /\.html$/,
26-
exclude: /node_modules/,
27-
loader: 'html-loader',
28-
query: {
29-
minimize: true,
30-
}
31-
},
32-
{
33-
test: /\.css$/,
34-
exclude: /node_modules/,
35-
use: [
36-
'style-loader',
37-
'css-loader'
38-
]
39-
},
40-
{
41-
test: /\.scss$/,
42-
use: [{
43-
loader: "style-loader"
44-
}, {
45-
loader: "css-loader"
46-
}, {
47-
loader: "sass-loader"
48-
}]
49-
},
50-
{
51-
test: /\.(js|jsx)$/,
52-
exclude: /node_modules/,
53-
use: [
54-
'babel-loader'
55-
],
56-
},
57-
],
58-
},
59-
resolve: {
60-
extensions: ['.webpack-loader.js', '.web-loader.js', '.loader.js', '.js', '.jsx'],
61-
modules: [
62-
path.resolve(__dirname, 'node_modules'),
63-
path.join(__dirname, './src')
64-
]
65-
},
66-
devServer: {
67-
contentBase: path.join(__dirname, 'dist'),
68-
compress: true,
69-
port: 9000
70-
},
71-
plugins: [
72-
new webpack.BannerPlugin(`MenuChef v${pkg.version}
73-
http://github.com/theus/MenuChef
74-
Released under the MIT License.`),
75-
new UglifyJSPlugin({
76-
sourceMap: true,
77-
mangle: {
78-
except: ['MenuChef']
5+
module.exports = {
6+
devtool: 'source-map',
7+
entry: {
8+
MenuChef: './src/MenuChef.js'
9+
},
10+
output: {
11+
path: path.join(__dirname, './dist'),
12+
filename: '[name].js'
13+
},
14+
module: {
15+
rules: [
16+
{
17+
enforce: 'pre',
18+
test: /\.js$/,
19+
loader: 'standard-loader',
20+
exclude: /(node_modules)/,
21+
},
22+
{
23+
test: /\.html$/,
24+
exclude: /node_modules/,
25+
loader: 'html-loader',
26+
query: {
27+
minimize: true,
7928
}
80-
})
29+
},
30+
{
31+
test: /\.css$/,
32+
exclude: /node_modules/,
33+
use: [
34+
'style-loader',
35+
'css-loader'
36+
]
37+
},
38+
{
39+
test: /\.scss$/,
40+
use: [{
41+
loader: "style-loader"
42+
}, {
43+
loader: "css-loader"
44+
}, {
45+
loader: "sass-loader"
46+
}]
47+
},
48+
{
49+
test: /\.(js|jsx)$/,
50+
exclude: /node_modules/,
51+
use: [
52+
'babel-loader'
53+
],
54+
},
55+
],
56+
},
57+
resolve: {
58+
extensions: ['.webpack-loader.js', '.web-loader.js', '.loader.js', '.js', '.jsx'],
59+
modules: [
60+
path.resolve(__dirname, 'node_modules'),
61+
path.join(__dirname, './src')
8162
]
82-
};
83-
};
63+
},
64+
devServer: {
65+
contentBase: path.join(__dirname, 'dist'),
66+
compress: true,
67+
port: 9000
68+
},
69+
plugins: [
70+
new webpack.BannerPlugin(`MenuChef v${pkg.version}
71+
http://github.com/theus/MenuChef
72+
Released under the MIT License.`),
73+
new webpack.optimize.UglifyJsPlugin({
74+
sourceMap: true,
75+
mangle: {
76+
except: ['MenuChef']
77+
}
78+
})
79+
]
80+
}

0 commit comments

Comments
 (0)