From ef8acc5d50fa3c23bd7c9d4bb720b7ff78581981 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Sat, 19 Aug 2023 14:13:31 -0300 Subject: clean up imports & miscellaneous metastructures across codebase --- src/upd8.js | 93 +++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 37 deletions(-) (limited to 'src/upd8.js') diff --git a/src/upd8.js b/src/upd8.js index f5781272..bfdd1c2a 100755 --- a/src/upd8.js +++ b/src/upd8.js @@ -31,25 +31,37 @@ // Oh yeah, like. Just run this through some relatively recent version of // node.js and you'll 8e fine. ...Within the project root. O8viously. -import {execSync} from 'child_process'; -import * as path from 'path'; -import {fileURLToPath} from 'url'; +import {execSync} from 'node:child_process'; +import * as path from 'node:path'; +import {fileURLToPath} from 'node:url'; + import wrap from 'word-wrap'; +import {processLanguageFile} from '#language'; +import {isMain, traverse} from '#node-utils'; +import bootRepl from '#repl'; +import {empty, showAggregate, withEntries} from '#sugar'; +import {CacheableObject} from '#things'; +import {generateURLs, urlSpec} from '#urls'; +import {sortByName} from '#wiki-data'; + +import { + color, + decorateTime, + logWarn, + logInfo, + logError, + parseOptions, + progressCallAll, + progressPromiseAll, +} from '#cli'; + import genThumbs, { clearThumbs, defaultMagickThreads, isThumb, verifyImagePaths, -} from './gen-thumbs.js'; - -import bootRepl from './repl.js'; -import {listingSpec, listingTargetSpec} from './listing-spec.js'; -import urlSpec from './url-spec.js'; - -import {processLanguageFile} from './data/language.js'; - -import CacheableObject from './data/things/cacheable-object.js'; +} from '#thumbs'; import { filterDuplicateDirectories, @@ -58,28 +70,11 @@ import { loadAndProcessDataDocuments, sortWikiDataArrays, WIKI_INFO_FILE, -} from './data/yaml.js'; - -import {isMain, traverse} from './util/node-utils.js'; -import {empty, showAggregate, withEntries} from './util/sugar.js'; -import {generateURLs} from './util/urls.js'; -import {sortByName} from './util/wiki-data.js'; - -import {generateDevelopersCommentHTML} from './write/page-template.js'; -import * as buildModes from './write/build-modes/index.js'; - -import { - color, - decorateTime, - logWarn, - logInfo, - logError, - parseOptions, - progressCallAll, - progressPromiseAll, -} from './util/cli.js'; +} from '#yaml'; import FileSizePreloader from './file-size-preloader.js'; +import {listingSpec, listingTargetSpec} from './listing-spec.js'; +import * as buildModes from './write/build-modes/index.js'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); @@ -725,11 +720,35 @@ async function main() { if (noBuild) return; - const developersComment = generateDevelopersCommentHTML({ - buildTime: BUILD_TIME, - commit: COMMIT, - wikiData, - }); + const developersComment = + ``; return selectedBuildMode.go({ cliOptions, -- cgit 1.3.0-6-gf8a5