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.

Sign up for GitHub

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

Jump to bottom

Add missing imports for external dependencies in skipped assets #8299

Merged
merged 1 commit into from Jul 12, 2022
Merged

Add missing imports for external dependencies in skipped assets #8299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/core/integration-tests/test/integration/formats/esm-external/child.js
View file
Open in desktop
@@ -0,0 +1 @@
export {add} from 'lodash';
1 change: 1 addition & 0 deletions packages/core/integration-tests/test/integration/formats/esm-external/re-export-child.js
View file
Open in desktop
@@ -0,0 +1 @@
export {add} from './child';
18 changes: 18 additions & 0 deletions packages/core/integration-tests/test/output-formats.js
View file
Open in desktop
Expand Up @@ -725,6 +725,24 @@ describe('output formats', function () {
);
});

it('should support esmodule output with external modules (re-export child)', async function () {
let b = await bundle(
path.join(
__dirname,
'/integration/formats/esm-external/re-export-child.js',
),
);

await assertESMExports(
b,
3,
{
lodash: () => lodash,
},
ns => ns.add(1, 2),
);
});

it('should support importing sibling bundles in library mode', async function () {
let b = await bundle(
path.join(__dirname, '/integration/formats/esm-siblings/a.js'),
Expand Down
125 changes: 66 additions & 59 deletions packages/packagers/js/src/ScopeHoistingPackager.js
View file
Open in desktop
Expand Up @@ -400,7 +400,15 @@ export class ScopeHoistingPackager {
for (let dep of deps) {
let resolved = this.bundleGraph.getResolvedAsset(dep, this.bundle);
let skipped = this.bundleGraph.isDependencySkipped(dep);
if (!resolved || skipped) {
if (skipped) {
continue;
}

if (!resolved) {
if (!dep.isOptional) {
this.addExternal(dep);
}

continue;
}

Expand Down Expand Up @@ -605,62 +613,7 @@ ${code}
!dep.isOptional &&
!this.bundleGraph.isDependencySkipped(dep)
) {
let external = this.addExternal(dep);
for (let [imported, {local}] of dep.symbols) {
// If already imported, just add the already renamed variable to the mapping.
let renamed = external.get(imported);
if (renamed && local !== '*') {
replacements.set(local, renamed);
continue;
}

// For CJS output, always use a property lookup so that exports remain live.
// For ESM output, use named imports which are always live.
if (this.bundle.env.outputFormat === 'commonjs') {
renamed = external.get('*');
if (!renamed) {
renamed = this.getTopLevelName(
`$${this.bundle.publicId}$${dep.specifier}`,
);

external.set('*', renamed);
}

if (local !== '*') {
let replacement;
if (imported === '*') {
replacement = renamed;
} else if (imported === 'default') {
replacement = `($parcel$interopDefault(${renamed}))`;
this.usedHelpers.add('$parcel$interopDefault');
} else {
replacement = this.getPropertyAccess(renamed, imported);
}

replacements.set(local, replacement);
}
} else {
// Rename the specifier so that multiple local imports of the same imported specifier
// are deduplicated. We have to prefix the imported name with the bundle id so that
// local variables do not shadow it.
if (this.exportedSymbols.has(local)) {
renamed = local;
} else if (imported === 'default' || imported === '*') {
renamed = this.getTopLevelName(
`$${this.bundle.publicId}$${dep.specifier}`,
);
} else {
renamed = this.getTopLevelName(
`$${this.bundle.publicId}$${imported}`,
);
}

external.set(imported, renamed);
if (local !== '*') {
replacements.set(local, renamed);
}
}
}
this.addExternal(dep, replacements);
}

if (!resolved) {
Expand Down Expand Up @@ -712,7 +665,7 @@ ${code}
return [depMap, replacements];
}

addExternal(dep: Dependency): Map<string, string> {
addExternal(dep: Dependency, replacements?: Map<string, string>) {
if (this.bundle.env.outputFormat === 'global') {
throw new ThrowableDiagnostic({
diagnostic: {
Expand Down Expand Up @@ -742,7 +695,61 @@ ${code}
this.externals.set(dep.specifier, external);
}

return external;
for (let [imported, {local}] of dep.symbols) {
// If already imported, just add the already renamed variable to the mapping.
let renamed = external.get(imported);
if (renamed && local !== '*' && replacements) {
replacements.set(local, renamed);
continue;
}

// For CJS output, always use a property lookup so that exports remain live.
// For ESM output, use named imports which are always live.
if (this.bundle.env.outputFormat === 'commonjs') {
renamed = external.get('*');
if (!renamed) {
renamed = this.getTopLevelName(
`$${this.bundle.publicId}$${dep.specifier}`,
);

external.set('*', renamed);
}

if (local !== '*' && replacements) {
let replacement;
if (imported === '*') {
replacement = renamed;
} else if (imported === 'default') {
replacement = `($parcel$interopDefault(${renamed}))`;
this.usedHelpers.add('$parcel$interopDefault');
} else {
replacement = this.getPropertyAccess(renamed, imported);
}

replacements.set(local, replacement);
}
} else {
// Rename the specifier so that multiple local imports of the same imported specifier
// are deduplicated. We have to prefix the imported name with the bundle id so that
// local variables do not shadow it.
if (this.exportedSymbols.has(local)) {
renamed = local;
} else if (imported === 'default' || imported === '*') {
renamed = this.getTopLevelName(
`$${this.bundle.publicId}$${dep.specifier}`,
);
} else {
renamed = this.getTopLevelName(
`$${this.bundle.publicId}$${imported}`,
);
}

external.set(imported, renamed);
if (local !== '*' && replacements) {
replacements.set(local, renamed);
}
}
}
}

getSymbolResolution(
Expand Down