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
12 changes: 12 additions & 0 deletions tools/egg-bundler/src/lib/ExternalsResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export class ExternalsResolver {
const pkg = await this.#readPackageJson(pkgDir);
if (await this.#hasMissingOptionalPeerDependencies(pkgDir, pkg)) return true;
if (await this.#hasNativeBinary(pkgDir, pkg)) return true;
if (await this.#hasNativeOptionalDependency(pkgDir, pkg)) return true;
return false;
}

Expand All @@ -108,6 +109,17 @@ export class ExternalsResolver {
return false;
}

async #hasNativeOptionalDependency(pkgDir: string, pkg: PackageJson): Promise<boolean> {
const optionalDependencies = pkg.optionalDependencies ?? {};
for (const depName of Object.keys(optionalDependencies)) {
const depDir = await this.#findPackageDir(depName, pkgDir);
if (!depDir) continue;
const depPkg = await this.#readPackageJson(depDir);
if (await this.#hasNativeBinary(depDir, depPkg)) return true;
}
return false;
}

async #findPackageDir(name: string, fromDir = this.#baseDir): Promise<string | undefined> {
const cacheKey = `${fromDir}\0${name}`;
const cached = this.#packageDirCache.get(cacheKey);
Expand Down
10 changes: 10 additions & 0 deletions tools/egg-bundler/test/ExternalsResolver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ describe('ExternalsResolver', () => {
const result = await new ExternalsResolver({ baseDir: basicApp }).resolve();
expect(result['native-dotnode']).toBe('native-dotnode');
});

it('externalizes a wrapper package whose installed optional dependency is native', async () => {
const result = await new ExternalsResolver({ baseDir: basicApp }).resolve();
expect(result['native-optional-wrapper']).toBe('native-optional-wrapper');
});
});

describe('tier 2: ESM-only packages', () => {
Expand Down Expand Up @@ -131,6 +136,11 @@ describe('ExternalsResolver', () => {
expect(result['normal-js']).toBeUndefined();
});

it('leaves a package with only plain JS optional dependencies out of the externals map', async () => {
const result = await new ExternalsResolver({ baseDir: basicApp }).resolve();
expect(result['optional-js-wrapper']).toBeUndefined();
});

it('does not externalize a declared dep that is not installed and matches no rule', async () => {
const result = await new ExternalsResolver({ baseDir: basicApp }).resolve();
expect(result['missing-pkg']).toBeUndefined();
Expand Down

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

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

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

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

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

Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
"missing-pkg": "1.0.0",
"native-binding": "1.0.0",
"native-dotnode": "1.0.0",
"native-optional-wrapper": "1.0.0",
"native-prebuilds": "1.0.0",
"native-scripts": "1.0.0",
"normal-js": "1.0.0",
"optional-js-wrapper": "1.0.0",
"optional-peer-host": "1.0.0"
},
"peerDependencies": {
Expand Down
Loading