diff --git a/.circleci/config.yml b/.circleci/config.yml
index 447fea7b1..78643d43a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -160,7 +160,7 @@ jobs:
       - run: bazel sync
 
       - run: |
-          BUNDLE_TARGETS=$(bazel query "attr(name, '_Bundles', //...)" --output label 2>/dev/null | tr '\n' ' ')
+          BUNDLE_TARGETS=$(bazel query "attr(name, '^.*_Bundles$', //...)" --output label 2>/dev/null | tr '\n' ' ')
           bazel build --config=ci $BUNDLE_TARGETS
 
       - run: bazel shutdown
diff --git a/index.bzl b/index.bzl
index dfd89f9cd..218dcc32f 100644
--- a/index.bzl
+++ b/index.bzl
@@ -120,6 +120,7 @@ def javascript_pipeline(
         test_data = include_if_unique(TEST_DATA + test_data, DATA + data),
         build_data = include_if_unique(BUILD_DATA + build_data, DATA + data),
         lint_data = include_if_unique(LINT_DATA + lint_data, DATA + data + TEST_DATA + test_data),
+        js_library_data = ["%s_Bundles" % library_name] if library_name else [],
         out_dir = out_dir,
         create_package_json_opts = {
             "base_package_json": "//tools:pkg_json_template",
diff --git a/xcode/Podfile b/xcode/Podfile
index d12c7aab8..0cdfd2bcf 100644
--- a/xcode/Podfile
+++ b/xcode/Podfile
@@ -39,7 +39,7 @@ target 'PlayerUI_Example' do
 end
 
 plugin 'cocoapods-resource-bundle-copier', {
-  'bazelCommand' => 'bazel',
+  'bazelCommand' => 'bazel shutdown && bazel',
   'resource_map' => {
     # Core
     "PlayerUI/PlayerUI" => {