Skip to content
Draft
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/stupid-kiwis-change.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@atlaspack/packager-js': minor
---

Use arrow functions in `parcelRegister` calls when supported. Reduce calls to `this.bundle.env.supports('arrow-functions', true);`.
15 changes: 12 additions & 3 deletions packages/packagers/js/src/ScopeHoistingPackager.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export class ScopeHoistingPackager {
externalAssets: Set<Asset> = new Set();
forceSkipWrapAssets: Array<string> = [];
logger: PluginLogger;
supportsArrowFunctions: boolean;

constructor(
options: PluginOptions,
Expand All @@ -121,6 +122,10 @@ export class ScopeHoistingPackager {
this.useAsyncBundleRuntime = useAsyncBundleRuntime;
this.forceSkipWrapAssets = forceSkipWrapAssets ?? [];
this.logger = logger;
this.supportsArrowFunctions = this.bundle.env.supports(
'arrow-functions',
true,
);

let OutputFormat = OUTPUT_FORMATS[this.bundle.env.outputFormat];
this.outputFormat = new OutputFormat(this);
Expand Down Expand Up @@ -341,7 +346,7 @@ export class ScopeHoistingPackager {

let params = [
JSON.stringify(this.bundle.publicId),
fnExpr(this.bundle.env, [], [codeToRun]),
fnExpr(this.supportsArrowFunctions, [], [codeToRun]),
`${JSON.stringify(deps)}${
conditions.length > 0
? `.concat([${conditions
Expand Down Expand Up @@ -717,9 +722,13 @@ export class ScopeHoistingPackager {
sourceMap?.offsetLines(1, 1);
lineCount++;

const args = '(module, exports)';
const func = this.supportsArrowFunctions
? `${args} =>`
: `function${args}`;
code = `parcelRegister(${JSON.stringify(
this.bundleGraph.getAssetPublicId(asset),
)}, function(module, exports) {
)}, ${func} {
${code}
});
`;
Expand Down Expand Up @@ -1552,7 +1561,7 @@ ${code}
}

buildFunctionExpression(args: Array<string>, expr: string): string {
return this.bundle.env.supports('arrow-functions', true)
return this.supportsArrowFunctions
? `(${args.join(', ')}) => ${expr}`
: `function (${args.join(', ')}) { return ${expr}; }`;
}
Expand Down
21 changes: 12 additions & 9 deletions packages/packagers/js/src/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,22 @@ var parcelRegister = parcelRequire.register;
`;

export const fnExpr = (
env: Environment,
supportsArrowFunctions: boolean,
params: Array<string>,
body: Array<string>,
): string => {
let block = `{ ${body.join(' ')} }`;

if (env.supports('arrow-functions')) {
if (supportsArrowFunctions) {
return `(${params.join(', ')}) => ${block}`;
}

return `function (${params.join(', ')}) ${block}`;
};

export const bundleQueuePrelude = (env: Environment): string => `
export const bundleQueuePrelude = (env: Environment): string => {
const supportsArrowFunctions = env.supports('arrow-functions');
return `
if (!$parcel$global.lb) {
// Set of loaded bundles
$parcel$global.lb = new Set();
Expand All @@ -58,14 +60,14 @@ if (!$parcel$global.lb) {

// Register loaded bundle
$parcel$global.rlb = ${fnExpr(
env,
supportsArrowFunctions,
['bundle'],
['$parcel$global.lb.add(bundle);', '$parcel$global.pq();'],
)}

// Run when ready
$parcel$global.rwr = ${fnExpr(
env,
supportsArrowFunctions,
// b = bundle public id
// r = run function to execute the bundle entry
// d = list of dependent bundles this bundle requires before executing
Expand All @@ -75,23 +77,23 @@ if (!$parcel$global.lb) {

// Process queue
$parcel$global.pq = ${fnExpr(
env,
supportsArrowFunctions,
[],
[
`var runnableEntry = $parcel$global.bq.find(${fnExpr(
env,
supportsArrowFunctions,
['i'],
[
`return i.d.every(${fnExpr(
env,
supportsArrowFunctions,
['dep'],
['return $parcel$global.lb.has(dep);'],
)});`,
],
)});`,
'if (runnableEntry) {',
`$parcel$global.bq = $parcel$global.bq.filter(${fnExpr(
env,
supportsArrowFunctions,
['i'],
['return i.b !== runnableEntry.b;'],
)});`,
Expand All @@ -102,6 +104,7 @@ if (!$parcel$global.lb) {
)}
}
`;
};

const $parcel$export = `
function $parcel$export(e, n, v, s) {
Expand Down
Loading