Skip to content

Commit

Permalink
[chore] Bundler restructure (#880)
Browse files Browse the repository at this point in the history
* re-structure bundler, settings panel files

* add more info logging

* tidy up CSS syntax errors

* split into lib/ files

* livereloading server

* fix factor function for production builds

* remove testing console.log

* default to production env, saves 300kb bundle size
  • Loading branch information
f0x52 committed Oct 3, 2022
1 parent 56f53a2 commit 5249294
Show file tree
Hide file tree
Showing 40 changed files with 504 additions and 435 deletions.
4 changes: 2 additions & 2 deletions internal/web/settings-panel.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ func (m *Module) SettingsPanelHandler(c *gin.Context) {
assetsPathPrefix + "/dist/base.css",
assetsPathPrefix + "/dist/profile.css",
assetsPathPrefix + "/dist/status.css",
assetsPathPrefix + "/dist/settings-panel-style.css",
assetsPathPrefix + "/dist/settings-style.css",
},
"javascript": []string{
assetsPathPrefix + "/dist/bundle.js",
assetsPathPrefix + "/dist/react-bundle.js",
assetsPathPrefix + "/dist/settings.js",
},
})
Expand Down
2 changes: 2 additions & 0 deletions web/source/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
> 0.25%
not dead
73 changes: 0 additions & 73 deletions web/source/dev-server.js

This file was deleted.

134 changes: 34 additions & 100 deletions web/source/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,112 +19,46 @@
"use strict";

/*
Bundle the frontend panels for admin and user settings
Bundle the PostCSS stylesheets and javascript bundles for general frontend and settings panel
*/

const path = require('path');
// Forked budo-express supports EventEmitter, to write bundle.js to disk in development
const budoExpress = require('@f0x52/budo-express');
const babelify = require('babelify');
const fs = require("fs");
const EventEmitter = require('events');
const fsSync = require("fs");
const chalk = require("chalk");

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",
"./settings-panel/index.js": "settings.js",
// "./panels/admin/index.js": "admin-panel.js",
// "./panels/user/index.js": "user-panel.js",
};

const postcssPlugins = [
"postcss-import",
"postcss-nested",
"autoprefixer",
"postcss-custom-prop-vars",
"postcss-color-mod-function"
].map((plugin) => require(plugin)());
const gtsBundler = require("./lib/bundler");

let uglifyifyInProduction;

if (process.env.NODE_ENV != "development") {
console.log("uglifyify'ing production bundles");
uglifyifyInProduction = [
require("uglifyify"), {
global: true,
exts: ".js"
}
];
const devMode = process.env.NODE_ENV == "development";
if (devMode) {
console.log(chalk.yellow("GoToSocial web asset bundler, running in development mode"));
} else {
console.log(chalk.yellow("GoToSocial web asset bundler, creating production build"));
process.env.NODE_ENV = "production";
}

const browserifyConfig = {
transform: [
[
babelify.configure({
presets: [
[
require.resolve("@babel/preset-env"),
{
modules: "cjs"
}
],
require.resolve("@babel/preset-react")
]
}),
{
global: true,
exclude: /node_modules\/(?!photoswipe-dynamic-caption-plugin)/,
}
],
uglifyifyInProduction
],
plugin: [
[require("icssify"), {
parser: require("postcss-scss"),
before: postcssPlugins,
mode: 'global'
}],
[require("css-extract"), { out: splitCSS }],
[require("factor-bundle"), {
outputs: Object.values(bundles).map((file) => {
return out(file);
})
}]
],
extensions: [".js", ".jsx", ".css"]
};

const entryFiles = Object.keys(bundles);

fs.readdirSync(path.join(__dirname, "./css")).forEach((file) => {
entryFiles.push(path.join(__dirname, "./css", file));
});

if (!fs.existsSync(out())){
fs.mkdirSync(out(), { recursive: true });
}

const server = budoExpress({
port: 8081,
host: "localhost",
entryFiles: entryFiles,
basePath: __dirname,
bundlePath: "bundle.js",
staticPath: out(),
expressApp: require("./dev-server.js"),
browserify: browserifyConfig,
livereloadPattern: "**/*.{html,js,svg}"
let cssFiles = fsSync.readdirSync(path.join(__dirname, "./css")).map((file) => {
return path.join(__dirname, "./css", file);
});

if (server instanceof EventEmitter) {
server.on("update", (contents) => {
fs.writeFileSync(out("bundle.js"), contents);
});
}
const bundles = [
{
outputFile: "frontend.js",
entryFiles: ["./frontend/index.js"],
babelOptions: {
global: true,
exclude: /node_modules\/(?!photoswipe-dynamic-caption-plugin)/,
}
},
{
outputFile: "react-bundle.js",
factors: {
"./settings/index.js": "settings.js",
}
},
{
outputFile: "_delete", // not needed, we only care for the css that's already split-out by css-extract
entryFiles: cssFiles,
}
];

return gtsBundler(devMode, bundles);

0 comments on commit 5249294

Please sign in to comment.