Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions src/services/build/build.javascript.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {buildEsm, execute} from '@junobuild/cli-tools';
import {magenta, red, yellow} from 'kleur';
import {green, magenta, red, yellow} from 'kleur';
import {mkdir} from 'node:fs/promises';
import {join} from 'node:path';
import {
Expand All @@ -10,6 +10,7 @@ import {
INDEX_TS
} from '../../constants/dev.constants';
import type {BuildArgs, BuildLang} from '../../types/build';
import {formatBytes, formatTime} from '../../utils/format.utils';
import {detectPackageManager} from '../../utils/pm.utils';
import {confirmAndExit} from '../../utils/prompt.utils';

Expand Down Expand Up @@ -61,17 +62,8 @@ const buildWithEsbuild = async ({lang, path}: BuildArgsTsJs) => {

const [key, {bytes}] = entry[0];

const unit = bytes >= 1000 ? 'megabyte' : 'kilobyte';

const formatter = new Intl.NumberFormat('en', {
style: 'unit',
unit
});

console.log(`✅ Build complete (esbuild ${version}).`);
console.log(
`➡️ ${key} (${formatter.format(bytes / (unit === 'megabyte' ? 1_000_000 : 1_000))})`
);
console.log(`${green('✔')} Build complete at ${formatTime()} (esbuild ${version})`);
console.log(`→ ${yellow(key)} (${formatBytes(bytes)})`);
};

const createTargetDir = async () => {
Expand Down
12 changes: 4 additions & 8 deletions src/services/build/build.rust.services.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {nonNullish} from '@dfinity/utils';
import {execute, gzipFile, spawn} from '@junobuild/cli-tools';
import {generateApi} from '@junobuild/did-tools';
import {green, grey, magenta, yellow} from 'kleur';
import {magenta, yellow} from 'kleur';
import {existsSync} from 'node:fs';
import {lstat, mkdir, readFile, rename, writeFile} from 'node:fs/promises';
import {join, relative} from 'node:path';
Expand All @@ -16,6 +16,7 @@ import {
import type {BuildArgs} from '../../types/build';
import {readSatelliteDid} from '../../utils/did.utils';
import {checkCargoBinInstalled, checkIcWasmVersion, checkRustVersion} from '../../utils/env.utils';
import {formatBytes, formatTime} from '../../utils/format.utils';
import {confirmAndExit} from '../../utils/prompt.utils';

const CARGO_RELEASE_DIR = join(process.cwd(), 'target', 'wasm32-unknown-unknown', 'release');
Expand Down Expand Up @@ -287,15 +288,10 @@ const successMsg = async (spinner: Ora) => {
const gzipOutput = `${SATELLITE_OUTPUT}.gz`;
const {size} = await lstat(gzipOutput);

const formatMB = (value: number): string =>
Intl.NumberFormat('en-US', {
maximumSignificantDigits: 2
}).format(value / (1024 * 1024));

spinner.succeed(
`${green('Success!')}\n\nThe satellite has been compiled.\nOutput file: ${yellow(
`Build complete at ${formatTime()}\n→ Output file: ${yellow(
relative(process.cwd(), gzipOutput)
)} ${grey(`(${formatMB(size)}MB)`)}`
)} (${formatBytes(size)})`
);
};

Expand Down
4 changes: 2 additions & 2 deletions src/services/build/build.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const executeBuild = async ({lang, path}: Omit<BuildArgs, 'watch'>) => {

const watchBuild = ({watch, path, ...params}: BuildArgs) => {
const doBuild = async () => {
console.log('Rebuilding serverless functions...');
console.log(`\n⏱ Rebuilding serverless functions...`);
await executeBuild({path, ...params});
};

Expand All @@ -105,7 +105,7 @@ const watchBuild = ({watch, path, ...params}: BuildArgs) => {
const watchPath = nonNullish(path) ? dirname(path) : DEVELOPER_PROJECT_SATELLITE_PATH;

console.log(SMALL_TITLE);
console.log('👀 Watching for file changes.');
console.log('👀 Watching for file changes');

chokidar
.watch(watchPath, {
Expand Down
19 changes: 19 additions & 0 deletions src/utils/format.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export const formatBytes = (bytes: number): string => {
const unit = bytes >= 1000 ? 'megabyte' : 'kilobyte';

const formatter = new Intl.NumberFormat('en', {
style: 'unit',
unit
});

return formatter.format(bytes / (unit === 'megabyte' ? 1_000_000 : 1_000));
};

export const formatTime = (date: Date = new Date()): string => {
return new Intl.DateTimeFormat('en', {
hour: '2-digit',
minute: '2-digit',
second: '2-digit',
hour12: false
}).format(date);
};