Skip to content
This repository has been archived by the owner on Jan 13, 2021. It is now read-only.

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
raky291 committed Mar 24, 2020
1 parent c996618 commit b8bb0c7
Show file tree
Hide file tree
Showing 9 changed files with 452 additions and 175 deletions.
2 changes: 1 addition & 1 deletion .babelrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ['@babel/preset-env']
presets: ['@babel/preset-env'],
};
6 changes: 3 additions & 3 deletions .postcssrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
plugins: {
autoprefixer: {
cascade: false
}
}
cascade: false,
},
},
};
2 changes: 1 addition & 1 deletion .sassrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
includePaths: ['./client/styles']
includePaths: ['./client/styles'],
};
4 changes: 2 additions & 2 deletions client/app/core/webfontloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import WebFont from 'webfontloader';

WebFont.load({
google: {
families: ['Montserrat:300,400,500,700']
}
families: ['Montserrat:300,400,500,700'],
},
});
557 changes: 417 additions & 140 deletions package-lock.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@
"webpack:watch": "webpack --config webpack.dev.js --watch"
},
"devDependencies": {
"@babel/core": "^7.8.7",
"@babel/preset-env": "^7.8.7",
"@fortawesome/fontawesome-free": "^5.12.1",
"autoprefixer": "^9.7.4",
"@babel/core": "^7.9.0",
"@babel/preset-env": "^7.9.0",
"@fortawesome/fontawesome-free": "^5.13.0",
"autoprefixer": "^9.7.5",
"babel-eslint": "^10.1.0",
"babel-jest": "^25.1.0",
"babel-loader": "^8.0.6",
"babel-loader": "^8.1.0",
"bootstrap": "^4.4.1",
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^3.4.2",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.10.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-prettier": "^3.1.2",
"file-loader": "^5.1.0",
"file-loader": "^6.0.0",
"jest": "^25.1.0",
"mini-css-extract-plugin": "^0.9.0",
"node-sass": "^4.13.1",
"npm-run-all": "^4.1.5",
"optimize-css-assets-webpack-plugin": "^5.0.3",
"popper.js": "^1.16.1",
"postcss-loader": "^3.0.0",
"prettier": "^1.19.1",
"prettier": "^2.0.2",
"sass-loader": "^8.0.2",
"stylelint": "^13.2.1",
"stylelint-config-prettier": "^8.0.1",
Expand Down
24 changes: 12 additions & 12 deletions webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,42 @@ module.exports = {
entry: './client/main.js',
output: {
filename: 'js/[name].js',
path: path.resolve(__dirname, 'wwwroot/dist')
path: path.resolve(__dirname, 'wwwroot/dist'),
},
module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'babel-loader'
loader: 'babel-loader',
},
{
test: /\.scss$/,
use: [
{ loader: MiniCssExtractPlugin.loader, options: { publicPath: '../' } },
{ loader: 'css-loader', options: { sourceMap: true } },
{ loader: 'postcss-loader', options: { sourceMap: true } },
{ loader: 'sass-loader', options: { sourceMap: true, sassOptions } }
]
{ loader: 'sass-loader', options: { sourceMap: true, sassOptions } },
],
},
{
test: /\.(eot|svg|ttf|woff2?)$/,
loader: 'file-loader',
options: { name: 'fonts/[name].[ext]' }
}
]
options: { name: 'fonts/[name].[ext]' },
},
],
},
plugins: [
new webpack.ProgressPlugin(),
new CleanWebpackPlugin(),
new MiniCssExtractPlugin({
filename: 'css/[name].css'
})
filename: 'css/[name].css',
}),
],
externals: {
jquery: 'jQuery'
jquery: 'jQuery',
},
stats: {
children: false
}
children: false,
},
};
2 changes: 1 addition & 1 deletion webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ const common = require('./webpack.common.js');

module.exports = merge(common, {
mode: 'development',
devtool: 'source-map'
devtool: 'source-map',
});
12 changes: 6 additions & 6 deletions webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ module.exports = merge(common, {
extractComments: false,
parallel: true,
sourceMap: false,
terserOptions: { output: { comments: false } }
terserOptions: { output: { comments: false } },
}),
new OptimizeCssAssetsPlugin({
cssProcessorPluginOptions: {
preset: ['default', { discardComments: { removeAll: true } }]
}
})
]
}
preset: ['default', { discardComments: { removeAll: true } }],
},
}),
],
},
});

0 comments on commit b8bb0c7

Please sign in to comment.