Skip to content

Commit

Permalink
fix(terser): return promise reject on empty chunk
Browse files Browse the repository at this point in the history
  • Loading branch information
tada5hi committed Nov 10, 2022
1 parent 66da603 commit 0d87e6b
Showing 1 changed file with 33 additions and 29 deletions.
62 changes: 33 additions & 29 deletions packages/terser/src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,43 +21,47 @@ export default function terser(options: Options = {}) {
defaultOptions.toplevel = true;
}

const { code: result, nameCache } = await callWorker(__filename, {
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);
}
try {
const { code: result, nameCache } = await callWorker(__filename, {
code,
options: merge({}, options || {}, defaultOptions)
});

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

// eslint-disable-next-line no-param-reassign
options.nameCache.vars = vars;
if (hasOwnProperty(options.nameCache, 'vars') && isObject(options.nameCache.vars)) {
vars = merge({}, options.nameCache.vars || {}, vars);
}

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

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

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

if (hasOwnProperty(nameCache, 'props') && isObject(nameCache.props)) {
props = merge({}, nameCache.props, props);
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;
}

// eslint-disable-next-line no-param-reassign
options.nameCache.props = props;
return result;
} catch (e) {
return Promise.reject(e);
}

return result;
}
};
}

0 comments on commit 0d87e6b

Please sign in to comment.