Skip to content

Commit 4569325

Browse files
committed
refactor: remove unused resolver functions from agnostic, webpack-like, rspack, and esbuild modules
1 parent f4617b2 commit 4569325

5 files changed

Lines changed: 13 additions & 54 deletions

File tree

packages/tree-shaking-plugin/src/lib/resolvers/agnostic.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
1-
import type {
2-
QraftModuleAccess,
3-
QraftModuleAccessOptions,
4-
QraftResolver,
5-
} from './common.js';
1+
import type { QraftModuleAccess, QraftModuleAccessOptions } from './common.js';
62
import {
73
createQraftModuleAccess,
8-
createResolverChain,
94
createUserResolverStrategy,
105
createUserSourceLoaderStrategy,
116
} from './common.js';
127

13-
export function createAgnosticResolver(
14-
userResolve?: QraftResolver
15-
): QraftResolver {
16-
return createResolverChain([createUserResolverStrategy(userResolve)]);
17-
}
18-
198
export function createAgnosticModuleAccess(
209
userAccess: QraftModuleAccessOptions = {}
2110
): QraftModuleAccess {

packages/tree-shaking-plugin/src/lib/resolvers/esbuild.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type {
33
LoadStrategy,
44
QraftModuleAccess,
55
QraftModuleAccessOptions,
6-
QraftResolver,
76
ResolveStrategy,
87
} from './common.js';
98
import fs from 'node:fs/promises';
@@ -76,10 +75,3 @@ export function createEsbuildModuleAccess(
7675
]
7776
);
7877
}
79-
80-
export function createEsbuildResolver(
81-
ctx: BundlerResolveContext,
82-
userResolve?: QraftResolver
83-
): QraftResolver {
84-
return createEsbuildModuleAccess(ctx, { resolve: userResolve }).resolve;
85-
}

packages/tree-shaking-plugin/src/lib/resolvers/resolvers.test.ts

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@ import fs from 'node:fs/promises';
33
import os from 'node:os';
44
import path from 'node:path';
55
import { describe, expect, it, vi } from 'vitest';
6-
import {
7-
createAgnosticModuleAccess,
8-
createAgnosticResolver,
9-
} from './agnostic.js';
6+
import { createAgnosticModuleAccess } from './agnostic.js';
107
import { getQraftModuleAccessStrategyMetadata } from './common.js';
118
import { createEsbuildModuleAccess } from './esbuild.js';
129
import { createRollupLikeModuleAccess } from './rollup-like.js';
13-
import { createRspackModuleAccess, createRspackResolver } from './rspack.js';
14-
import {
15-
createWebpackLikeModuleAccess,
16-
createWebpackLikeResolver,
17-
} from './webpack-like.js';
10+
import { createRspackModuleAccess } from './rspack.js';
11+
import { createWebpackLikeModuleAccess } from './webpack-like.js';
1812

1913
async function mktemp() {
2014
return fs.mkdtemp(path.join(os.tmpdir(), 'qraft-resolver-'));
@@ -54,12 +48,12 @@ describe('resolver composition', () => {
5448
});
5549
});
5650

57-
it('uses only the custom resolver in the agnostic resolver chain', async () => {
51+
it('uses only the custom resolver in agnostic module access', async () => {
5852
const importer = path.join(await mktemp(), 'src.ts');
5953
const customResolve = vi.fn(async () => null);
60-
const resolver = createAgnosticResolver(customResolve);
54+
const access = createAgnosticModuleAccess({ resolve: customResolve });
6155

62-
await expect(resolver('./fallback', importer)).resolves.toBeNull();
56+
await expect(access.resolve('./fallback', importer)).resolves.toBeNull();
6357
expect(customResolve).toHaveBeenCalledWith('./fallback', importer);
6458
});
6559

@@ -193,10 +187,10 @@ describe('resolver composition', () => {
193187
},
194188
};
195189

196-
const resolver = createWebpackLikeResolver(ctx);
197-
await expect(resolver('@/generated-api', '/tmp/src/app.ts')).resolves.toBe(
198-
'/tmp/generated-api/index.ts'
199-
);
190+
const access = createWebpackLikeModuleAccess(ctx);
191+
await expect(
192+
access.resolve('@/generated-api', '/tmp/src/app.ts')
193+
).resolves.toBe('/tmp/generated-api/index.ts');
200194
expect(resolve).toHaveBeenCalledTimes(1);
201195
});
202196

@@ -222,7 +216,7 @@ describe('resolver composition', () => {
222216
);
223217
await fs.writeFile(path.join(srcDir, 'index.ts'), '');
224218

225-
const resolver = createRspackResolver({
219+
const access = createRspackModuleAccess({
226220
getNativeBuildContext() {
227221
return {
228222
framework: 'rspack',
@@ -239,7 +233,7 @@ describe('resolver composition', () => {
239233

240234
const expected = await fs.realpath(path.join(srcDir, 'index.ts'));
241235
await expect(
242-
resolver('@/generated-api', path.join(dir, 'src', 'app.ts'))
236+
access.resolve('@/generated-api', path.join(dir, 'src', 'app.ts'))
243237
).resolves.toBe(expected);
244238
});
245239

packages/tree-shaking-plugin/src/lib/resolvers/rspack.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import type {
44
LoadStrategy,
55
QraftModuleAccess,
66
QraftModuleAccessOptions,
7-
QraftResolver,
87
ResolveStrategy,
98
} from './common.js';
109
import path from 'node:path';
@@ -198,10 +197,3 @@ export function createRspackModuleAccess(
198197
]
199198
);
200199
}
201-
202-
export function createRspackResolver(
203-
ctx: BundlerResolveContext,
204-
userResolve?: QraftResolver
205-
): QraftResolver {
206-
return createRspackModuleAccess(ctx, { resolve: userResolve }).resolve;
207-
}

packages/tree-shaking-plugin/src/lib/resolvers/webpack-like.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import type {
33
LoadStrategy,
44
QraftModuleAccess,
55
QraftModuleAccessOptions,
6-
QraftResolver,
76
ResolveStrategy,
87
} from './common.js';
98
import path from 'node:path';
@@ -190,10 +189,3 @@ export function createWebpackLikeModuleAccess(
190189
]
191190
);
192191
}
193-
194-
export function createWebpackLikeResolver(
195-
ctx: WebpackLoaderContextLike,
196-
userResolve?: QraftResolver
197-
): QraftResolver {
198-
return createWebpackLikeModuleAccess(ctx, { resolve: userResolve }).resolve;
199-
}

0 commit comments

Comments
 (0)