-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from Munter/feature/async-main-wrap
Switch to @gustavnikolaj/async-main-wrap
- Loading branch information
Showing
5 changed files
with
402 additions
and
386 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,212 +1,6 @@ | ||
| #!/usr/bin/env node | ||
|
|
||
| const yargs = require('yargs'); | ||
| const subfont = require('./subfont'); | ||
| const prettyBytes = require('pretty-bytes'); | ||
| const groupBy = require('lodash.groupby'); | ||
| const { | ||
| root, | ||
| canonicalroot, | ||
| output, | ||
| debug, | ||
| 'inline-fonts': inlineFonts, | ||
| 'inline-css': inlineCss, | ||
| 'font-display': fontDisplay, | ||
| 'in-place': inPlace, | ||
| _: nonOptionArgs, | ||
| recursive | ||
| } = yargs | ||
| .usage( | ||
| 'Create optimal font subsets from your actual font usage.\n$0 [options] <htmlFile(s) | url(s)>' | ||
| ) | ||
| .options('root', { | ||
| describe: | ||
| 'Path to your web root (will be deduced from your input files if not specified)', | ||
| type: 'string', | ||
| demand: false | ||
| }) | ||
| .options('canonicalroot', { | ||
| describe: | ||
| 'URI root where the site will be deployed. Must be either an absolute or a protocol-relative url.', | ||
| type: 'string', | ||
| demand: false | ||
| }) | ||
| .options('output', { | ||
| alias: 'o', | ||
| describe: 'Directory where results should be written to', | ||
| type: 'string', | ||
| demand: false | ||
| }) | ||
| .options('in-place', { | ||
| alias: 'i', | ||
| describe: 'Modify HTML-files in-place. Only use on build artifacts', | ||
| type: 'boolean', | ||
| default: false | ||
| }) | ||
| .options('inline-fonts', { | ||
| describe: 'Inline fonts as data-URIs inside the @font-face declaration', | ||
| type: 'boolean', | ||
| default: false | ||
| }) | ||
| .options('inline-css', { | ||
| describe: 'Inline CSS that declares the @font-face for the subset fonts', | ||
| type: 'boolean', | ||
| default: false | ||
| }) | ||
| .options('font-display', { | ||
| describe: | ||
| 'Injects a font-display value into the @font-face CSS. Valid values: auto, block, swap, fallback, optional', | ||
| type: 'string', | ||
| default: 'swap', | ||
| choices: ['auto', 'block', 'swap', 'fallback', 'optional'] | ||
| }) | ||
| .options('recursive', { | ||
| alias: 'r', | ||
| describe: | ||
| 'Crawl all HTML-pages linked with relative and root relative links. This stays inside your domain', | ||
| type: 'boolean', | ||
| default: true | ||
| }) | ||
| .options('no-recursive', { | ||
| describe: 'Do not crawl recursively. Opposite of --recursive option.', | ||
| type: 'boolean', | ||
| default: false | ||
| }) | ||
| .options('debug', { | ||
| alias: 'd', | ||
| describe: 'Verbose insights into font glyph detection', | ||
| type: 'boolean', | ||
| default: false | ||
| }) | ||
| .wrap(72).argv; | ||
|
|
||
| const urlTools = require('urltools'); | ||
| let rootUrl = root && urlTools.urlOrFsPathToUrl(root, true); | ||
| const outRoot = output && urlTools.urlOrFsPathToUrl(output, true); | ||
| let inputUrls; | ||
|
|
||
| if (nonOptionArgs.length > 0) { | ||
| inputUrls = nonOptionArgs.map(urlOrFsPath => | ||
| urlTools.urlOrFsPathToUrl(String(urlOrFsPath), false) | ||
| ); | ||
| if (!rootUrl) { | ||
| rootUrl = urlTools.findCommonUrlPrefix(inputUrls); | ||
|
|
||
| if (!rootUrl.startsWith('file:')) { | ||
| rootUrl = urlTools.ensureTrailingSlash(rootUrl); | ||
| } | ||
|
|
||
| if (rootUrl) { | ||
| console.error('Guessing --root from input files: ' + rootUrl); | ||
| } | ||
| } | ||
| } else if (rootUrl && rootUrl.startsWith('file:')) { | ||
| inputUrls = [rootUrl + '**/*.html']; | ||
| console.error('No input files specified, defaulting to ' + inputUrls[0]); | ||
| } else { | ||
| console.error( | ||
| "No input files and no --root specified (or it isn't file:), cannot proceed.\n" | ||
| ); | ||
| yargs.showHelp(); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| if (!inputUrls[0].startsWith('file:') && !outRoot) { | ||
| console.error('--output has to be specified when using non-file input urls'); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| if (!inPlace && !outRoot) { | ||
| console.error('Either --output or --in-place has to be specified'); | ||
| process.exit(1); | ||
| } | ||
|
|
||
| (async () => { | ||
| try { | ||
| const [assetGraph, fontInfo, htmlJsCssSizeDelta] = await subfont({ | ||
| rootUrl, | ||
| canonicalRootUrl: canonicalroot, | ||
| inputUrls, | ||
| inlineSubsets: inlineFonts, | ||
| inlineCss, | ||
| fontDisplay, | ||
| recursive | ||
| }); | ||
|
|
||
| await assetGraph.writeAssetsToDisc( | ||
| { | ||
| isLoaded: true, | ||
| url: url => url.startsWith(assetGraph.root) | ||
| }, | ||
| outRoot, | ||
| assetGraph.root | ||
| ); | ||
|
|
||
| if (debug) { | ||
| console.log(require('util').inspect(fontInfo, false, 99)); | ||
| } | ||
|
|
||
| let totalSavings = -htmlJsCssSizeDelta; | ||
| for (const { htmlAsset, fontUsages } of fontInfo) { | ||
| let sumSmallestSubsetSize = 0; | ||
| let sumSmallestOriginalSize = 0; | ||
| let maxUsedCodePoints = 0; | ||
| let maxOriginalCodePoints = 0; | ||
| for (const fontUsage of fontUsages) { | ||
| sumSmallestSubsetSize += fontUsage.smallestSubsetSize; | ||
| sumSmallestOriginalSize += fontUsage.smallestOriginalSize; | ||
| maxUsedCodePoints = Math.max( | ||
| fontUsage.codepoints.used.length, | ||
| maxUsedCodePoints | ||
| ); | ||
| maxOriginalCodePoints = Math.max( | ||
| fontUsage.codepoints.original.length, | ||
| maxOriginalCodePoints | ||
| ); | ||
| } | ||
| const fontUsagesByFontFamily = groupBy( | ||
| fontUsages, | ||
| fontUsage => fontUsage.props['font-family'] | ||
| ); | ||
| const numFonts = Object.keys(fontUsagesByFontFamily).length; | ||
| console.log( | ||
| `${htmlAsset}: ${numFonts} font${numFonts === 1 ? '' : 's'} (${ | ||
| fontUsages.length | ||
| } variant${fontUsages.length === 1 ? '' : 's'}) in use, ${prettyBytes( | ||
| sumSmallestOriginalSize | ||
| )} total. Created subsets: ${prettyBytes(sumSmallestSubsetSize)} total` | ||
| ); | ||
| for (const fontFamily of Object.keys(fontUsagesByFontFamily).sort()) { | ||
| console.log(` ${fontFamily}:`); | ||
| for (const fontUsage of fontUsagesByFontFamily[fontFamily]) { | ||
| const variantShortName = `${fontUsage.props['font-weight']}${ | ||
| fontUsage.props['font-style'] === 'italic' ? 'i' : ' ' | ||
| }`; | ||
| console.log( | ||
| ` ${variantShortName}: ${String( | ||
| fontUsage.codepoints.used.length | ||
| ).padStart(String(maxUsedCodePoints).length)}/${String( | ||
| fontUsage.codepoints.original.length | ||
| ).padStart( | ||
| String(maxOriginalCodePoints).length | ||
| )} codepoints used, ${prettyBytes( | ||
| fontUsage.smallestOriginalSize | ||
| )} (${fontUsage.smallestOriginalFormat}) => ${prettyBytes( | ||
| fontUsage.smallestSubsetSize | ||
| )} (${fontUsage.smallestSubsetFormat})` | ||
| ); | ||
| totalSavings += | ||
| fontUsage.smallestOriginalSize - fontUsage.smallestSubsetSize; | ||
| } | ||
| } | ||
| } | ||
| console.log( | ||
| `HTML/JS/CSS size increase: ${prettyBytes(htmlJsCssSizeDelta)}` | ||
| ); | ||
| console.log(`Total savings: ${prettyBytes(totalSavings)}`); | ||
| console.log('Output written to', outRoot || assetGraph.root); | ||
| } catch (err) { | ||
| console.log(err.stack); | ||
| process.exit(1); | ||
| } | ||
| })(); | ||
| require('@gustavnikolaj/async-main-wrap')(require('./main'))( | ||
| process.argv.slice(2), | ||
| console | ||
| ); |
Oops, something went wrong.