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
5 changes: 5 additions & 0 deletions .changeset/four-meals-cough.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ice/pkg': major
---

refactor: use rollup to compile transform mode
1 change: 1 addition & 0 deletions packages/pkg/src/config/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { z } from 'zod';
export const transformSchema = z.object({
formats: z.string().array().optional(),
excludes: z.union([z.string(), z.array(z.string())]).optional(),
entryRoot: z.string().optional(),
});

export const bundleSchema = z.object({
Expand Down
5 changes: 4 additions & 1 deletion packages/pkg/src/core/init.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AliasBundleFormatString, BuildTask, BundleUserConfig, Context, DeclarationUserConfig } from '../types.js';
import { formatEntry, getTransformDefaultOutputDir } from '../helpers/getTaskIO.js';
import { formatEntry, getTransformDefaultOutputDir, getTransformEntryRoot } from '../helpers/getTaskIO.js';
import { stringifyObject } from '../utils.js';
import { merge, mergeWith, omit } from 'es-toolkit/object';
import path, { resolve } from 'node:path';
Expand Down Expand Up @@ -124,6 +124,9 @@ export function initTask(buildTask: BuildTask, options: InitTaskOptions) {
mergeDefaults(config, defaultBundleUserConfig);
} else if (config.type === 'transform') {
config.modes ??= [expectedMode];
config.excludes ??= userConfig.transform?.excludes;
config.entryRoot ??= pkg?.entryRoot ?? userConfig.transform?.entryRoot;
config.entryRoot = getTransformEntryRoot(rootDir, config.entry as Record<string, string>, config.entryRoot);
Comment thread
XGHeaven marked this conversation as resolved.
Resolved
config.outputDir ??= pkg?.outputDir ?? getTransformDefaultOutputDir(rootDir, taskName, config);
config.outputDir = resolve(rootDir, config.outputDir!);
} else if (config.type === 'declaration') {
Expand Down
20 changes: 3 additions & 17 deletions packages/pkg/src/engine/rollup/build.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
import * as path from 'path';
import * as rollup from 'rollup';
import { toArray } from '../../utils.js';
import type {
OutputAsset as RollupOutputAsset,
OutputChunk as RollupOutputChunk,
OutputOptions,
RollupBuild,
RollupOptions,
RollupOutput,
} from 'rollup';
import { toOutputFiles } from './output.js';
import type { OutputOptions, RollupBuild, RollupOptions, RollupOutput } from 'rollup';
import type { OutputFile, OutputResult, TaskRunnerContext } from '../../types.js';

export async function build(rollupOptions: RollupOptions, taskRunnerContext: TaskRunnerContext): Promise<OutputResult> {
Expand Down Expand Up @@ -42,14 +35,7 @@ export async function writeFiles(
for (let o = 0; o < rollupOutputOptions.length; ++o) {
const writeResult = await write(rollupOutputOptions[o]);
const distDir = rollupOutputOptions[o].dir ?? '';
writeResult.output.forEach((chunk: RollupOutputChunk | RollupOutputAsset) => {
outputFiles.push({
absolutePath: 'facadeModuleId' in chunk ? chunk.facadeModuleId! : undefined,
dest: path.join(distDir ?? '', chunk.fileName ?? ''),
filename: chunk.fileName,
code: chunk.type === 'chunk' ? chunk.code : chunk.source,
});
});
outputFiles.push(...toOutputFiles(writeResult.output, distDir));
outputs.push(writeResult.output);
}

Expand Down
52 changes: 52 additions & 0 deletions packages/pkg/src/engine/rollup/output.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import * as path from 'path';
import type { OutputAsset as RollupOutputAsset, OutputChunk as RollupOutputChunk } from 'rollup';
import type { OutputFile } from '../../types.js';

type RollupOutputItem = RollupOutputChunk | RollupOutputAsset;

export interface NormalizedRollupOutputItem {
type: 'chunk' | 'asset';
fileName: string;
dest: string;
absolutePath?: string;
code?: string | Uint8Array;
chunk?: RollupOutputChunk;
asset?: RollupOutputAsset;
}

interface ToOutputFilesOptions {
map?: (item: NormalizedRollupOutputItem) => Partial<OutputFile>;
}

function normalizeOutputItem(item: RollupOutputItem, distDir: string): NormalizedRollupOutputItem {
return {
type: item.type,
fileName: item.fileName,
dest: path.join(distDir, item.fileName ?? ''),
absolutePath: 'facadeModuleId' in item ? (item.facadeModuleId ?? undefined) : undefined,
code: item.type === 'chunk' ? item.code : item.source,
chunk: item.type === 'chunk' ? item : undefined,
asset: item.type === 'asset' ? item : undefined,
};
}

export function toOutputFile(item: RollupOutputItem, distDir: string, options: ToOutputFilesOptions = {}): OutputFile {
const normalized = normalizeOutputItem(item, distDir);
const base: OutputFile = {
filePath: normalized.fileName,
absolutePath: normalized.absolutePath,
ext: path.extname(normalized.fileName),
dest: normalized.dest,
filename: normalized.fileName,
code: normalized.code,
map: normalized.chunk?.map ?? undefined,
};
return {
...base,
...(options.map?.(normalized) ?? {}),
};
}

export function toOutputFiles(items: RollupOutputItem[], distDir: string, options: ToOutputFilesOptions = {}) {
return items.map((item) => toOutputFile(item, distDir, options));
}
25 changes: 25 additions & 0 deletions packages/pkg/src/engine/rollup/warn.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type { RollupLog, RollupOptions, WarningHandlerWithDefault } from 'rollup';

function isIgnorableWarning(warning: RollupLog) {
return warning.code === 'EMPTY_BUNDLE' || warning.message.includes('Generated an empty chunk');
}

export function withFilteredRollupWarnings(rollupOptions: RollupOptions): RollupOptions {
const onwarn = rollupOptions.onwarn;
const filteredOnwarn: WarningHandlerWithDefault = (warning, defaultHandler) => {
if (isIgnorableWarning(warning)) {
return;
}

if (onwarn) {
onwarn(warning, defaultHandler);
} else {
defaultHandler(warning);
}
};

return {
...rollupOptions,
onwarn: filteredOnwarn,
};
}
23 changes: 0 additions & 23 deletions packages/pkg/src/helpers/__tests__/getTaskIO.test.ts

This file was deleted.

51 changes: 50 additions & 1 deletion packages/pkg/src/helpers/getTaskIO.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isAbsolute, resolve, join } from 'node:path';
import { isAbsolute, resolve, join, relative, dirname } from 'node:path';
import { TransformTaskConfig } from '../types.js';

export function formatEntry(inputEntry?: string | string[] | Record<string, string>): Record<string, string> {
Expand Down Expand Up @@ -35,6 +35,55 @@ export const getTransformEntryDirs = (rootDir: string, entry: Record<string, str
return transformEntryDirs;
};

export const getCommonAncestorDir = (paths: string[]) => {
if (!paths.length) {
return '';
}

let commonPath = resolve(paths[0]);

for (let i = 1; i < paths.length; i++) {
const currentPath = resolve(paths[i]);

while (!isPathInDir(currentPath, commonPath)) {
const parentPath = dirname(commonPath);
if (parentPath === commonPath) {
break;
}
commonPath = parentPath;
}
}

return commonPath;
};

export const getTransformEntryRoot = (rootDir: string, entry: Record<string, string>, configuredEntryRoot?: string) => {
const entryDirs = getTransformEntryDirs(rootDir, entry);
const autoEntryRoot = entryDirs.length ? getCommonAncestorDir(entryDirs) : resolve(rootDir);

if (!configuredEntryRoot) {
return autoEntryRoot;
}

const resolvedEntryRoot = isAbsolute(configuredEntryRoot)
? configuredEntryRoot
: resolve(rootDir, configuredEntryRoot);
const invalidEntryDir = entryDirs.find((entryDir) => !isPathInDir(entryDir, resolvedEntryRoot));

if (invalidEntryDir) {
throw new Error(
`Invalid entryRoot "${configuredEntryRoot}". Expected a common ancestor of all transform entries, but "${invalidEntryDir}" is outside it.`,
);
}

return resolvedEntryRoot;
};

function isPathInDir(filePath: string, dirPath: string) {
const relativePath = relative(resolve(dirPath), resolve(filePath));
return relativePath === '' || (!relativePath.startsWith('..') && !isAbsolute(relativePath));
}

export const getTransformDefaultOutputDir = (rootDir: string, taskName: string, config: TransformTaskConfig) => {
if (config.pkg) {
return resolve(rootDir, config.pkg.id);
Expand Down
Loading
Loading