Skip to content
Snippets Groups Projects
Commit d7512f58 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

bump webpack to version 5.61, fixes #1216

Closes #1216

Merge request studip/studip!725
parent b11152c9
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
......@@ -88,7 +88,7 @@
"vrp-vue-resizable": "1.2.7",
"vue": "^2.6.12",
"vue-gettext": "^2.1.12",
"vue-loader": "^15.9.6",
"vue-loader": "^15.9.8",
"vue-router": "^3.5.1",
"vue-select": "^3.11.2",
"vue-template-babel-compiler": "^1.2.0",
......@@ -97,9 +97,9 @@
"vue-typer": "^1.2.0",
"vuedraggable": "^2.24.3",
"vuex": "^3.6.2",
"webpack": "5.6.0",
"webpack-cli": "4.2.0",
"webpack-dev-server": "3.11.0",
"webpack": "5.61",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "4.4.0",
"webpack-merge": "5.4.0"
},
"babel": {
......
......@@ -10,38 +10,12 @@ module.exports = merge(common, {
devtool: 'inline-source-map',
target: 'web',
devServer: {
// contentBase: path.join(__dirname, './public/assets'),
publicPath: `${config.protocol}://${config.host}:${config.port}/${path.basename(__dirname)}`,
compress: true,
port: config.port,
historyApiFallback: true,
https: config.protocol === 'https',
headers: {
'Access-Control-Allow-Origin': '*'
},
// Serve static files with appropriate headers
before: (app, server) => {
['flash', 'fonts', 'images', 'sounds'].forEach(type => {
app.use(
`/${path.basename(__dirname)}/${type}/`,
express.static(path.join(__dirname, `./public/assets/${type}/`), {
setHeaders: (res, path) => {
res.set('Access-Control-Allow-Origin', '*');
}
})
);
});
['ckeditor', 'mathjax'].forEach(vendor => {
app.use(
`/${path.basename(__dirname)}/javascripts/${vendor}`,
express.static(path.join(__dirname, `./public/assets/javascripts/${vendor}/`), {
setHeaders: (res, path) => {
res.set('Access-Control-Allow-Origin', '*');
}
})
);
});
}
}
});
......@@ -8,9 +8,6 @@ module.exports = merge(common, {
mode: 'production',
stats: 'errors-only',
devtool: 'source-map',
output: {
publicPath: undefined
},
optimization: {
minimize: true,
minimizer: [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment