Skip to content
Snippets Groups Projects
Commit afd8914a authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

remove dev server, fixes #1608

Closes #1608

Merge request studip/studip!1034
parent b3bed062
No related branches found
No related tags found
No related merge requests found
......@@ -42,9 +42,6 @@ webpack-prod: .webpack.prod
webpack-watch: npm
npm run webpack-watch
wds: npm
npm run wds
.webpack.dev: node_modules/.package-lock.json $(RESOURCES)
@rm -f .webpack.prod
npm run webpack-dev
......
{
"protocol": "http",
"host": "127.0.0.1",
"port": 8150
}
......@@ -72,31 +72,6 @@ if (!defined('Studip\ENV')) {
define('Studip\ENV', DEFAULT_ENV);
}
// if in dev mode and webpack dev server is running, adjust assets url
if (Studip\ENV === 'development' && !in_array('ASSETS_URL', $added) && function_exists('socket_create')) {
$wds_config = json_decode(
file_get_contents("{$STUDIP_BASE_PATH}/config/webpack.dev-server.config.json")
);
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
if (@socket_connect($socket, $wds_config->host, $wds_config->port)) {
socket_close($socket);
$assets_url = sprintf(
"%s://%s:%u/%s/",
$wds_config->protocol,
$wds_config->host,
$wds_config->port,
basename(realpath(__DIR__ . '/..'))
);
$probe_headers = get_headers("{$assets_url}images/logos/studip-logo.svg");
if (strpos($probe_headers[0], '200') !== false) {
$GLOBALS['ASSETS_URL'] = $assets_url;
}
}
}
if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') {
require_once __DIR__ . '/classes/URLHelper.php';
......
This diff is collapsed.
......@@ -6,7 +6,6 @@
"scripts": {
"lint": "eslint resources/assets/javascripts resources/vue",
"css-lint": "stylelint resources/assets/stylesheets",
"wds": "webpack serve --progress --config webpack.dev-server.js",
"webpack-dev": "webpack --config webpack.dev.js --mode development",
"webpack-prod": "webpack --config webpack.prod.js --mode production",
"webpack-watch": "webpack --config webpack.dev.js --mode development --watch"
......@@ -133,7 +132,6 @@
"vuex": "^3.6.2",
"webpack": "^5.70.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.4.0",
"webpack-merge": "5.4.0",
"webpack-notifier": "^1.15.0"
},
......
const express = require('express');
const path = require('path');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.js');
const config = require("./config/webpack.dev-server.config.json");
module.exports = merge(common, {
mode: 'development',
devtool: 'inline-source-map',
target: 'web',
devServer: {
compress: true,
port: config.port,
historyApiFallback: true,
https: config.protocol === 'https',
headers: {
'Access-Control-Allow-Origin': '*'
}
}
});
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