diff --git a/etc/prepare-npm-package.mjs b/etc/prepare-npm-package.mjs index 4fa3cbb6..7191f254 100755 --- a/etc/prepare-npm-package.mjs +++ b/etc/prepare-npm-package.mjs @@ -68,15 +68,18 @@ function readPackageJson(packagePath) { } function collectAllInRepoDeps(packageName, workspaceIndex, visited = new Set()) { - const { workspacesInfo } = workspaceIndex - const info = workspacesInfo[packageName] + const { packageNames, nameToLocation } = workspaceIndex - if (!info) { + const packagePath = nameToLocation.get(packageName) + if (!packagePath) { return visited } - for (const depName of info.workspaceDependencies) { - if (!visited.has(depName)) { + const pkg = readPackageJson(packagePath) + const deps = Object.keys(pkg.dependencies || {}) + + for (const depName of deps) { + if (packageNames.has(depName) && !visited.has(depName)) { visited.add(depName) collectAllInRepoDeps(depName, workspaceIndex, visited) } @@ -165,7 +168,7 @@ async function bundleWithEsbuild(entryPoint, outputPath, externalDeps, options = target: 'node20', outfile: outputPath, external: externalDeps, - sourcemap: false, + sourcemap: 'inline', minify: false, keepNames: true, ...(banner && { banner: { js: banner } }), diff --git a/modules/build-raptor-core/src/step-by-step-transmitter.ts b/modules/build-raptor-core/src/step-by-step-transmitter.ts index 2a99b7aa..02da0d7d 100644 --- a/modules/build-raptor-core/src/step-by-step-transmitter.ts +++ b/modules/build-raptor-core/src/step-by-step-transmitter.ts @@ -28,7 +28,7 @@ export class StepByStepTransmitter { for (const p of this.stepByStepProcessors) { this.promises.push(Promise.resolve(p(parsed))) } - this.logger.print('transmitted') + this.logger.info('transmitted') } async close() {