Skip to content

Commit

Permalink
Merge pull request #73 from player-ui/maint/update-js-rules
Browse files Browse the repository at this point in the history
Update JS Rules to Latest
  • Loading branch information
KetanReddy authored Aug 30, 2024
2 parents bbe1d01 + da821c8 commit 90169ea
Show file tree
Hide file tree
Showing 8 changed files with 1,236 additions and 1,776 deletions.
3 changes: 0 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
version: 2.1

orbs:
node: circleci/[email protected]

executors:
base:
docker:
Expand Down
12 changes: 6 additions & 6 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ module(
)

bazel_dep(name = "cgrindel_bazel_starlib", version = "0.21.0")
bazel_dep(name = "aspect_bazel_lib", version = "1.38.1")
bazel_dep(name = "aspect_rules_js", version = "1.34.0")
bazel_dep(name = "aspect_bazel_lib", version = "2.8.0")
bazel_dep(name = "aspect_rules_js", version = "2.0.0")
bazel_dep(name = "aspect_rules_rollup", version = "1.0.0")
bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "rules_pkg", version = "0.9.1")
bazel_dep(name = "aspect_rules_ts", version = "2.1.0")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "aspect_rules_ts", version = "3.0.0")
bazel_dep(name = "platforms", version = "0.0.9")

rules_ts_ext = use_extension(
Expand Down Expand Up @@ -50,7 +50,7 @@ use_repo(maven, "rules_player_maven")
## Rule Dependencies
bazel_dep(name = "rules_swift", version = "1.18.0", repo_name = "build_bazel_rules_swift")
bazel_dep(name = "rules_apple", version = "3.5.1", repo_name = "build_bazel_rules_apple")
bazel_dep(name = "rules_ios", version = "4.3.1", repo_name = "build_bazel_rules_ios")
bazel_dep(name = "rules_ios", version = "4.8.2", repo_name = "build_bazel_rules_ios")

bazel_dep(name = "rules_bazel_integration_test", version = "0.24.1", dev_dependency = True)

Expand Down
1 change: 1 addition & 0 deletions examples/ts-monorepo/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ npm.npm_translate_lock(
],
pnpm_lock = "//:pnpm-lock.yaml",
verify_node_modules_ignored = "//:.bazelignore",
npm_package_target_name = "{dirname}"
)
use_repo(npm, "npm")
4 changes: 2 additions & 2 deletions javascript/private/utils.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ def include_exts(files, file_patterns):
return filter_false([f if is_test_file(f, file_patterns) else None for f in files])

def get_js_npm_name(dep):
linked_list = dep[JsInfo].npm_linked_packages.to_list()
linked_list = dep[JsInfo].npm_package_store_infos.to_list()
if len(linked_list) > 1:
fail("Package {} has more than one linked package".format(dep))
fail("Package {} has more than one linked package".format(dep[JsInfo].npm_package_store_infos.to_list()))

return linked_list[0].package

Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@
"pnpm": "^8.9.2"
},
"devDependencies": {
"@auto-it/git-tag": "^10.37.1",
"@auto-it/released": "^10.37.1",
"auto": "^10.37.1"
"@auto-it/git-tag": "^11.2.0",
"@auto-it/released": "^11.2.0",
"auto": "^11.2.0"
},
"volta": {
"node": "20.17.0",
"yarn": "1.22.22"
}
}
4 changes: 2 additions & 2 deletions player/private/config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ def _create_base_config_impl(ctx):
tmpl_presets = []

for plugin in ctx.attr.plugins:
linked_list = plugin[JsInfo].npm_linked_packages.to_list()
linked_list = plugin[JsInfo].npm_package_store_infos.to_list()
if len(linked_list) > 1:
fail("Plugin {} has more than one linked package".format(plugin))

tmpl_plugins.append(linked_list[0].package)

for plugin in ctx.attr.presets:
linked_list = plugin[JsInfo].npm_linked_packages.to_list()
linked_list = plugin[JsInfo].npm_package_store_infos.to_list()
if len(linked_list) > 1:
fail("Plugin {} has more than one linked package".format(plugin))

Expand Down
Loading

0 comments on commit 90169ea

Please sign in to comment.