AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'rel-4.4' of github.com:GridSpace/grid-apps into rel-4.4

Browse source
This commit is contained in:
Stewart Allen 2025-11-13 13:57:44 -05:00
commit 34bc757ffa
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app.js
View file

@ -31,6 +31,7 @@ let oversion;
let dversion; let dversion;
let lastmod; let lastmod;
let logger; let logger;
let single;
let debug; let debug;
let http; let http;
let util; let util;
@ -66,6 +67,7 @@ function init(mod) {
logger = mod.log; logger = mod.log;
pre = ENV.pre || mod.meta.pre; pre = ENV.pre || mod.meta.pre;
debug = ENV.debug || mod.meta.debug; debug = ENV.debug || mod.meta.debug;
single = ENV.single;
oversion = ENV.over || mod.meta.over; oversion = ENV.over || mod.meta.over;
crossOrigin = ENV.xorigin || mod.meta.xorigin || false; crossOrigin = ENV.xorigin || mod.meta.xorigin || false;
serviceWorker = (ENV.service || mod.meta.service) !== false; serviceWorker = (ENV.service || mod.meta.service) !== false;
@ -74,7 +76,7 @@ function init(mod) {
dir = mod.dir; dir = mod.dir;
log = mod.log; log = mod.log;
if (ENV.single) console.log({ cwd: process.cwd(), env: ENV }); if (single) console.log({ cwd: process.cwd(), env: ENV });
dversion = debug ? `_${version}` : version; dversion = debug ? `_${version}` : version;
forceUseCache = ENV.cache ? true : false; forceUseCache = ENV.cache ? true : false;
@ -151,7 +153,7 @@ function init(mod) {
function load_modules(root, force) { function load_modules(root, force) {
lastmod(`${dir}/${root}`) && fs.readdirSync(`${dir}/${root}`).forEach(mdir => { lastmod(`${dir}/${root}`) && fs.readdirSync(`${dir}/${root}`).forEach(mdir => {
const modpath = `${root}/${mdir}`; const modpath = `${root}/${mdir}`;
if (dir.charAt(0) === '.' && !ENV.single) return; if (dir.charAt(0) === '.' && !single) return;
const stats = fs.lstatSync(`${mod.dir}/${modpath}`); const stats = fs.lstatSync(`${mod.dir}/${modpath}`);
if (!(stats.isDirectory() || stats.isSymbolicLink())) return; if (!(stats.isDirectory() || stats.isSymbolicLink())) return;
if (util.isfile(PATH.join(mod.dir,modpath,".disable"))) return; if (util.isfile(PATH.join(mod.dir,modpath,".disable"))) return;
@ -190,11 +192,11 @@ function init(mod) {
} }
// create alt artifacts with module extensions // create alt artifacts with module extensions
logger.log('create alt artifacts'); logger.log('creating artifacts', Object.keys(append));
for (let [ key, val ] of Object.entries(append)) { for (let [ key, val ] of Object.entries(append)) {
let src = `src/main/${key}.js`; let src = `src/main/${key}.js`;
if (!fs.existsSync(src)) { if (!fs.existsSync(src)) {
logger.log('missing:', src); logger.log('missing', src);
continue; continue;
} }
fs.mkdirSync(`alt/main`, { recursive: true }); fs.mkdirSync(`alt/main`, { recursive: true });
@ -203,7 +205,7 @@ function init(mod) {
src= `src/pack/${key}-main.js`; src= `src/pack/${key}-main.js`;
if (!fs.existsSync(src)) { if (!fs.existsSync(src)) {
logger.log('missing:', src); logger.log('missing', src);
continue; continue;
} }
fs.mkdirSync(`alt/pack`, { recursive: true }); fs.mkdirSync(`alt/pack`, { recursive: true });
@ -307,7 +309,7 @@ function initModule(mod, file, dir) {
const path = mod.dir + '/' + dir + '/' + file; const path = mod.dir + '/' + dir + '/' + file;
try { try {
const body = fs.readFileSync(path); const body = fs.readFileSync(path);
logger.log({ inject: code, file, opt }); if (debug && !single) logger.log({ inject: code, file, opt });
if (opt.first) { if (opt.first) {
append[code] = body.toString() + '\n' + append[code]; append[code] = body.toString() + '\n' + append[code];
} else { } else {

2
package.json
View file

@ -36,7 +36,7 @@
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^6.1.1", "@fortawesome/fontawesome-free": "^6.1.1",
"@gridspace/app-server": "github:gridspace/app-server#v0.0.20", "@gridspace/app-server": "^0.0.20",
"@gridspace/basic-ftp": "github:gridspace/basic-ftp#v5.0.5-gridspace", "@gridspace/basic-ftp": "github:gridspace/basic-ftp#v5.0.5-gridspace",
"@gridspace/net-level-client": "^0.2.3", "@gridspace/net-level-client": "^0.2.3",
"@gridspace/raster-path": "^1.0.6", "@gridspace/raster-path": "^1.0.6",