Fewer merge conflicts: actions by area, one city per line, sorted dictionaries
- ACT is split by area into game/90-actions/*.js (const ACT in the first file, Object.assign in the rest) - CITY_LL, CITY_NUDGE and LANDS_LL have one entry per line; the id-keyed ones are sorted - site/i18n/*.js are sorted, one entry per line; i18n-check enforces it and --fix (npm run i18n:fix) restores it; scripts/i18n-add.js adds, removes and renames entries in place - scripts/legacy/port-branch.js moves a branch's site/index.html edits into src/ during a merge with main - perf workflow and PR template build the base page with scripts/lib/page.js
This commit is contained in:
parent
67a40942b4
commit
c64b139a86
27 changed files with 9582 additions and 8971 deletions
|
|
@ -74,7 +74,7 @@ function locate(map, line) {
|
|||
|
||||
// The page at a git ref: that commit's src/ through its own assembler, or site/index.html before the split.
|
||||
function assembleRef(ref, cwd = ROOT) {
|
||||
const git = (...a) => execFileSync('git', a, { cwd, encoding: 'utf8', maxBuffer: 1 << 28 });
|
||||
const git = (...a) => execFileSync('git', a, { cwd, encoding: 'utf8', maxBuffer: 1 << 28, stdio: ['ignore', 'pipe', 'pipe'] });
|
||||
const has = (p) => { try { git('cat-file', '-e', `${ref}:${p}`); return true; } catch { return false; } };
|
||||
if (!has('src/index.html')) return git('show', `${ref}:site/index.html`);
|
||||
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'tubes-ref-'));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue