Skip to content

Commit 5382d3f

Browse files
committed
move engine-related code to separate files
1 parent 3f97a32 commit 5382d3f

File tree

5 files changed

+54
-44
lines changed

5 files changed

+54
-44
lines changed

pkg/api/api.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -164,19 +164,6 @@ const (
164164
FormatESModule
165165
)
166166

167-
type EngineName uint8
168-
169-
const (
170-
EngineChrome EngineName = iota
171-
EngineEdge
172-
EngineFirefox
173-
EngineIE
174-
EngineIOS
175-
EngineNode
176-
EngineOpera
177-
EngineSafari
178-
)
179-
180167
type Engine struct {
181168
Name EngineName
182169
Version string

pkg/api/api_impl.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -329,26 +329,7 @@ func validateFeatures(log logger.Log, target Target, engines []Engine) (config.T
329329
if patch, err := strconv.Atoi(match[3]); err == nil {
330330
version = append(version, patch)
331331
}
332-
switch engine.Name {
333-
case EngineChrome:
334-
constraints[compat.Chrome] = version
335-
case EngineEdge:
336-
constraints[compat.Edge] = version
337-
case EngineFirefox:
338-
constraints[compat.Firefox] = version
339-
case EngineIE:
340-
constraints[compat.IE] = version
341-
case EngineIOS:
342-
constraints[compat.IOS] = version
343-
case EngineNode:
344-
constraints[compat.Node] = version
345-
case EngineOpera:
346-
constraints[compat.Opera] = version
347-
case EngineSafari:
348-
constraints[compat.Safari] = version
349-
default:
350-
panic("Invalid engine name")
351-
}
332+
constraints[convertEngineName(engine.Name)] = version
352333
continue
353334
}
354335
}

pkg/api/api_js_table.go

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package api
2+
3+
import "github.com/evanw/esbuild/internal/compat"
4+
5+
type EngineName uint8
6+
7+
const (
8+
EngineChrome EngineName = iota
9+
EngineEdge
10+
EngineFirefox
11+
EngineIE
12+
EngineIOS
13+
EngineNode
14+
EngineOpera
15+
EngineSafari
16+
)
17+
18+
func convertEngineName(engine EngineName) compat.Engine {
19+
switch engine {
20+
case EngineChrome:
21+
return compat.Chrome
22+
case EngineEdge:
23+
return compat.Edge
24+
case EngineFirefox:
25+
return compat.Firefox
26+
case EngineIE:
27+
return compat.IE
28+
case EngineIOS:
29+
return compat.IOS
30+
case EngineNode:
31+
return compat.Node
32+
case EngineOpera:
33+
return compat.Opera
34+
case EngineSafari:
35+
return compat.Safari
36+
default:
37+
panic("Invalid engine name")
38+
}
39+
}

pkg/cli/cli_impl.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -886,17 +886,6 @@ func parseTargets(targets []string, arg string) (target api.Target, engines []ap
886886
"es2022": api.ES2022,
887887
}
888888

889-
validEngines := map[string]api.EngineName{
890-
"chrome": api.EngineChrome,
891-
"edge": api.EngineEdge,
892-
"firefox": api.EngineFirefox,
893-
"ie": api.EngineIE,
894-
"ios": api.EngineIOS,
895-
"node": api.EngineNode,
896-
"opera": api.EngineOpera,
897-
"safari": api.EngineSafari,
898-
}
899-
900889
outer:
901890
for _, value := range targets {
902891
if valid, ok := validTargets[strings.ToLower(value)]; ok {

pkg/cli/cli_js_table.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package cli
2+
3+
import "github.com/evanw/esbuild/pkg/api"
4+
5+
var validEngines = map[string]api.EngineName{
6+
"chrome": api.EngineChrome,
7+
"edge": api.EngineEdge,
8+
"firefox": api.EngineFirefox,
9+
"ie": api.EngineIE,
10+
"ios": api.EngineIOS,
11+
"node": api.EngineNode,
12+
"opera": api.EngineOpera,
13+
"safari": api.EngineSafari,
14+
}

0 commit comments

Comments
 (0)