Skip to content
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.

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

Bazel 6 Migration #252

Merged
merged 89 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
3ce6c14
Start of bazel 6 + vitest + rules_js migration
adierkens Nov 21, 2023
839d416
vitest + linting support
adierkens Nov 21, 2023
bb50f18
builds + package.json creation
adierkens Nov 22, 2023
18c7d28
All core tests passing
adierkens Nov 22, 2023
6cf2319
Plugins folder builds and tests working
adierkens Nov 28, 2023
19dd6b6
Use remote for rules repo
adierkens Nov 28, 2023
4a1c5e7
Update to newer deps. Remove unused deps
adierkens Nov 28, 2023
a426978
Add bundle info to packages
adierkens Nov 29, 2023
8748af5
Generate bundles for native
adierkens Dec 5, 2023
ab8699d
Split native bundles into separate target (#255)
adierkens Dec 6, 2023
ec7989b
[BAZEL-6] Add coverage support for JS files (#260)
adierkens Dec 8, 2023
32f20d6
iOS Bazel 6 (#261)
hborawski Dec 11, 2023
f2f3c53
Update storybook for bazel migration (#265)
adierkens Mar 6, 2024
cdbff07
iOS: Bazel 6 build updates (#262)
hborawski Apr 3, 2024
69aeabf
AsyncNodePlugin w/ bazel 6 (#269)
brocollie08 Apr 15, 2024
a95cb39
Bazel-6: Upload Codecov reports (#333)
hborawski Apr 17, 2024
17f6ab9
Fix managed player tests
KetanReddy Apr 18, 2024
efd2106
Build: Simplify iOS BUILD.bazel files with macros (#340)
hborawski Apr 19, 2024
f8e71e9
Merge branch 'main' into bazel-6 (#346)
sugarmanz Apr 24, 2024
fc22f9e
Merge branch 'main' into bazel-6
sugarmanz Apr 24, 2024
ab04dee
async node plugin ios updates
Apr 25, 2024
475c6b0
default to have AsyncNodePluginPlugin() on asyncnodeplugin init
Apr 25, 2024
92f4d8c
delete duplicate files, update readme
Apr 26, 2024
0a87caa
Enable build caching
adierkens Apr 26, 2024
2763ce5
update async node docs
Apr 26, 2024
98a8d91
Update ios/BUILD.bazel
nancywu1 Apr 29, 2024
2710793
Merge pull request #349 from player-ui/ios-async-node-plugin-updates
nancywu1 Apr 29, 2024
f3b4f8d
Specify some RC flags only for mac (#350)
hborawski Apr 29, 2024
4dfbcdb
add swift lint
May 8, 2024
a47c0c5
Update pnpm in contributing docs (#355)
mercillo May 8, 2024
c7943b1
[bazel-6] Convert docs build to basic webpack (#327)
adierkens May 17, 2024
2232260
swiftlint genrule as sh_test
May 22, 2024
b71dd11
export dummy file
May 22, 2024
e67e717
test lint violation
May 24, 2024
0840250
Merge branch 'bazel-6' into add-swiftlint-dep
nancywu1 May 28, 2024
8057385
missing \ in config.yml
May 28, 2024
b1a1867
lint test in ci
May 29, 2024
7bdcf5d
fix lint violations
May 29, 2024
d8b3f86
allow beacon ids from enum
May 29, 2024
b325e2e
fix violation
May 29, 2024
98db3eb
pass in swiftlint.yml through config flag
May 30, 2024
d3863d8
get storybook rendering again (#370)
hborawski May 30, 2024
708d47f
update swiftlint genrule
Jun 4, 2024
e252f46
iOS ReferenceAssetsPlugin: check registry type instead of player type…
hborawski Jun 4, 2024
7b52445
fixing test printing grep: lint_results.txt=0: No such file or directory
Jun 4, 2024
793e289
feedback
Jun 4, 2024
8c7089e
stamp podspec again with version (#374)
hborawski Jun 4, 2024
a1bcda6
Merge branch 'bazel-6' into add-swiftlint-dep
hborawski Jun 5, 2024
23fa863
Implemented choice asset.
mrigankmg Jun 5, 2024
42d21b1
Merge pull request #364 from player-ui/add-swiftlint-dep
nancywu1 Jun 5, 2024
982da97
Merge pull request #367 from player-ui/choice-asset
mrigankmg Jun 5, 2024
463655a
using rules_player ios common utils
Jun 6, 2024
0bbeb94
update readme
Jun 6, 2024
c1b8a1b
point to PR commit
Jun 7, 2024
a7f9b32
use updated commit from merge
Jun 10, 2024
2b4916f
Merge pull request #377 from player-ui/using-rules_player_common_utils
nancywu1 Jun 10, 2024
d0be2bd
iOS - Use reference assets in swiftui tests (#368)
nancywu1 Jun 10, 2024
b39edf1
Ayncnode comments cleanup (#385)
sakuntala-motukuri Jun 12, 2024
e6cc765
update readme
Jun 13, 2024
7d38b65
Merge pull request #386 from player-ui/update-ios-development-docs
nancywu1 Jun 14, 2024
1f3b30a
This PR fixes the Ability to resolve with nothing issue (#389)
sakuntala-motukuri Jun 24, 2024
0eca6b6
Bazel 6 JVM + Android (#391)
brocollie08 Jul 9, 2024
0d73d02
working bazel test //core/player:player_eslint
mercillo Jul 9, 2024
855a869
Merge pull request #416 from player-ui/staticSwitchTestNoFork
mercillo Jul 9, 2024
1a8ba38
resolve merge conflicts
mercillo Jul 9, 2024
caec72f
fix merge and eslint
mercillo Jul 9, 2024
136243c
Merge branch 'bazel-6' into bazel6-mergeConflicts
mercillo Jul 9, 2024
383234c
only include mock in manifest if json (we don't support on demand com…
sugarmanz Jul 10, 2024
bc18da2
Use m1 medium
adierkens Jul 10, 2024
d12309e
merge conflicts
mercillo Jul 10, 2024
dbc48c2
fix tests
mercillo Jul 10, 2024
c2f21f9
fix async node sync
mercillo Jul 10, 2024
39b9ad0
validation test sync with bazel-6 branch
mercillo Jul 10, 2024
badaf33
fix validation.test.ts
mercillo Jul 10, 2024
08183f2
re-enable failing test
brocollie08 Jul 10, 2024
ec31b1c
Back to m1 large
adierkens Jul 10, 2024
df90a2c
Merge branch 'bazel-6' of github.com:player-ui/player into bazel6-mer…
mercillo Jul 10, 2024
2b7df81
change medium to large
mercillo Jul 10, 2024
c5799e7
fixed async node types
mercillo Jul 10, 2024
aa39855
Merge pull request #417 from player-ui/bazel6-mergeConflicts
KetanReddy Jul 11, 2024
778ab79
use original mock for action transition error
brocollie08 Jul 11, 2024
ab13004
import in UI test
brocollie08 Jul 11, 2024
9e2cdb8
Merge branch 'main' of https://github.com/player-ui/player into bazel-6
KetanReddy Jul 11, 2024
b5e0921
Update rules to spec release
KetanReddy Jul 11, 2024
29b75c1
Merge branch 'bazel-6' of https://github.com/player-ui/player into ba…
KetanReddy Jul 11, 2024
7f9da4b
Fix nodeId in async node test
KetanReddy Jul 12, 2024
b92b16a
done
brocollie08 Jul 12, 2024
cd38fa1
Use release version of rules
KetanReddy Jul 12, 2024
55d59d6
apply typings fix to other hooks (#423)
sugarmanz Jul 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
48 changes: 43 additions & 5 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,46 @@ profile
DerivedData
*.hmap
*.ipa
xcode/Pods/
CoverageData/
bep.json
xcui.json
ios/*/*/Resources/**/*.js

core/make-flow/node_modules
core/types/node_modules
core/partial-match-registry/node_modules
core/player/node_modules
plugins/beacon/core/node_modules
plugins/metrics/core/node_modules
plugins/metrics/react/node_modules
react/player/node_modules
react/subscribe/node_modules
plugins/asset-provider/react/node_modules
plugins/asset-transform/core/node_modules
plugins/async-node/core/node_modules
plugins/common-types/core/node_modules
plugins/types-provider/core/node_modules
plugins/auto-scroll/react/node_modules
plugins/beacon/react/node_modules
plugins/check-path/core/node_modules
plugins/check-path/react/node_modules
plugins/common-expressions/core/node_modules
plugins/computed-properties/core/node_modules
plugins/console-logger/core/node_modules
plugins/data-change-listener/core/node_modules
plugins/data-filter/core/node_modules
plugins/expression/core/node_modules
plugins/external-action/core/node_modules
plugins/markdown/core/node_modules
plugins/meta-plugin/core/node_modules
plugins/partial-match-fingerprint/core/node_modules
plugins/pubsub/core/node_modules
plugins/reference-assets/components/node_modules
plugins/reference-assets/cli-preset/node_modules
plugins/reference-assets/core/node_modules
plugins/reference-assets/react/node_modules
plugins/shared-constants/core/node_modules
plugins/stage-revert-data/core/node_modules
tools/asset-testing-library/core/node_modules
docs/storybook/node_modules
plugins/reference-assets/mocks/node_modules
tools/addon-storybook/node_modules
tools/components/node_modules
tools/mocks/node_modules
docs/site/node_modules
34 changes: 11 additions & 23 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
# Use embedded JDK
build --repo_env=JAVA_HOME=../bazel_tools/jdk
common --enable_bzlmod
test --test_output=errors
coverage --combined_report=lcov

build:ci --experimental_remote_cache_compression --experimental_remote_cache_async
test:ci --experimental_remote_cache_compression --experimental_remote_cache_async
coverage:ci --experimental_remote_cache_compression --experimental_remote_cache_async

# TODO: Migrate away from managed directories (https://github.com/bazelbuild/bazel/issues/15463)
# TODO: Re-upgrade to Bazel 6.+
# sync --noincompatible_disable_managed_directories
# query --noincompatible_disable_managed_directories
# build --noincompatible_disable_managed_directories
# TODO: Custom compiler version breaks embedded jdeps generator plugin - enable when removing custom kotlinc
build --@rules_kotlin//kotlin/settings:jvm_emit_jdeps=False

# Android databinding flags
# TODO: Verify the follow doesn't break host compil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't -- can remove

build --android_crosstool_top=@androidndk//:toolchain
build --experimental_android_databinding_v2
build --android_databinding_use_v3_4_args
build --android_databinding_use_androidx
Expand Down Expand Up @@ -54,27 +48,18 @@ coverage --build_metadata=REPO_URL=https://github.com/player-ui/player.git

build:ci --build_metadata=ROLE=CI --workspace_status_command=./scripts/workspace-status.sh

# Circle large has 4 CPU cores/8GB mem
# Circle xlarge has 8 CPU cores/16GB mem
build:ci --local_cpu_resources=8
build:ci --local_ram_resources=15000
build:ci --config="release"
# Circle macos.m1.large.gen1 8 cores 12gb ram
common:ci-mac --config=ci --local_cpu_resources=8 --local_ram_resources=11000

build:release --stamp --workspace_status_command=./scripts/workspace-status.sh

# Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
# build --disk_cache=~/.cache/bazel-disk-cache

build:skip-ios -- \
-//:PlayerUI \
-//:PlayerUI_Pod \
-//:PlayerUI-Demo \
-//:PlayerUI-Unit-Unit \
-//:PlayerUI-Unit-Unit.__internal__.__test_bundle \
-//:PlayerUI-UI-ViewInspectorTests \
-//:PlayerUI-UI-ViewInspectorTests.__internal__.__test_bundle \
-//:PlayerUI-UI-XCUITests \
-//:PlayerUI-UI-XCUITests.__internal__.__test_bundle

# Support for debugging NodeJS tests
# Add the Bazel option `--config=debug` to enable this
# --test_output=streamed
Expand Down Expand Up @@ -105,5 +90,8 @@ run:debug --define=VERBOSE_LOGS=1 -- --node_options=--inspect-brk
# The following option will change the build output of certain rules such as terser and may not be desirable in all cases
build:debug --compilation_mode=dbg

build --@aspect_rules_ts//ts:skipLibCheck=always
fetch --@aspect_rules_ts//ts:skipLibCheck=always
query --@aspect_rules_ts//ts:skipLibCheck=always

try-import %workspace%/.bazelrc.local
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.4.1
6.4.0
Loading