Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(terser): parallel execution #1341

Merged
merged 9 commits into from
Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/terser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@
}
},
"dependencies": {
"serialize-javascript": "^6.0.0",
"smob": "^0.0.6",
"terser": "^5.15.1"
},
"devDependencies": {
"@types/serialize-javascript": "^5.0.2",
"rollup": "^3.0.0-7",
"typescript": "^4.8.3"
},
Expand Down
26 changes: 5 additions & 21 deletions packages/terser/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,8 @@
import { NormalizedOutputOptions, RenderedChunk } from 'rollup';
import { minify, MinifyOptions } from 'terser';
import { runWorker } from './worker';
import terser from './module';

export default function terser(options?: MinifyOptions) {
return {
name: 'terser',
Promise.resolve().then(() => runWorker());
tada5hi marked this conversation as resolved.
Show resolved Hide resolved

async renderChunk(code: string, chunk: RenderedChunk, outputOptions: NormalizedOutputOptions) {
const defaultOptions: MinifyOptions = {
sourceMap: outputOptions.sourcemap === true || typeof outputOptions.sourcemap === 'string'
};
export * from './type';

if (outputOptions.format === 'es') {
defaultOptions.module = true;
}

if (outputOptions.format === 'cjs') {
defaultOptions.toplevel = true;
}

return minify(code, { ...defaultOptions, ...(options || {}) });
}
};
}
export default terser;
67 changes: 67 additions & 0 deletions packages/terser/src/module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import { NormalizedOutputOptions, RenderedChunk } from 'rollup';
import { hasOwnProperty, isObject, merge } from 'smob';

import { Options } from './type';
import { callWorker } from './worker';

export default function terser(options: Options = {}) {
return {
name: 'terser',

async renderChunk(code: string, chunk: RenderedChunk, outputOptions: NormalizedOutputOptions) {
const defaultOptions: Options = {
sourceMap: outputOptions.sourcemap === true || typeof outputOptions.sourcemap === 'string'
};

if (outputOptions.format === 'es') {
defaultOptions.module = true;
}

if (outputOptions.format === 'cjs') {
defaultOptions.toplevel = true;
}

try {
const { code: result, nameCache } = await callWorker(__filename, {
tada5hi marked this conversation as resolved.
Show resolved Hide resolved
code,
options: merge({}, options || {}, defaultOptions)
});

if (options.nameCache && nameCache) {
let vars: Record<string, any> = {
props: {}
};

if (hasOwnProperty(options.nameCache, 'vars') && isObject(options.nameCache.vars)) {
vars = merge({}, options.nameCache.vars || {}, vars);
}

if (hasOwnProperty(nameCache, 'vars') && isObject(nameCache.vars)) {
vars = merge({}, nameCache.vars, vars);
}

// eslint-disable-next-line no-param-reassign
options.nameCache.vars = vars;

let props: Record<string, any> = {};

if (hasOwnProperty(options.nameCache, 'props') && isObject(options.nameCache.props)) {
// eslint-disable-next-line prefer-destructuring
props = options.nameCache.props;
}

if (hasOwnProperty(nameCache, 'props') && isObject(nameCache.props)) {
props = merge({}, nameCache.props, props);
}

// eslint-disable-next-line no-param-reassign
options.nameCache.props = props;
}

return result;
} catch (e) {
return Promise.reject(e);
}
}
};
}
20 changes: 20 additions & 0 deletions packages/terser/src/type.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { MinifyOptions } from 'terser';

export interface Options extends MinifyOptions {
nameCache?: Record<string, any>;
}

export interface WorkerContext {
code: string;
options: Options;
}

export interface WorkerContextSerialized {
code: string;
options: string;
}

export interface WorkerOutput {
code: string;
nameCache?: Options['nameCache'];
}
68 changes: 68 additions & 0 deletions packages/terser/src/worker.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import process from 'process';
import { Worker, isMainThread, parentPort, workerData } from 'worker_threads';

import serializeJavascript from 'serialize-javascript';

import { hasOwnProperty, isObject } from 'smob';

import { minify } from 'terser';

import { WorkerContext, WorkerContextSerialized, WorkerOutput } from './type';

/**
* Duck typing worker context.
*
* @param input
*/
function isWorkerContextSerialized(input: unknown): input is WorkerContextSerialized {
return (
isObject(input) &&
hasOwnProperty(input, 'code') &&
typeof input.code === 'string' &&
hasOwnProperty(input, 'options') &&
typeof input.options === 'string'
);
}

export async function callWorker(filePath: string, context: WorkerContext) {
return new Promise<WorkerOutput>((resolve, reject) => {
const worker = new Worker(filePath, {
workerData: {
code: context.code,
options: serializeJavascript(context.options)
}
});

worker.on('message', (data) => resolve(data));

worker.on('error', reject);

worker.on('exit', (code) => {
if (code !== 0) reject(new Error(`Minify worker stopped with exit code ${code}`));
});
});
}

export async function runWorker() {
if (isMainThread || !parentPort || !isWorkerContextSerialized(workerData)) {
return;
}

try {
// eslint-disable-next-line no-eval
const eval2 = eval;

const options = eval2(`(${workerData.options})`);

const result = await minify(workerData.code, options);

const output: WorkerOutput = {
code: result.code || workerData.code,
nameCache: options.nameCache
};

parentPort.postMessage(output);
} catch (e) {
process.exit(1);
}
}
4 changes: 2 additions & 2 deletions packages/terser/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ test.serial('throw error on terser fail', async (t) => {
await bundle.generate({ format: 'esm' });
t.falsy(true);
} catch (error) {
t.is(error.toString(), 'SyntaxError: Name expected');
t.is(error.toString(), 'Error: Minify worker stopped with exit code 1');
}
});

Expand All @@ -127,7 +127,7 @@ test.serial('throw error on terser fail with multiple outputs', async (t) => {
await Promise.all([bundle.generate({ format: 'cjs' }), bundle.generate({ format: 'esm' })]);
t.falsy(true);
} catch (error) {
t.is(error.toString(), 'SyntaxError: Name expected');
t.is(error.toString(), 'Error: Minify worker stopped with exit code 1');
}
});

Expand Down
27 changes: 26 additions & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.