fix: ensure bundleddeps are correctly included in dist (#620)

aws · Oct 30, 2023 · 8709f3e · 8709f3e
1 parent 8e7b8b5
commit 8709f3e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 35 deletions.
diff --git a/packages/pdk/.projen/deps.json b/packages/pdk/.projen/deps.json
diff --git a/packages/pdk/package.json b/packages/pdk/package.json
diff --git a/projenrc/projects/pdk-project.ts b/projenrc/projects/pdk-project.ts
@@ -139,8 +139,8 @@ export class PdkProject extends PDKProject {
     );
     jsiiProjects?.forEach((subProject) => {
       this.copyProjectSource(subProject);
-      this.addProjectDeps(subProject);
     });
+    this.addProjectDeps((jsiiProjects || []).flatMap((p) => p.deps.all));
     this.emitIndexFile(jsiiProjects);
   }
 
@@ -201,14 +201,21 @@ export class PdkProject extends PDKProject {
     );
   }
 
-  private addProjectDeps(project: JsiiProject) {
-    project.deps.all
+  private addProjectDeps(deps: Dependency[]) {
+    const bundledDeps = new Set(
+      deps
+        .filter((dep) => dep.type === DependencyType.BUNDLED)
+        .map((dep) => dep.name)
+    );
+
+    deps
       .filter((dep) => !dep.name.startsWith(PDK_NAMESPACE))
       .forEach((dep) => {
         switch (dep.type) {
           case DependencyType.BUILD:
           case DependencyType.TEST:
-            this.addDevDeps(this.renderDependency(dep));
+            !bundledDeps.has(dep.name) &&
+              this.addDevDeps(this.renderDependency(dep));
             break;
           case DependencyType.BUNDLED:
             this.addBundledDeps(this.renderDependency(dep));