cleaner config for various frontend bundles

This commit is contained in:
f0x 2022-06-08 21:51:32 +02:00
commit 686ad409d3
3 changed files with 109 additions and 55 deletions

View file

@ -0,0 +1,19 @@
/*
GoToSocial
Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
"use strict";

View file

@ -33,6 +33,16 @@ function out(name = "") {
return path.join(__dirname, "../assets/dist/", name);
}
module.exports = {out};
const splitCSS = require("./lib/split-css.js");
const bundles = {
"./frontend/index.js": "frontend.js",
"./panels/admin/index.js": "admin-panel.js",
"./panels/user/index.js": "user-panel.js",
};
const postcssPlugins = [
"postcss-import",
"postcss-strip-inline-comments",
@ -42,53 +52,6 @@ const postcssPlugins = [
"postcss-color-mod-function"
].map((plugin) => require(plugin)());
const fromRegex = /\/\* from (.+?) \*\//;
function splitCSS() {
let chunks = [];
return new Writable({
write: function(chunk, encoding, next) {
chunks.push(chunk);
next();
},
final: function() {
let stream = chunks.join("");
let input;
let content = [];
function write() {
if (content.length != 0) {
if (input == undefined) {
throw new Error("Got CSS content without filename, can't output: ", content);
} else {
console.log("writing to", out(input));
fs.writeFileSync(out(input), content.join("\n"));
}
content = [];
}
}
stream.split("\n").forEach((line) => {
if (line.startsWith("/* from")) {
let found = fromRegex.exec(line);
if (found != null) {
write();
let parts = path.parse(found[1]);
if (parts.dir == "css") {
input = parts.base;
} else {
input = found[1].replace(/\//g, "-");
}
}
} else {
content.push(line);
}
});
write();
}
});
}
const browserifyConfig = {
transform: babelify.configure({ presets: [require.resolve("@babel/preset-env"), require.resolve("@babel/preset-react")] }),
plugin: [
@ -98,14 +61,15 @@ const browserifyConfig = {
mode: 'global'
}],
[require("css-extract"), { out: splitCSS }],
[require("factor-bundle"), { outputs: [out("/admin-panel.js"), out("user-panel.js")] }]
[require("factor-bundle"), {
outputs: Object.values(bundles).map((file) => {
return out(file);
})
}]
]
};
const entryFiles = [
'./panels/admin/index.js',
'./panels/user/index.js',
];
const entryFiles = Object.keys(bundles);
fs.readdirSync(path.join(__dirname, "./css")).forEach((file) => {
entryFiles.push(path.join(__dirname, "./css", file));
@ -125,7 +89,6 @@ const server = budoExpress({
if (server instanceof EventEmitter) {
server.on("update", (contents) => {
console.log("writing bundle.js to dist/");
fs.writeFileSync(out("bundle.js"), contents);
});
fs.writeFileSync(out("bundle.js"), contents);
});
}

View file

@ -0,0 +1,72 @@
/*
GoToSocial
Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
"use strict";
const fs = require("fs");
const path = require("path");
const {Writable} = require("stream");
const {out} = require("../index.js");
const fromRegex = /\/\* from (.+?) \*\//;
module.exports = function splitCSS() {
let chunks = [];
return new Writable({
write: function(chunk, encoding, next) {
chunks.push(chunk);
next();
},
final: function() {
let stream = chunks.join("");
let input;
let content = [];
function write() {
if (content.length != 0) {
if (input == undefined) {
throw new Error("Got CSS content without filename, can't output: ", content);
} else {
console.log("writing to", out(input));
fs.writeFileSync(out(input), content.join("\n"));
}
content = [];
}
}
stream.split("\n").forEach((line) => {
if (line.startsWith("/* from")) {
let found = fromRegex.exec(line);
if (found != null) {
write();
let parts = path.parse(found[1]);
if (parts.dir == "css") {
input = parts.base;
} else {
input = found[1].replace(/\//g, "-");
}
}
} else {
content.push(line);
}
});
write();
}
});
}