liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: deps cleanup + form validation fixes

Browse Source
This commit is contained in:
Nick
2019-09-15 23:20:40 -04:00
parent 1717f7a8d3
commit 309de5bc17
32 changed files with 761 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dev/webpack/webpack.dev.js
View File

@@ -173,18 +173,6 @@ module.exports = {
outputPath: 'fonts/'
}
}]
},
{
test: /.jsx$/,
loader: 'babel-loader',
exclude: /node_modules/,
options: {
presets: ['es2015', 'react']
}
},
{
test: /\.flow$/,
loader: 'ignore-loader'
}
]
},
@@ -193,8 +181,7 @@ module.exports = {
new VuetifyLoaderPlugin(),
new CopyWebpackPlugin([
{ from: 'client/static' },
{ from: './node_modules/prismjs/components', to: 'js/prism' },
{ from: './node_modules/graphql-voyager/dist/voyager.worker.js', to: 'js/' }
{ from: './node_modules/prismjs/components', to: 'js/prism' }
], {}),
new HtmlWebpackPlugin({
template: 'dev/templates/master.pug',
@@ -227,8 +214,7 @@ module.exports = {
}),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('development'),
'process.env.CURRENT_THEME': JSON.stringify(_.defaultTo(yargs.theme, 'default')),
'__REACT_DEVTOOLS_GLOBAL_HOOK__': '({ isDisabled: true })'
'process.env.CURRENT_THEME': JSON.stringify(_.defaultTo(yargs.theme, 'default'))
}),
new WriteFilePlugin(),
new webpack.HotModuleReplacementPlugin(),
@@ -270,7 +256,6 @@ module.exports = {
extensions: [
'.js',
'.json',
'.jsx',
'.vue'
],
modules: [

19
dev/webpack/webpack.prod.js
View File

@@ -177,18 +177,6 @@ module.exports = {
outputPath: 'fonts/'
}
}]
},
{
test: /.jsx$/,
loader: 'babel-loader',
exclude: /node_modules/,
options: {
presets: ['es2015', 'react']
}
},
{
test: /\.flow$/,
loader: 'ignore-loader'
}
]
},
@@ -198,8 +186,7 @@ module.exports = {
new webpack.BannerPlugin('Wiki.js - wiki.js.org - Licensed under AGPL'),
new CopyWebpackPlugin([
{ from: 'client/static' },
{ from: './node_modules/prismjs/components', to: 'js/prism' },
{ from: './node_modules/graphql-voyager/dist/voyager.worker.js', to: 'js/' }
{ from: './node_modules/prismjs/components', to: 'js/prism' }
], {}),
new MiniCssExtractPlugin({
filename: 'css/bundle.[hash].css',
@@ -245,8 +232,7 @@ module.exports = {
}),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('production'),
'process.env.CURRENT_THEME': JSON.stringify(_.defaultTo(yargs.theme, 'default')),
'__REACT_DEVTOOLS_GLOBAL_HOOK__': '({ isDisabled: true })'
'process.env.CURRENT_THEME': JSON.stringify(_.defaultTo(yargs.theme, 'default'))
})
],
optimization: {
@@ -273,7 +259,6 @@ module.exports = {
extensions: [
'.js',
'.json',
'jsx',
'.vue'
],
modules: [