diff --git a/bun.lockb b/bun.lockb index 3196930..03921e1 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/go.mod b/go.mod index 6ce9fbd..29ff777 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ module github.com/innoai-tech/nodekit -go 1.22 +go 1.22.0 -require github.com/innoai-tech/infra v0.0.0-20240409092445-14e2edfb89e5 +toolchain go1.22.2 + +require github.com/innoai-tech/infra v0.0.0-20240419085449-ba372ee970da require ( cuelang.org/go v0.8.1 // indirect @@ -14,7 +16,7 @@ require ( github.com/fatih/color v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-courier/logr v0.3.0 // indirect - github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 // indirect + github.com/go-json-experiment/json v0.0.0-20240418180308-af2d5061e6c2 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/google/uuid v1.6.0 // indirect @@ -22,14 +24,14 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/octohelm/courier v0.0.0-20240409065337-58f586c9d64c // indirect + github.com/octohelm/courier v0.0.0-20240419085324-367eabf18c5e // indirect github.com/octohelm/gengo v0.0.0-20240409082121-aeffa5400f19 // indirect github.com/octohelm/x v0.0.0-20240219080259-91528f21e203 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.52.2 // indirect - github.com/prometheus/procfs v0.13.0 // indirect + github.com/prometheus/common v0.53.0 // indirect + github.com/prometheus/procfs v0.14.0 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opentelemetry.io/otel v1.25.0 // indirect @@ -40,7 +42,7 @@ require ( go.opentelemetry.io/otel/log v0.1.0-alpha // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect - go.opentelemetry.io/otel/sdk/log v0.0.0-20240409082250-b9752eb5dc19 // indirect + go.opentelemetry.io/otel/sdk/log v0.0.0-20240419171711-1ea4ee2717aa // indirect go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect go.opentelemetry.io/proto/otlp v1.2.0 // indirect @@ -51,8 +53,8 @@ require ( golang.org/x/term v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.20.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index aaba213..4532422 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/go-courier/logr v0.3.0 h1:0VEQB1b53EmYQ+ZehrIgD8l2IO+WX7TY+CqzlykIFmo github.com/go-courier/logr v0.3.0/go.mod h1:OI7f/JCFZ1ZMD5qG3bIJr5WMNnGzd24+II1D9D9w5x4= github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0 h1:ymLjT4f35nQbASLnvxEde4XOBL+Sn7rFuV+FOJqkljg= github.com/go-json-experiment/json v0.0.0-20231102232822-2e55bd4e08b0/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA= +github.com/go-json-experiment/json v0.0.0-20240418180308-af2d5061e6c2 h1:lhCu2IkNoFfDdcjHos2ZtLdAsyxLZbkpijNzhvvM6BY= +github.com/go-json-experiment/json v0.0.0-20240418180308-af2d5061e6c2/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -42,6 +44,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/innoai-tech/infra v0.0.0-20240409092445-14e2edfb89e5 h1:d4SVldJXrJi0LzALxym7DcsvS60nZeDZCixQwxiGC0A= github.com/innoai-tech/infra v0.0.0-20240409092445-14e2edfb89e5/go.mod h1:z40p1ieE9gCw0TZjibCLn3b2zrvBIAcBrjcWS/+e+MA= +github.com/innoai-tech/infra v0.0.0-20240419085449-ba372ee970da h1:h0QX0PbKGu9zW9udegGqV0kW7Wt+iJqLYZCqp0whSA4= +github.com/innoai-tech/infra v0.0.0-20240419085449-ba372ee970da/go.mod h1:hcWePxqViPL4daoj3sIm12XIl2aleBdwewn5/Cvrsd4= github.com/juju/ansiterm v1.0.0 h1:gmMvnZRq7JZJx6jkfSq9/+2LMrVEwGwt7UR6G+lmDEg= github.com/juju/ansiterm v1.0.0/go.mod h1:PyXUpnI3olx3bsPcHt98FGPX/KCFZ1Fi+hw1XLI6384= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= @@ -63,6 +67,8 @@ github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQ github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/octohelm/courier v0.0.0-20240409065337-58f586c9d64c h1:UE2/8zQheC5sLjT3hsd0f/KKWmgdNUkdw9nhAoZYaVU= github.com/octohelm/courier v0.0.0-20240409065337-58f586c9d64c/go.mod h1:pYLVU0csQKN91hCmXfmtdMrPjWzu0BcGTf5Ma7elLKQ= +github.com/octohelm/courier v0.0.0-20240419085324-367eabf18c5e h1:gkQSF1EYCkRkl1xv7kC1ZWqhAurFZ8xO18yufjsTV0s= +github.com/octohelm/courier v0.0.0-20240419085324-367eabf18c5e/go.mod h1:qX5KPpwSjqYXE7uPnirUHVF6NA1QRgXXyrcW0FiK9ko= github.com/octohelm/gengo v0.0.0-20240409082121-aeffa5400f19 h1:l8ahFVtDhXAcKFmR1/6Sevs1R71Kai7dfp95ZlG7raY= github.com/octohelm/gengo v0.0.0-20240409082121-aeffa5400f19/go.mod h1:Q0f7oofuZJ6T2vk5vsXgjKwKNlOJO0TTrjGfA9yRJwA= github.com/octohelm/storage v0.0.0-20240309041530-950a8155cecf h1:4nYa5jmuEYkP4xN3DbNVikjXmwevde07JwZPXMgn+oI= @@ -85,8 +91,12 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck= github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q= +github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= +github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= +github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= +github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0 h1:sadMIsgmHpEOGbUs6VtHBXRR1OHevnj7hLx9ZcdNGW4= github.com/protocolbuffers/txtpbfmt v0.0.0-20230328191034-3462fbc510c0/go.mod h1:jgxiZysxFPM+iWKwQwPR+y+Jvo54ARd4EisXxKYpB5c= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= @@ -116,6 +126,8 @@ go.opentelemetry.io/otel/sdk v1.25.0 h1:PDryEJPC8YJZQSyLY5eqLeafHtG+X7FWnf3aXMtx go.opentelemetry.io/otel/sdk v1.25.0/go.mod h1:oFgzCM2zdsxKzz6zwpTZYLLQsFwc+K0daArPdIhuxkw= go.opentelemetry.io/otel/sdk/log v0.0.0-20240409082250-b9752eb5dc19 h1:BV8ZTerNMlMsdma81/IKCTJjPI0/lIxT9Y0yahUV2GY= go.opentelemetry.io/otel/sdk/log v0.0.0-20240409082250-b9752eb5dc19/go.mod h1:hhtugoOtNL5LhgMYdSshVsCw6VqcKLlQGnhlq5YroMc= +go.opentelemetry.io/otel/sdk/log v0.0.0-20240419171711-1ea4ee2717aa h1:8AGGmGngL46AECWaX20HPVNKfVq0/VqELJ6dUX5Tg90= +go.opentelemetry.io/otel/sdk/log v0.0.0-20240419171711-1ea4ee2717aa/go.mod h1:hhtugoOtNL5LhgMYdSshVsCw6VqcKLlQGnhlq5YroMc= go.opentelemetry.io/otel/sdk/metric v1.25.0 h1:7CiHOy08LbrxMAp4vWpbiPcklunUshVpAvGBrdDRlGw= go.opentelemetry.io/otel/sdk/metric v1.25.0/go.mod h1:LzwoKptdbBBdYfvtGCzGwk6GWMA3aUzBOwtQpR6Nz7o= go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM= @@ -144,8 +156,12 @@ golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda h1:b6F6WIV4xHHD0FA4oIyzU6mHWg2WI2X1RBehwa5QN38= google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda/go.mod h1:AHcE/gZH76Bk/ROZhQphlRoWo5xKDEtz3eVEO1LfA8c= +google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be h1:Zz7rLWqp0ApfsR/l7+zSHhY3PMiH2xqgxlfYfAfNpoU= +google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be/go.mod h1:dvdCTIoAGbkWbcIKBniID56/7XHTt6WfxXNMxuziJ+w= google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/nodedevpkg/monobundle/package.json b/nodedevpkg/monobundle/package.json index 6b3450a..5ac8885 100644 --- a/nodedevpkg/monobundle/package.json +++ b/nodedevpkg/monobundle/package.json @@ -1,6 +1,6 @@ { "name": "@innoai-tech/monobundle", - "version": "0.13.5", + "version": "0.13.8", "monobundle": { "exports": { ".": "./src/index.ts", @@ -35,6 +35,7 @@ }, "exports": { ".": { + "bun": "./src/index.ts", "import": { "types": "./src/index.ts", "default": "./dist/index.mjs" diff --git a/nodedevpkg/monobundle/src/bundle.ts b/nodedevpkg/monobundle/src/bundle.ts index 8243244..c639188 100644 --- a/nodedevpkg/monobundle/src/bundle.ts +++ b/nodedevpkg/monobundle/src/bundle.ts @@ -199,6 +199,7 @@ const genExportsAndBin = (options?: MonoBundleOptions) => { } set(pkg, ["exports", e], { + bun: `${entryFile}`, import: { types: `${entryFile}`, default: `./dist/${distName}.mjs`, diff --git a/nodedevpkg/purebundle/Cargo.lock b/nodedevpkg/purebundle/Cargo.lock index 66618a3..e287478 100644 --- a/nodedevpkg/purebundle/Cargo.lock +++ b/nodedevpkg/purebundle/Cargo.lock @@ -1234,9 +1234,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.90.30" +version = "0.90.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7651ba172f4a82cd6f27b73e51d363e9b32aa97b9f6aab2e63e58f4df9ea62" +checksum = "00d9cda43879bcad1ac5bbb6007daae421d4b6177ad22e29213878a9a910d824" dependencies = [ "once_cell", "swc_atoms", diff --git a/nodedevpkg/purebundle/Cargo.toml b/nodedevpkg/purebundle/Cargo.toml index ea71dd9..1d8d4ed 100644 --- a/nodedevpkg/purebundle/Cargo.toml +++ b/nodedevpkg/purebundle/Cargo.toml @@ -11,7 +11,7 @@ lto = true [dependencies] serde = { version = "1", features = ["derive"] } -swc_core = { version = "0.90.28", features = ["ecma_plugin_transform", "__parser"] } +swc_core = { version = "0.90.36", features = ["ecma_plugin_transform", "__parser"] } swc_ecma_utils = { version = "0" } [dev-dependencies] diff --git a/nodepkg/config/package.json b/nodepkg/config/package.json index 3f82c70..b80d01e 100644 --- a/nodepkg/config/package.json +++ b/nodepkg/config/package.json @@ -18,18 +18,21 @@ ], "exports": { ".": { + "bun": "./src/index.ts", "import": { "types": "./src/index.ts", "default": "./dist/index.mjs" } }, "./loader": { + "bun": "./src/loader/index.ts", "import": { "types": "./src/loader/index.ts", "default": "./dist/loader.mjs" } }, "./vite-plugin-inject-config": { + "bun": "./src/vite-plugin-inject-config/index.ts", "import": { "types": "./src/vite-plugin-inject-config/index.ts", "default": "./dist/vite-plugin-inject-config.mjs" diff --git a/nodepkg/fetcher/package.json b/nodepkg/fetcher/package.json index 31299bb..e734847 100644 --- a/nodepkg/fetcher/package.json +++ b/nodepkg/fetcher/package.json @@ -14,6 +14,7 @@ }, "exports": { ".": { + "bun": "./src/index.ts", "import": { "types": "./src/index.ts", "default": "./dist/index.mjs" diff --git a/nodepkg/lodash/package.json b/nodepkg/lodash/package.json index 4f5feb3..9a7dc15 100644 --- a/nodepkg/lodash/package.json +++ b/nodepkg/lodash/package.json @@ -1,26 +1,20 @@ { "name": "@innoai-tech/lodash", - "version": "0.2.1", + "version": "0.2.4", "dependencies": { - "@types/lodash-es": "^4.17.12", "lodash": "^4.17.21", + "@types/lodash-es": "^4.17.x", "lodash-es": "^4.17.21" }, "exports": { ".": { - "bun": { - "import": { - "types": "./index.d.ts", - "default": "./index.mjs" - }, - "require": { - "types": "./index.d.ts", - "default": "./index.cjs" - } - }, "import": { "types": "./index.d.ts", "default": "./index.mjs" + }, + "require": { + "types": "./index.d.ts", + "default": "./index.cjs" } } },