Fix dts build

esm-dev · Apr 5, 2023 · b058371 · b058371
1 parent 7182b46
commit b058371
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/server/build.go b/server/build.go
@@ -90,13 +90,8 @@ func (task *BuildTask) build() (esm *ESMBuild, err error) {
 	}
 
 	if task.Target == "types" {
-		var dts string
-		if endsWith(task.Pkg.FullSubmodule, ".d.ts", ".d.mts") && !endsWith(task.Pkg.FullSubmodule, "~.d.ts") {
-			dts = npm.Name + "@" + npm.Version + path.Join("/", task.Pkg.FullSubmodule)
-		} else if npm.Types != "" {
-			dts = npm.Name + "@" + npm.Version + path.Join("/", npm.Types)
-		}
-		if dts != "" {
+		if npm.Types != "" {
+			dts := npm.Name + "@" + npm.Version + path.Join("/", npm.Types)
 			task.stage = "transform-dts"
 			task.buildDTS(dts)
 		}

diff --git a/server/build_helpers.go b/server/build_helpers.go
@@ -139,7 +139,7 @@ func (task *BuildTask) analyze() (esm *ESMBuild, npm NpmPackage, reexport string
 	}
 
 	if pkg.Submodule != "" {
-		if strings.HasSuffix(pkg.Submodule, ".d.ts") {
+		if endsWith(pkg.Submodule, ".d.ts", ".d.mts") {
 			if strings.HasSuffix(pkg.Submodule, "~.d.ts") {
 				submodule := strings.TrimSuffix(pkg.Submodule, "~.d.ts")
 				subDir := path.Join(wd, "node_modules", npm.Name, submodule)