From cccf23a079de8e32c2a942267316ad814a9f5a1b Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Wed, 25 Sep 2024 10:15:57 +0200 Subject: [PATCH] chore: Support Jetbrains IDEs 243 - temporarily disable BlazeTypeScriptConfigLibraryUpdater for 243 (#6795) (cherry picked from commit 0a6f4f125ea4b79477d8ee2d881d0c52f5ae542c) --- javascript/BUILD | 23 ++++++++++++++----- .../src/META-INF/javascript-contents-243.xml | 23 +++++++++++++++++++ .../src/META-INF/javascript-contents.xml | 6 +---- 3 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 javascript/src/META-INF/javascript-contents-243.xml diff --git a/javascript/BUILD b/javascript/BUILD index 52223b11495..1649877fea4 100644 --- a/javascript/BUILD +++ b/javascript/BUILD @@ -1,3 +1,8 @@ +load( + "//:build-visibility.bzl", + "JAVASCRIPT_PACKAGES_VISIBILITY", + "PLUGIN_PACKAGES_VISIBILITY", +) load( "//build_defs:build_defs.bzl", "intellij_plugin", @@ -5,16 +10,12 @@ load( "optional_plugin_xml", "stamped_plugin_xml", ) +load("//intellij_platform_sdk:build_defs.bzl", "select_for_plugin_api") load( "//testing:test_defs.bzl", "intellij_integration_test_suite", "intellij_unit_test_suite", ) -load( - "//:build-visibility.bzl", - "JAVASCRIPT_PACKAGES_VISIBILITY", - "PLUGIN_PACKAGES_VISIBILITY", -) licenses(["notice"]) @@ -39,9 +40,19 @@ optional_plugin_xml( plugin_xml = "src/META-INF/javascript-contents.xml", ) +optional_plugin_xml( + name = "optional_xml_243", + module = ["JavaScript"], + plugin_xml = "src/META-INF/javascript-contents-243.xml", +) + intellij_plugin_library( name = "plugin_library", - optional_plugin_xmls = [":optional_xml"], + optional_plugin_xmls = [":optional_xml"] + select_for_plugin_api({ + "intellij-2024.3": [], + "intellij-ue-2024.3": [], + "default": [":optional_xml_243"], + }), plugin_xmls = ["src/META-INF/blaze-javascript.xml"], visibility = PLUGIN_PACKAGES_VISIBILITY, deps = [":javascript"], diff --git a/javascript/src/META-INF/javascript-contents-243.xml b/javascript/src/META-INF/javascript-contents-243.xml new file mode 100644 index 00000000000..8e98bd7ebba --- /dev/null +++ b/javascript/src/META-INF/javascript-contents-243.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/javascript/src/META-INF/javascript-contents.xml b/javascript/src/META-INF/javascript-contents.xml index f413619e400..86d64d200d3 100644 --- a/javascript/src/META-INF/javascript-contents.xml +++ b/javascript/src/META-INF/javascript-contents.xml @@ -1,5 +1,5 @@