Merge branch '2024.11'

Author: gitlabci

.gitignore

@@ -19,6 +19,8 @@ tine20/*/*/*/*/*FAT*
 tine20/*/*/*FAT*
 tine20/*/js/*-lang-*
 tine20/Tinebase/js/Locale/build/*.js
+tine20/Tinebase/js/build/*
+tine20/Tinebase/css/build/*
 scripts/packaging/tine20build/
 .vagrant
 scripts/vagrant/tmp

tine20/Sales/views/EDocumentViewError.html.twig

@@ -1,4 +1,4 @@
-{% apply inline_css(source("Tinebase/js/node_modules/bootstrap/dist/css/bootstrap.min.css")) %}
+{% apply inline_css(source("Tinebase/css/build/bootstrap/bootstrap.min.css")) %}
 {#    <div class="jumbotron">#}
 {#        <h1 class="display-4">{{ _("Error") }}</h1>#}
 {#        <p class="lead">{{ _("Can't create eDocument (XRechnungs) view. Possible reasons:") }}</p>#}

tine20/Tinebase/css/build/.gitkeep

@@ -0,0 +1 @@
+see webpack copy plugin

tine20/Tinebase/js/build/.gitkeep

@@ -0,0 +1 @@
+see webpack copy plugin

tine20/Tinebase/js/npm-shrinkwrap.json

@@ -91,6 +91,7 @@
     "brotli-webpack-plugin": "^1.1.0",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
+    "copy-webpack-plugin": "^13.0.0",
     "css-loader": "^6.7.3",
     "eslint": "^8.31.0",
     "eslint-config-standard": "^17.0.0",

tine20/Tinebase/js/package.json

@@ -16,6 +16,7 @@ var assetsPluginInstance = new AssetsPlugin({
 var {VueLoaderPlugin} = require('vue-loader');
 var ChunkNamePlugin = require('./webpack.ChunkNamePlugin');
 var ESLintPlugin = require('eslint-webpack-plugin');
+var CopyPlugin = require("copy-webpack-plugin");
 
 var eslintPluginInstance = new ESLintPlugin({
     formatter: require('eslint-friendly-formatter'),
@@ -50,6 +51,12 @@ var definePlugin = new webpack.DefinePlugin({
     __VUE_PROD_DEVTOOLS__: true
 });
 
+var copyPlugin = new CopyPlugin({
+    patterns: [
+        {from: "node_modules/bootstrap/dist/css", to: "Tinebase/css/build/bootstrap/"},
+    ]
+});
+
 var baseDir = path.resolve(__dirname, '../../'),
     entryPoints = {};
 
@@ -106,6 +113,7 @@ module.exports = {
     },
     plugins: [
         definePlugin,
+        copyPlugin,
         assetsPluginInstance,
         new VueLoaderPlugin(),
         new ChunkNamePlugin(),

tine20/Tinebase/js/webpack.common.js

@@ -33,6 +33,9 @@ module.exports = merge(common, {
         client: {
             overlay: true,
         },
+        devMiddleware: {
+            writeToDisk: (filePath) => /\/(js|css)\/build\//.test(filePath),
+        },
         // onBeforeSetupMiddleware: function(app, server) {
         //     app.use(function(req, res, next) {
         //         // check for langfile chunk requests

tine20/Tinebase/js/webpack.dev.js

@@ -21,7 +21,8 @@ module.exports = merge(common, {
         }),
         new UnminifiedWebpackPlugin({
             postfix : 'debug',
-            replace: [[/(Tine\.clientVersion\.buildType\s*=\s*)'RELEASE'/, "$1'DEBUG'"]]
+            replace: [[/(Tine\.clientVersion\.buildType\s*=\s*)'RELEASE'/, "$1'DEBUG'"]],
+            exclude: /Tinebase\/css\/build\/.*/
         }),
         new BrotliPlugin({})
     ],