Skip to content

[pull] main from esm-dev:main #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 7, 2026
Merged

[pull] main from esm-dev:main #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
deno-version: [1.x, 2.x]
deno-version: [1.x, 2.7.x]

steps:
- name: Checkout
Expand Down
17 changes: 3 additions & 14 deletions internal/npm/package_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"path"
"strings"

"github.com/ije/gox/set"
Expand Down Expand Up @@ -72,7 +71,7 @@ type PackageJSON struct {
// ToNpmPackage converts PackageJSONRaw to PackageJSON
func (a *PackageJSONRaw) ToNpmPackage() *PackageJSON {
browser := map[string]string{}
if a.Browser.str != "" && hasModuleExt(a.Browser.str) {
if a.Browser.str != "" {
browser["."] = a.Browser.str
}
if a.Browser.object != nil {
Expand Down Expand Up @@ -119,7 +118,7 @@ func (a *PackageJSONRaw) ToNpmPackage() *PackageJSON {
if s, ok := a.SideEffects.(string); ok {
if s == "false" {
sideEffectsFalse = true
} else if hasModuleExt(s) {
} else {
sideEffects = set.New(s)
}
} else if b, ok := a.SideEffects.(bool); ok {
Expand All @@ -128,7 +127,7 @@ func (a *PackageJSONRaw) ToNpmPackage() *PackageJSON {
if len(m) > 0 {
sideEffects = set.New[string]()
for _, v := range m {
if name, ok := v.(string); ok && hasModuleExt(name) {
if name, ok := v.(string); ok {
sideEffects.Add(name)
}
}
Expand Down Expand Up @@ -419,16 +418,6 @@ func (a *JSONAny) String() string {
return ""
}

// hasModuleExt
func hasModuleExt(s string) bool {
switch path.Ext(s) {
case ".js", ".mjs", ".cjs", ".jsx", ".ts", ".mts", ".cts", ".tsx":
return true
default:
return false
}
}

// asMap converts any value to a map[string]any, if the value is not a map[string]any, return nil
func asMap(v any) map[string]any {
if m, ok := v.(map[string]any); ok {
Expand Down
Loading
Loading