Skip to content

Commit

Permalink
(refactor): split commands into separate directories
Browse files Browse the repository at this point in the history
- should be easier to read & understand the codebase as there's a
  better separation of concerns now
  - don't need to look at / concern oneself with build code when editing
    lint code, for instance
  • Loading branch information
agilgur5 committed Dec 31, 2019
1 parent 01cd32e commit 890eabf
Show file tree
Hide file tree
Showing 29 changed files with 734 additions and 666 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { RollupOptions, OutputOptions } from 'rollup';
import * as fs from 'fs-extra';
import { concatAllArray } from 'jpjs';

import { paths } from './constants';
import { paths } from '../constants';
import { TsdxOptions, NormalizedOpts } from './types';

import { createRollupConfig } from './createRollupConfig';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { paths } from './constants';
import util from 'util';
import mkdirp from 'mkdirp';

import { paths } from '../constants';

const progressEstimator = require('progress-estimator');

export async function createProgressEstimator() {
Expand Down
10 changes: 6 additions & 4 deletions src/createRollupConfig.ts → src/build/createRollupConfig.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { safeVariableName, safePackageName, external } from './utils';
import { paths } from './constants';
import * as fs from 'fs-extra';
import { RollupOptions } from 'rollup';
import { terser } from 'rollup-plugin-terser';
import { DEFAULT_EXTENSIONS } from '@babel/core';
Expand All @@ -10,10 +9,13 @@ import replace from '@rollup/plugin-replace';
import resolve from 'rollup-plugin-node-resolve';
import sourceMaps from 'rollup-plugin-sourcemaps';
import typescript from 'rollup-plugin-typescript2';

import { paths } from '../constants';
import { safeVariableName, safePackageName, external } from '../utils';

import { TsdxOptions } from './types';
import { extractErrors } from './errors/extractErrors';
import { babelPluginTsdx } from './babelPluginTsdx';
import { TsdxOptions } from './types';
import * as fs from 'fs-extra';

const errorCodeOpts = {
errorMapFilePath: paths.appErrorsJson,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
import fs from 'fs-extra';
import * as babylon from 'babylon';
import traverse from 'babel-traverse';
import pascalCase from 'pascal-case';

import { paths } from '../../constants';
import { safeVariableName } from '../../utils';

import { invertObject } from './invertObject';
import { evalToString } from './evalToString';
import { paths } from '../constants';
import { safeVariableName } from '../utils';
import pascalCase from 'pascal-case';

const babylonOptions = {
sourceType: 'module',
Expand Down Expand Up @@ -111,7 +113,7 @@ function ErrorDev(message) {
return error;
}
export default ErrorDev;
export default ErrorDev;
`,
'utf-8'
);
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import fs from 'fs';
import { addDefault } from '@babel/helper-module-imports';

import { paths } from '../../constants';

import { invertObject } from './invertObject';
import { evalToString } from './evalToString';
import { addDefault } from '@babel/helper-module-imports';
import { paths } from '../constants';

export default function transformErrorMessages(babel: any) {
const t = babel.types;
Expand Down
297 changes: 297 additions & 0 deletions src/build/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
import * as fs from 'fs-extra';
import path from 'path';
import util from 'util';
import chalk from 'chalk';
import rimraf from 'rimraf';
import asyncro from 'asyncro';
import ora from 'ora';
import execa from 'execa';
import {
rollup,
watch,
RollupOptions,
OutputOptions,
RollupWatchOptions,
WatcherOptions,
} from 'rollup';
import glob from 'tiny-glob/sync';
import { concatAllArray } from 'jpjs';

import { paths } from '../constants';
import { appPackageJson } from '../files';
import logError from '../logError';
import { resolveApp, safePackageName, clearConsole } from '../utils';

import { WatchOpts, BuildOpts, ModuleFormat, NormalizedOpts } from './types';
import { createBuildConfigs } from './createBuildConfigs';
import { createProgressEstimator } from './createProgressEstimator';

export function addBuildCommand(prog: any) {
prog
.command('build')
.describe('Build your project once and exit')
.option('--entry, -i', 'Entry module(s)')
.example('build --entry src/foo.tsx')
.option('--target', 'Specify your target environment', 'browser')
.example('build --target node')
.option('--name', 'Specify name exposed in UMD builds')
.example('build --name Foo')
.option('--format', 'Specify module format(s)', 'cjs,esm')
.example('build --format cjs,esm')
.option('--tsconfig', 'Specify custom tsconfig path')
.example('build --tsconfig ./tsconfig.foo.json')
.option('--transpileOnly', 'Skip type checking', false)
.example('build --transpileOnly')
.option(
'--extractErrors',
'Extract errors to ./errors/codes.json and provide a url for decoding.'
)
.example(
'build --extractErrors=https://reactjs.org/docs/error-decoder.html?invariant='
)
.action(buildAction);
}

export function addWatchCommand(prog: any) {
prog
.command('watch')
.describe('Rebuilds on any change')
.option('--entry, -i', 'Entry module(s)')
.example('watch --entry src/foo.tsx')
.option('--target', 'Specify your target environment', 'browser')
.example('watch --target node')
.option('--name', 'Specify name exposed in UMD builds')
.example('watch --name Foo')
.option('--format', 'Specify module format(s)', 'cjs,esm')
.example('watch --format cjs,esm')
.option(
'--verbose',
'Keep outdated console output in watch mode instead of clearing the screen'
)
.example('watch --verbose')
.option('--noClean', "Don't clean the dist folder")
.example('watch --noClean')
.option('--tsconfig', 'Specify custom tsconfig path')
.example('watch --tsconfig ./tsconfig.foo.json')
.example('build --tsconfig ./tsconfig.foo.json')
.option('--onFirstSuccess', 'Run a command on the first successful build')
.example('watch --onFirstSuccess "echo The first successful build!"')
.option('--onSuccess', 'Run a command on a successful build')
.example('watch --onSuccess "echo Successful build!"')
.option('--onFailure', 'Run a command on a failed build')
.example('watch --onFailure "The build failed!"')
.option('--transpileOnly', 'Skip type checking', false)
.example('build --transpileOnly')
.option(
'--extractErrors',
'Extract invariant errors to ./errors/codes.json.'
)
.example('build --extractErrors')
.action(watchAction);
}

async function buildAction(dirtyOpts: BuildOpts) {
const opts = await normalizeOpts(dirtyOpts);
const buildConfigs = await createBuildConfigs(opts);
await cleanDistFolder();
const logger = await createProgressEstimator();
if (opts.format.includes('cjs')) {
const promise = writeCjsEntryFile(opts.name).catch(logError);
logger(promise, 'Creating entry file');
}
try {
const promise = asyncro
.map(
buildConfigs,
async (inputOptions: RollupOptions & { output: OutputOptions }) => {
let bundle = await rollup(inputOptions);
await bundle.write(inputOptions.output);
await moveTypes();
}
)
.catch((e: any) => {
throw e;
});
logger(promise, 'Building modules');
await promise;
} catch (error) {
logError(error);
process.exit(1);
}
}

async function watchAction(dirtyOpts: WatchOpts) {
const opts = await normalizeOpts(dirtyOpts);
const buildConfigs = await createBuildConfigs(opts);
if (!opts.noClean) {
await cleanDistFolder();
}
opts.name = opts.name || appPackageJson.name;
opts.input = await getInputs(opts.entry, appPackageJson.source);
if (opts.format.includes('cjs')) {
await writeCjsEntryFile(opts.name);
}

type Killer = execa.ExecaChildProcess | null;

let firstTime = true;
let successKiller: Killer = null;
let failureKiller: Killer = null;

function run(command?: string) {
if (!command) {
return null;
}

const [exec, ...args] = command.split(' ');
return execa(exec, args, {
stdio: 'inherit',
});
}

function killHooks() {
return Promise.all([
successKiller ? successKiller.kill('SIGTERM') : null,
failureKiller ? failureKiller.kill('SIGTERM') : null,
]);
}

const spinner = ora().start();
await watch(
(buildConfigs as RollupWatchOptions[]).map(inputOptions => ({
watch: {
silent: true,
include: ['src/**'],
exclude: ['node_modules/**'],
} as WatcherOptions,
...inputOptions,
}))
).on('event', async event => {
// clear previous onSuccess/onFailure hook processes so they don't pile up
await killHooks();

if (event.code === 'START') {
if (!opts.verbose) {
clearConsole();
}
spinner.start(chalk.bold.cyan('Compiling modules...'));
}
if (event.code === 'ERROR') {
spinner.fail(chalk.bold.red('Failed to compile'));
logError(event.error);
failureKiller = run(opts.onFailure);
}
if (event.code === 'FATAL') {
spinner.fail(chalk.bold.red('Failed to compile'));
logError(event.error);
failureKiller = run(opts.onFailure);
}
if (event.code === 'END') {
spinner.succeed(chalk.bold.green('Compiled successfully'));
console.log(`
${chalk.dim('Watching for changes')}
`);

try {
await moveTypes();

if (firstTime && opts.onFirstSuccess) {
firstTime = false;
run(opts.onFirstSuccess);
} else {
successKiller = run(opts.onSuccess);
}
} catch (_error) {}
}
});
}

async function normalizeOpts(opts: WatchOpts): Promise<NormalizedOpts> {
return {
...opts,
name: opts.name || appPackageJson.name,
input: await getInputs(opts.entry, appPackageJson.source),
format: opts.format.split(',').map((format: string) => {
if (format === 'es') {
return 'esm';
}
return format;
}) as [ModuleFormat, ...ModuleFormat[]],
};
}

async function getInputs(
entries?: string | string[],
source?: string
): Promise<string[]> {
let inputs: string[] = [];
let stub: any[] = [];
stub
.concat(
entries && entries.length
? entries
: (source && resolveApp(source)) ||
((await isDir(resolveApp('src'))) && (await jsOrTs('src/index')))
)
.map(file => glob(file))
.forEach(input => inputs.push(input));

return concatAllArray(inputs);
}

const isDir = (name: string) =>
fs
.stat(name)
.then(stats => stats.isDirectory())
.catch(() => false);

const isFile = (name: string) =>
fs
.stat(name)
.then(stats => stats.isFile())
.catch(() => false);

async function jsOrTs(filename: string) {
const extension = (await isFile(resolveApp(filename + '.ts')))
? '.ts'
: (await isFile(resolveApp(filename + '.tsx')))
? '.tsx'
: '.js';

return resolveApp(`${filename}${extension}`);
}

async function moveTypes() {
try {
// Move the typescript types to the base of the ./dist folder
await fs.copy(paths.appDist + '/src', paths.appDist, {
overwrite: true,
});
await fs.remove(paths.appDist + '/src');
} catch (e) {}
}

async function cleanDistFolder() {
try {
await util.promisify(fs.access)(paths.appDist);
return util.promisify(rimraf)(paths.appDist);
} catch {
// if an exception is throw, the files does not exists or it is not visible
// either way, we just return
return;
}
}

function writeCjsEntryFile(name: string) {
const baseLine = `module.exports = require('./${safePackageName(name)}`;
const contents = `
'use strict'
if (process.env.NODE_ENV === 'production') {
${baseLine}.cjs.production.min.js')
} else {
${baseLine}.cjs.development.js')
}
`;
return fs.outputFile(path.join(paths.appDist, 'index.js'), contents);
}
Loading

0 comments on commit 890eabf

Please sign in to comment.