vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: remove confusing indirections from esbuild path resolution

Browse source
This commit is contained in:
David Arnold 2024-01-14 12:23:34 +01:00
parent 32e44f77a9
commit 3542c22365
No known key found for this signature in database
GPG key ID: AB15A6AF1101390D
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
esbuild/esbuild.js
View file

@ -19,7 +19,6 @@ const {
assets_path,
apps_path,
sites_path,
get_app_path,
get_public_path,
log,
log_warn,
@ -82,11 +81,9 @@ const RUN_BUILD_COMMAND = !WATCH_MODE && Boolean(argv["run-build-command"]);
const TOTAL_BUILD_TIME = `${chalk.black.bgGreen(" DONE ")} Total Build Time`;
const NODE_PATHS = [].concat(
// node_modules of apps directly importable
app_list
.map((app) => path.resolve(get_app_path(app), "../node_modules"))
.filter(fs.existsSync),
app_list.map((app) => path.resolve(apps_path, app, "node_modules")).filter(fs.existsSync),
// import js file of any app if you provide the full path
app_list.map((app) => path.resolve(get_app_path(app), "..")).filter(fs.existsSync)
app_list.map((app) => path.resolve(apps_path, app)).filter(fs.existsSync)
);
execute().catch((e) => {
@ -441,7 +438,7 @@ function run_build_command_for_apps(apps) {
for (let app of apps) {
if (app === "frappe") continue;
let root_app_path = path.resolve(get_app_path(app), "..");
let root_app_path = path.resolve(apps_path, app);
let package_json = path.resolve(root_app_path, "package.json");
if (fs.existsSync(package_json)) {
let { scripts } = require(package_json);

4
esbuild/sass_options.js
View file

@ -1,7 +1,7 @@
let path = require("path");
let { get_app_path, app_list } = require("./utils");
let { apps_path, app_list } = require("./utils");
let app_paths = app_list.map(get_app_path).map((app_path) => path.resolve(app_path, ".."));
let app_paths = app_list.map((app) => path.resolve(apps_path, app));
let node_modules_path = app_paths.map((app_path) => path.resolve(app_path, "node_modules"));
module.exports = {

11
esbuild/utils.js
View file

@ -9,16 +9,12 @@ const apps_path = path.resolve(bench_path, "apps");
const assets_path = path.resolve(sites_path, "assets");
const app_list = get_apps_list();
const app_paths = app_list.reduce((out, app) => {
out[app] = path.resolve(apps_path, app, app);
return out;
}, {});
const public_paths = app_list.reduce((out, app) => {
out[app] = path.resolve(app_paths[app], "public");
out[app] = path.resolve(apps_path, app, app, "public");
return out;
}, {});
const public_js_paths = app_list.reduce((out, app) => {
out[app] = path.resolve(app_paths[app], "public/js");
out[app] = path.resolve(apps_path, app, app, "public/js");
return out;
}, {});
@ -66,8 +62,6 @@ function run_serially(tasks) {
return result;
}
const get_app_path = (app) => app_paths[app];
function get_apps_list() {
return fs
.readFileSync(path.resolve(sites_path, "apps.txt"), {
@ -135,7 +129,6 @@ module.exports = {
get_public_path,
get_build_json_path,
get_build_json,
get_app_path,
delete_file,
run_serially,
get_cli_arg,