Skip to content

Commit

Permalink
⬆️ Upgrading dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
theus committed Nov 2, 2017
1 parent 6e18e5e commit 48c2779
Show file tree
Hide file tree
Showing 4 changed files with 1,876 additions and 1,061 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ gulp.task('compile', ['doc'], function () {
});

gulp.task('doc', function (done) {
exec('npm run doc:generate', function (err) {
exec('node .\\node_modules\\documentation\\bin\\documentation.js build src/MenuChef.js -f json --shallow -o doc.json', function (err) {
if (err) return done(err);
done();
});
Expand Down
30 changes: 14 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,41 @@
},
"devDependencies": {
"babel-core": "^6.23.1",
"babel-loader": "^6.3.2",
"babel-loader": "^7.1.2",
"babel-preset-es2015": "^6.22.0",
"chai": "^3.5.0",
"collect.js": "^3.0.46",
"concurrently": "^3.5.0",
"css-loader": "^0.26.1",
"css-loader": "^0.28.7",
"documentation": "^4.0.0-rc.1",
"extract-loader": "^0.1.0",
"extract-loader": "^1.0.1",
"gulp": "^3.9.1",
"gulp-twig": "^0.7.0",
"html-loader": "^0.4.4",
"husky": "^0.13.3",
"html-loader": "^0.5.1",
"husky": "^0.14.3",
"import-fresh": "^2.0.0",
"lodash-es": "^4.17.4",
"mocha-phantomjs": "^4.1.0",
"mocha-phantomjs-core": "^2.1.1",
"node-sass": "^4.5.0",
"sass-loader": "^6.0.1",
"standard": "^8.6.0",
"standard-loader": "^5.0.0",
"style-loader": "^0.13.1",
"uglify-js": "git://github.com/mishoo/UglifyJS2.git#harmony",
"uglifyjs-webpack-plugin": "^0.3.0",
"webpack": "^2.2.1",
"webpack-dev-server": "^2.4.1",
"import-fresh": "^2.0.0",
"slugg": "^1.2.1"
"slugg": "^1.2.1",
"standard": "^10.0.3",
"standard-loader": "^6.0.1",
"style-loader": "^0.19.0",
"webpack": "^3.8.1",
"webpack-dev-server": "^2.4.1"
},
"scripts": {
"start": "npm run dev",
"dev": "concurrently -k \"npm run webpack:watch\" \"npm run site:dev\"",
"dev": "concurrently -k --names \"WEBPACK,GULP\" -c \"bgYellow.bold,bgRed.bold\" \"npm run webpack:watch\" \"npm run site:dev\"",
"webpack:build": "webpack --colors",
"webpack:watch": "webpack -w --colors",
"webpack:dev": "webpack-dev-server",
"build": "npm run webpack:build && npm run site:build",
"test": "mocha-phantomjs .\\test\\index.html",
"precommit": "npm test",
"doc:generate": "documentation build src/MenuChef.js -f json --shallow -o doc.json",
"doc:generate": "gulp doc",
"site:build": "gulp",
"site:dev": "gulp dev"
},
Expand Down
151 changes: 74 additions & 77 deletions webpack.config.babel.js
Original file line number Diff line number Diff line change
@@ -1,83 +1,80 @@
const webpack = require('webpack');
const path = require('path');
const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
const pkg = require('./package.json');

module.exports = function () {
return {
devtool: 'source-map',
entry: {
MenuChef: './src/MenuChef.js'
},
output: {
path: path.join(__dirname, './dist'),
filename: '[name].js'
},
module: {
rules: [
{
enforce: 'pre',
test: /\.js$/,
loader: 'standard-loader',
exclude: /(node_modules)/,
},
{
test: /\.html$/,
exclude: /node_modules/,
loader: 'html-loader',
query: {
minimize: true,
}
},
{
test: /\.css$/,
exclude: /node_modules/,
use: [
'style-loader',
'css-loader'
]
},
{
test: /\.scss$/,
use: [{
loader: "style-loader"
}, {
loader: "css-loader"
}, {
loader: "sass-loader"
}]
},
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: [
'babel-loader'
],
},
],
},
resolve: {
extensions: ['.webpack-loader.js', '.web-loader.js', '.loader.js', '.js', '.jsx'],
modules: [
path.resolve(__dirname, 'node_modules'),
path.join(__dirname, './src')
]
},
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
port: 9000
},
plugins: [
new webpack.BannerPlugin(`MenuChef v${pkg.version}
http://github.com/theus/MenuChef
Released under the MIT License.`),
new UglifyJSPlugin({
sourceMap: true,
mangle: {
except: ['MenuChef']
module.exports = {
devtool: 'source-map',
entry: {
MenuChef: './src/MenuChef.js'
},
output: {
path: path.join(__dirname, './dist'),
filename: '[name].js'
},
module: {
rules: [
{
enforce: 'pre',
test: /\.js$/,
loader: 'standard-loader',
exclude: /(node_modules)/,
},
{
test: /\.html$/,
exclude: /node_modules/,
loader: 'html-loader',
query: {
minimize: true,
}
})
},
{
test: /\.css$/,
exclude: /node_modules/,
use: [
'style-loader',
'css-loader'
]
},
{
test: /\.scss$/,
use: [{
loader: "style-loader"
}, {
loader: "css-loader"
}, {
loader: "sass-loader"
}]
},
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: [
'babel-loader'
],
},
],
},
resolve: {
extensions: ['.webpack-loader.js', '.web-loader.js', '.loader.js', '.js', '.jsx'],
modules: [
path.resolve(__dirname, 'node_modules'),
path.join(__dirname, './src')
]
};
};
},
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
port: 9000
},
plugins: [
new webpack.BannerPlugin(`MenuChef v${pkg.version}
http://github.com/theus/MenuChef
Released under the MIT License.`),
new webpack.optimize.UglifyJsPlugin({
sourceMap: true,
mangle: {
except: ['MenuChef']
}
})
]
}
Loading

0 comments on commit 48c2779

Please sign in to comment.