Skip to content

Commit 925746b

Browse files
jbedardAndrewKushnir
authored andcommitted
fix(bazel): fix incorrect rollup plugin method signature (#41101)
Update the resolveBazel method signature to align with the rollup plugin resolveId API: https://rollupjs.org/guide/en/#resolveid PR Close #41101
1 parent 129d4f4 commit 925746b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

packages/bazel/src/ng_package/rollup.config.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,16 @@ function fileExists(filePath) {
4949

5050
// This resolver mimics the TypeScript Path Mapping feature, which lets us resolve
5151
// modules based on a mapping of short names to paths.
52-
function resolveBazel(
53-
importee, importer, baseDir = process.cwd(), resolve = require.resolve, root = rootDir) {
52+
function resolveBazel(importee, importer) {
5453
log_verbose(`resolving '${importee}' from ${importer}`);
5554

55+
const baseDir = process.cwd();
56+
5657
function resolveInRootDir(importee) {
57-
var candidate = path.join(baseDir, root, importee);
58+
var candidate = path.join(baseDir, rootDir, importee);
5859
log_verbose(`try to resolve '${importee}' at '${candidate}'`);
5960
try {
60-
var result = resolve(candidate);
61+
var result = require.resolve(candidate);
6162
return result;
6263
} catch (e) {
6364
return undefined;
@@ -80,7 +81,7 @@ function resolveBazel(
8081
// relative import
8182
if (importer) {
8283
let importerRootRelative = path.dirname(importer);
83-
const relative = path.relative(path.join(baseDir, root), importerRootRelative);
84+
const relative = path.relative(path.join(baseDir, rootDir), importerRootRelative);
8485
if (!relative.startsWith('.')) {
8586
importerRootRelative = relative;
8687
}

0 commit comments

Comments
 (0)