self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-03-03 14:52:36 +02:00
Code Issues Releases Activity

Merge #2532

Browse Source 
2532: Allow JS debugging, speed-up asset-build, disable redirect-debug. r=mergify[bot] a=ghostwheel42

## What type of PR?

bug-fix

## What does this PR do?

Another bugfix to the run_dev.sh helper

Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>
This commit is contained in:
bors[bot] 2022-11-15 11:49:36 +00:00 committed by GitHub
commit 3b150ff9a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/admin/assets/Dockerfile
View File

@ -5,7 +5,6 @@ FROM node:16-alpine3.16
WORKDIR /work WORKDIR /work
COPY package.json ./ COPY package.json ./
COPY webpack.config.js ./
RUN set -euxo pipefail \ RUN set -euxo pipefail \
; npm config set update-notifier false \ ; npm config set update-notifier false \
@ -17,6 +16,7 @@ RUN set -euxo pipefail \
done done
COPY assets/ ./assets/ COPY assets/ ./assets/
COPY webpack.config.js ./
RUN set -euxo pipefail \ RUN set -euxo pipefail \
; node_modules/.bin/webpack-cli --color ; node_modules/.bin/webpack-cli --color

5
core/admin/assets/assets/app.js
View File

@ -1,8 +1,3 @@
require('./app.css');
import logo from './mailu.png';
import modules from "./*.json";
// Inspired from https://github.com/mehdibo/hibp-js/blob/master/hibp.js // Inspired from https://github.com/mehdibo/hibp-js/blob/master/hibp.js
function sha1(string) { function sha1(string) {
var buffer = new TextEncoder("utf-8").encode(string); var buffer = new TextEncoder("utf-8").encode(string);

6
core/admin/assets/assets/vendor.js
View File

@ -1,5 +1,5 @@
// AdminLTE // AdminLTE
import 'admin-lte/plugins/jquery/jquery.min.js'; window.$ = window.jQuery = require('admin-lte/plugins/jquery/jquery.min.js');
import 'admin-lte/plugins/bootstrap/js/bootstrap.bundle.min.js'; import 'admin-lte/plugins/bootstrap/js/bootstrap.bundle.min.js';
import 'admin-lte/build/scss/adminlte.scss'; import 'admin-lte/build/scss/adminlte.scss';
import 'admin-lte/build/js/AdminLTE.js'; import 'admin-lte/build/js/AdminLTE.js';
@ -18,7 +18,7 @@ import 'admin-lte/plugins/datatables/jquery.dataTables.min.js';
import 'admin-lte/plugins/datatables-bs4/js/dataTables.bootstrap4.min.js'; import 'admin-lte/plugins/datatables-bs4/js/dataTables.bootstrap4.min.js';
import 'admin-lte/plugins/datatables-responsive/js/dataTables.responsive.min.js'; import 'admin-lte/plugins/datatables-responsive/js/dataTables.responsive.min.js';
import 'admin-lte/plugins/datatables-responsive/js/responsive.bootstrap4.min.js'; import 'admin-lte/plugins/datatables-responsive/js/responsive.bootstrap4.min.js';
import modules from "./*.json";
// clipboard.js // clipboard.js
import 'clipboard/dist/clipboard.min.js'; window.ClipboardJS = require('clipboard/dist/clipboard.min.js');

2
core/admin/assets/webpack.config.js
View File

@ -9,7 +9,7 @@ module.exports = {
mode: 'production', mode: 'production',
entry: { entry: {
app: { app: {
import: './assets/app.js', import: ['./assets/app.css', './assets/mailu.png', './assets/app.js'],
dependOn: 'vendor', dependOn: 'vendor',
}, },
vendor: './assets/vendor.js', vendor: './assets/vendor.js',

1
core/admin/mailu/configuration.py
View File

@ -13,6 +13,7 @@ DEFAULT_CONFIG = {
'RATELIMIT_STORAGE_URL': '', 'RATELIMIT_STORAGE_URL': '',
'DEBUG': False, 'DEBUG': False,
'DEBUG_PROFILER': False, 'DEBUG_PROFILER': False,
'DEBUG_TB_INTERCEPT_REDIRECTS': False,
'DEBUG_ASSETS': '', 'DEBUG_ASSETS': '',
'DOMAIN_REGISTRATION': False, 'DOMAIN_REGISTRATION': False,
'TEMPLATES_AUTO_RELOAD': True, 'TEMPLATES_AUTO_RELOAD': True,

2
core/admin/run_dev.sh
View File

@ -73,7 +73,7 @@ ENV \
DEBUG="true" \ DEBUG="true" \
DEBUG_PROFILER="${DEV_PROFILER}" \ DEBUG_PROFILER="${DEV_PROFILER}" \
DEBUG_ASSETS="/app/static" \ DEBUG_ASSETS="/app/static" \
DEBUG_TB_ENABLED="true" \ DEBUG_TB_INTERCEPT_REDIRECTS=False \
\ \
IMAP_ADDRESS="127.0.0.1" \ IMAP_ADDRESS="127.0.0.1" \
POP3_ADDRESS="127.0.0.1" \ POP3_ADDRESS="127.0.0.1" \