From 3a76d69a16958933a1356f50654f1d53992ad691 Mon Sep 17 00:00:00 2001 From: Richard Moore Date: Mon, 8 Feb 2021 15:27:05 -0500 Subject: [PATCH] admin: small updates to build scripts. --- misc/admin/lib/cmds/bump-versions.js | 7 ++++++- misc/admin/lib/cmds/esm-alias.js | 1 - misc/admin/lib/cmds/lock-versions.js | 4 ++-- misc/admin/lib/cmds/serve-docs.js | 1 + misc/admin/lib/cmds/spell-check.js | 2 +- misc/admin/lib/cmds/upload-docs.js | 1 + misc/admin/src.ts/cmds/bump-versions.ts | 7 ++++++- misc/admin/src.ts/cmds/esm-alias.ts | 1 - misc/admin/src.ts/cmds/serve-docs.ts | 1 + misc/admin/src.ts/cmds/spell-check.ts | 2 +- misc/admin/src.ts/cmds/upload-docs.ts | 1 + 11 files changed, 20 insertions(+), 8 deletions(-) diff --git a/misc/admin/lib/cmds/bump-versions.js b/misc/admin/lib/cmds/bump-versions.js index 954dd223b..1928ef3d2 100644 --- a/misc/admin/lib/cmds/bump-versions.js +++ b/misc/admin/lib/cmds/bump-versions.js @@ -79,7 +79,12 @@ const utils_1 = require("../utils"); } output.forEach((line) => { console.log(line); }); }); -})().catch((error) => { +})().then((result) => { + // Something above causes this script to hang, so let's exit manually + setTimeout(() => { + process.exit(0); + }, 1000); +}, (error) => { console.log(`Error running ${process.argv[0]}: ${error.message}`); process.exit(1); }); diff --git a/misc/admin/lib/cmds/esm-alias.js b/misc/admin/lib/cmds/esm-alias.js index 812e444ec..d25cb3f7a 100644 --- a/misc/admin/lib/cmds/esm-alias.js +++ b/misc/admin/lib/cmds/esm-alias.js @@ -97,7 +97,6 @@ function alias(name) { // + transform the map JSON to reference "geturl.js" // We need to swap in the replacement and update its data const replace = replacements[filename.replace(/\.d.ts\.map$|\.js\.map$/i, ".js")]; - console.log(filename, replace); // Skip! if (replace === "") { return; diff --git a/misc/admin/lib/cmds/lock-versions.js b/misc/admin/lib/cmds/lock-versions.js index d6c0e495b..e1a57ed26 100644 --- a/misc/admin/lib/cmds/lock-versions.js +++ b/misc/admin/lib/cmds/lock-versions.js @@ -19,19 +19,19 @@ const utils_1 = require("../utils"); accum[pkg.name] = pkg.version; return accum; }, ({})); - console.log(versions); path_1.dirnames.forEach((dirname) => { // Skip ethers; it's versions are locked during update-versions if (dirname === "ethers") { return; } + console.log(dirname); const path = path_1.resolve("packages", dirname, "package.json"); const json = utils_1.loadJson(path); for (const name in (json.dependencies || {})) { const version = json.dependencies[name]; const target = (versions[name] ? ("^" + versions[name]) : version); if (version !== target) { - console.log(name, version, "=>", target); + console.log(" ", name, version, "=>", target); } json.dependencies[name] = target; } diff --git a/misc/admin/lib/cmds/serve-docs.js b/misc/admin/lib/cmds/serve-docs.js index 5b25c2f12..e89730f74 100644 --- a/misc/admin/lib/cmds/serve-docs.js +++ b/misc/admin/lib/cmds/serve-docs.js @@ -14,6 +14,7 @@ function getMime(filename) { case 'eot': return 'application/vnd.ms-fontobject'; case 'gif': return 'image/gif'; case 'html': return 'text/html'; + case 'ico': return 'image/x-icon'; case 'js': return 'application/javascript'; case 'jpg': return 'image/jpeg'; case 'jpeg': return 'image/jpeg'; diff --git a/misc/admin/lib/cmds/spell-check.js b/misc/admin/lib/cmds/spell-check.js index 09b08fb46..38982d4f0 100644 --- a/misc/admin/lib/cmds/spell-check.js +++ b/misc/admin/lib/cmds/spell-check.js @@ -74,7 +74,7 @@ apikey asc endblock startblock alchemyapi Cloudflare Etherscan INFURA IPFS MetaMask Nodesmith Trezor ledgerhq axic bitcoinjs browserify easyseed ethereumjs goerli homestead kotti kovan mainnet morden mordor rinkeby -ropsten testnet +ropsten testnet lb // Demo words args foo eth foo foobar ll localhost passwd ricmoo tx xxx yna diff --git a/misc/admin/lib/cmds/upload-docs.js b/misc/admin/lib/cmds/upload-docs.js index b96e4600c..ffee97ffd 100644 --- a/misc/admin/lib/cmds/upload-docs.js +++ b/misc/admin/lib/cmds/upload-docs.js @@ -65,6 +65,7 @@ function getMime(filename) { case 'eot': return 'application/vnd.ms-fontobject'; case 'gif': return 'image/gif'; case 'html': return 'text/html'; + case 'ico': return 'image/x-icon'; case 'js': return 'application/javascript'; case 'jpg': return 'image/jpeg'; case 'jpeg': return 'image/jpeg'; diff --git a/misc/admin/src.ts/cmds/bump-versions.ts b/misc/admin/src.ts/cmds/bump-versions.ts index f8e49f2cc..617be8270 100644 --- a/misc/admin/src.ts/cmds/bump-versions.ts +++ b/misc/admin/src.ts/cmds/bump-versions.ts @@ -75,7 +75,12 @@ import { loadJson, repeat, saveJson } from "../utils"; output.forEach((line) => { console.log(line); }); -})().catch((error) => { +})().then((result) => { + // Something above causes this script to hang, so let's exit manually + setTimeout(() => { + process.exit(0); + }, 1000); +}, (error) => { console.log(`Error running ${ process.argv[0] }: ${ error.message }`); process.exit(1); }); diff --git a/misc/admin/src.ts/cmds/esm-alias.ts b/misc/admin/src.ts/cmds/esm-alias.ts index 1b5c0dbb7..d2dbea230 100644 --- a/misc/admin/src.ts/cmds/esm-alias.ts +++ b/misc/admin/src.ts/cmds/esm-alias.ts @@ -88,7 +88,6 @@ async function alias(name: string): Promise { // + transform the map JSON to reference "geturl.js" // We need to swap in the replacement and update its data const replace = replacements[filename.replace(/\.d.ts\.map$|\.js\.map$/i, ".js")]; - console.log(filename, replace); // Skip! if (replace === "") { return; } diff --git a/misc/admin/src.ts/cmds/serve-docs.ts b/misc/admin/src.ts/cmds/serve-docs.ts index 87167879a..0e3644269 100644 --- a/misc/admin/src.ts/cmds/serve-docs.ts +++ b/misc/admin/src.ts/cmds/serve-docs.ts @@ -11,6 +11,7 @@ export function getMime(filename: string): string { case 'eot': return 'application/vnd.ms-fontobject'; case 'gif': return 'image/gif'; case 'html': return 'text/html'; + case 'ico': return 'image/x-icon'; case 'js': return 'application/javascript'; case 'jpg': return 'image/jpeg'; case 'jpeg': return 'image/jpeg'; diff --git a/misc/admin/src.ts/cmds/spell-check.ts b/misc/admin/src.ts/cmds/spell-check.ts index d1654084d..90d7c537e 100644 --- a/misc/admin/src.ts/cmds/spell-check.ts +++ b/misc/admin/src.ts/cmds/spell-check.ts @@ -65,7 +65,7 @@ apikey asc endblock startblock alchemyapi Cloudflare Etherscan INFURA IPFS MetaMask Nodesmith Trezor ledgerhq axic bitcoinjs browserify easyseed ethereumjs goerli homestead kotti kovan mainnet morden mordor rinkeby -ropsten testnet +ropsten testnet lb // Demo words args foo eth foo foobar ll localhost passwd ricmoo tx xxx yna diff --git a/misc/admin/src.ts/cmds/upload-docs.ts b/misc/admin/src.ts/cmds/upload-docs.ts index 48ff91f02..9cf69e9a2 100644 --- a/misc/admin/src.ts/cmds/upload-docs.ts +++ b/misc/admin/src.ts/cmds/upload-docs.ts @@ -56,6 +56,7 @@ function getMime(filename: string): string { case 'eot': return 'application/vnd.ms-fontobject'; case 'gif': return 'image/gif'; case 'html': return 'text/html'; + case 'ico': return 'image/x-icon'; case 'js': return 'application/javascript'; case 'jpg': return 'image/jpeg'; case 'jpeg': return 'image/jpeg';