Skip to content

Commit

Permalink
fix: Fix builder output file content
Browse files Browse the repository at this point in the history
  • Loading branch information
beyerleinf committed Feb 25, 2022
1 parent d04b9d7 commit 77853ef
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
16 changes: 8 additions & 8 deletions src/lib/builder.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import { ZodError } from 'zod';
import { build, watch } from './builder';
import * as configLoader from './config-loader';
import { InvalidConfigError, NoEntryPointsError, ProjectDirectoryNotFoundError } from './errors';
import * as esbuild from './esbuild';
import * as glob from './glob';
import * as logger from './logger';
import * as esbuild from './helper/esbuild';
import * as glob from './helper/glob';
import * as logger from './helper/logger';
import * as rimraf from './helper/rimraf';
import { BuilderConfigType } from './models';
import * as shimPlugin from './plugins/shim.plugin';
import * as rimraf from './rimraf';
import * as shims from './shims';

/* eslint-disable @typescript-eslint/no-explicit-any */
Expand Down Expand Up @@ -346,8 +346,8 @@ describe('Builder', () => {

esbuildStub.resolves({
outputFiles: [
{ path: 'some/dir/file1', contents: 'content1' },
{ path: 'some/dir/file2', contents: 'content2' },
{ path: 'some/dir/file1', text: 'content1' },
{ path: 'some/dir/file2', text: 'content2' },
],
});

Expand Down Expand Up @@ -748,8 +748,8 @@ describe('Builder', () => {

await esbuildStub.firstCall.args[0].watch.onRebuild(undefined, {
outputFiles: [
{ path: 'some/dir/file1', contents: 'content1' },
{ path: 'some/dir/file2', contents: 'content2' },
{ path: 'some/dir/file1', text: 'content1' },
{ path: 'some/dir/file2', text: 'content2' },
],
});

Expand Down
10 changes: 4 additions & 6 deletions src/lib/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import fs from 'fs-extra';
import path from 'path';
import { parseConfig } from './config-loader';
import { NoEntryPointsError, ProjectDirectoryNotFoundError } from './errors';
import * as esbuild from './esbuild';
import { glob } from './glob';
import { createLogger, Logger } from './logger';
import { createLogger, glob, Logger, rimraf } from './helper';
import * as esbuild from './helper/esbuild';
import { BuilderConfigType } from './models';
import { shimPlugin } from './plugins';
import { rimraf } from './rimraf';
import { DIRNAME_SHIM, REQUIRE_SHIM } from './shims';

const defaultConfig: BuildOptions = {
Expand All @@ -35,7 +33,7 @@ export async function build(inputConfig: BuilderConfigType) {
const result = await esbuild.build(esbuildOptions);

for (const file of result.outputFiles!) {
await fs.outputFile(file.path, file.contents);
await fs.outputFile(file.path, file.text);
}

logger.info(`⚡ Build complete. Took ${Date.now() - start}ms`);
Expand All @@ -53,7 +51,7 @@ export async function watch(inputConfig: BuilderConfigType) {
logger.error('❌ Rebuild failed');
} else {
for (const file of result?.outputFiles || []) {
await fs.outputFile(file.path, file.contents);
await fs.outputFile(file.path, file.text);
}

logger.info('⚡ Rebuild succeeded');
Expand Down

0 comments on commit 77853ef

Please sign in to comment.