From dab6597416836c3578b510e7d2faeff2d3ebbcde Mon Sep 17 00:00:00 2001 From: Devin Nusbaum Date: Fri, 13 Sep 2024 18:21:22 -0400 Subject: [PATCH 1/8] [JENKINS-73687] Make deserialization of `Map` fields in XML files more robust (#9653) * Improve resilience against malformed XML files during deserialization * Improve error message --- .../java/hudson/util/RobustMapConverter.java | 7 +++ .../hudson/util/RobustMapConverterTest.java | 45 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/core/src/main/java/hudson/util/RobustMapConverter.java b/core/src/main/java/hudson/util/RobustMapConverter.java index 896138ace0e9..f845e38771cc 100644 --- a/core/src/main/java/hudson/util/RobustMapConverter.java +++ b/core/src/main/java/hudson/util/RobustMapConverter.java @@ -25,6 +25,7 @@ package hudson.util; import com.thoughtworks.xstream.XStreamException; +import com.thoughtworks.xstream.converters.ConversionException; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.converters.collections.MapConverter; import com.thoughtworks.xstream.io.HierarchicalStreamReader; @@ -64,6 +65,12 @@ final class RobustMapConverter extends MapConverter { } private Object read(HierarchicalStreamReader reader, UnmarshallingContext context, Map map) { + if (!reader.hasMoreChildren()) { + var exception = new ConversionException("Invalid map entry"); + reader.appendErrors(exception); + RobustReflectionConverter.addErrorInContext(context, exception); + return ERROR; + } reader.moveDown(); try { return readBareItem(reader, context, map); diff --git a/core/src/test/java/hudson/util/RobustMapConverterTest.java b/core/src/test/java/hudson/util/RobustMapConverterTest.java index d5ac80124ea8..b74ac9303f71 100644 --- a/core/src/test/java/hudson/util/RobustMapConverterTest.java +++ b/core/src/test/java/hudson/util/RobustMapConverterTest.java @@ -25,6 +25,7 @@ package hudson.util; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; @@ -142,4 +143,48 @@ private Map preparePayload() { } return map; } + + @Test + public void robustAgainstInvalidEntry() { + XStream2 xstream2 = new XStream2(); + String xml = + """ + + + key1 + + key2 + value2 + + + + """; + Data data = (Data) xstream2.fromXML(xml); + assertThat(data.map, equalTo(Map.of("key2", "value2"))); + } + + @Test + public void robustAgainstInvalidEntryWithNoValue() { + XStream2 xstream2 = new XStream2(); + String xml = + """ + + + + key1 + + + key2 + value2 + + + + """; + Data data = (Data) xstream2.fromXML(xml); + assertThat(data.map, equalTo(Map.of("key2", "value2"))); + } + + private static final class Data { + Map map; + } } From 6a5b5f61ebd886c4c28086928da0a6919f8b41e4 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Sat, 14 Sep 2024 00:21:31 +0200 Subject: [PATCH 2/8] [JENKINS-73695] Prevent unnecessary horizontal scrollbar in Firefox (#9695) * [JENKINS-73695] reduce table width to prevent horizontal scrollbar in FF Signed-off-by: Thorsten Scherler * [JENKINS-73695] use media query for ff Signed-off-by: Thorsten Scherler * Update war/src/main/scss/components/_table.scss Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com> --------- Signed-off-by: Thorsten Scherler Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com> --- war/src/main/scss/components/_table.scss | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss index f247407a8f3b..7d8b9e274f6e 100644 --- a/war/src/main/scss/components/_table.scss +++ b/war/src/main/scss/components/_table.scss @@ -13,13 +13,16 @@ background-clip: padding-box; margin-bottom: var(--section-padding); - &::before { - content: ""; - position: absolute; - inset: -4px -4px -2px; - border: var(--card-border-width) solid var(--table-border-color); - border-radius: inherit; - pointer-events: none; + // The '::before' pseudo-element is causing overflow issues in Firefox, so disable it for that browser + @supports (not (-moz-appearance: none)) { + &::before { + content: ""; + position: absolute; + inset: -4px -4px -2px; + border: var(--card-border-width) solid var(--table-border-color); + border-radius: inherit; + pointer-events: none; + } } * { From be3d711d690d5cf670ced78019717b4c609eda1b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:21:38 -0600 Subject: [PATCH 3/8] Fill in since annotations (#9721) Co-authored-by: timja <21194782+timja@users.noreply.github.com> --- core/src/main/java/hudson/Functions.java | 16 ++++++++-------- core/src/main/java/hudson/Plugin.java | 4 ++-- core/src/main/java/hudson/PluginManager.java | 2 +- core/src/main/java/hudson/Util.java | 2 +- core/src/main/java/hudson/WebAppMain.java | 2 +- .../java/hudson/console/AnnotatedLargeText.java | 6 +++--- .../src/main/java/hudson/model/AbstractItem.java | 8 ++++---- .../main/java/hudson/model/AbstractProject.java | 2 +- core/src/main/java/hudson/model/Actionable.java | 4 ++-- .../hudson/model/BuildAuthorizationToken.java | 4 ++-- core/src/main/java/hudson/model/Descriptor.java | 12 ++++++------ core/src/main/java/hudson/model/Hudson.java | 4 ++-- .../main/java/hudson/model/ItemGroupMixIn.java | 2 +- core/src/main/java/hudson/model/Job.java | 6 +++--- core/src/main/java/hudson/model/JobProperty.java | 2 +- core/src/main/java/hudson/model/Project.java | 2 +- core/src/main/java/hudson/model/RSS.java | 6 +++--- core/src/main/java/hudson/model/Run.java | 4 ++-- core/src/main/java/hudson/model/View.java | 4 ++-- .../main/java/hudson/scm/RepositoryBrowsers.java | 2 +- .../main/java/hudson/security/SecurityRealm.java | 6 +++--- core/src/main/java/hudson/slaves/Cloud.java | 2 +- .../java/hudson/slaves/ComputerListener.java | 2 +- core/src/main/java/hudson/tasks/LogRotator.java | 2 +- core/src/main/java/hudson/util/FormApply.java | 2 +- core/src/main/java/hudson/util/Graph.java | 4 ++-- core/src/main/java/hudson/util/ListBoxModel.java | 2 +- .../java/hudson/util/PluginServletFilter.java | 6 +++--- .../java/jenkins/console/ConsoleUrlProvider.java | 2 +- core/src/main/java/jenkins/model/Jenkins.java | 6 +++--- .../java/jenkins/mvn/GlobalSettingsProvider.java | 2 +- .../security/BasicHeaderAuthenticator.java | 2 +- 32 files changed, 66 insertions(+), 66 deletions(-) diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 46794c280264..150b1b658c16 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -379,7 +379,7 @@ public static String addSuffix(int n, String singular, String plural) { } /** - * @since TODO + * @since 2.475 */ public static RunUrl decompose(StaplerRequest2 req) { List ancestors = req.getAncestors(); @@ -610,7 +610,7 @@ public static Iterable reverse(Collection collection) { } /** - * @since TODO + * @since 2.475 */ public static Cookie getCookie(HttpServletRequest req, String name) { Cookie[] cookies = req.getCookies(); @@ -633,7 +633,7 @@ public static javax.servlet.http.Cookie getCookie(javax.servlet.http.HttpServlet } /** - * @since TODO + * @since 2.475 */ public static String getCookie(HttpServletRequest req, String name, String defaultValue) { Cookie c = getCookie(req, name); @@ -753,7 +753,7 @@ public static long getHourLocalTimezone() { * This is used to determine the "current" URL assigned to the given object, * so that one can compute relative URLs from it. * - * @since TODO + * @since 2.475 */ public static String getNearestAncestorUrl(StaplerRequest2 req, Object it) { List list = req.getAncestors(); @@ -981,7 +981,7 @@ public static boolean hasPermission(Object object, Permission permission) throws } /** - * @since TODO + * @since 2.475 */ public static void adminCheck(StaplerRequest2 req, StaplerResponse2 rsp, Object required, Permission permission) throws IOException, ServletException { // this is legacy --- all views should be eventually converted to @@ -1013,7 +1013,7 @@ public static void adminCheck(StaplerRequest req, StaplerResponse rsp, Object re /** * Infers the hudson installation URL from the given request. * - * @since TODO + * @since 2.475 */ public static String inferHudsonURL(StaplerRequest2 req) { String rootUrl = Jenkins.get().getRootUrl(); @@ -2132,7 +2132,7 @@ public static List> getCrumbIssuerDescriptors() { } /** - * @since TODO + * @since 2.475 */ public static String getCrumb(StaplerRequest2 req) { Jenkins h = Jenkins.getInstanceOrNull(); @@ -2328,7 +2328,7 @@ public static String createRenderOnDemandProxy(JellyContext context, String attr /** * Called from renderOnDemand.jelly to generate the parameters for the proxy object generation. * - * @since TODO + * @since 2.475 */ @Restricted(NoExternalUse.class) public static StaplerRequest2.RenderOnDemandParameters createRenderOnDemandProxyParameters(JellyContext context, String attributesToCapture) { diff --git a/core/src/main/java/hudson/Plugin.java b/core/src/main/java/hudson/Plugin.java index 1427da9fda8a..065b604095ad 100644 --- a/core/src/main/java/hudson/Plugin.java +++ b/core/src/main/java/hudson/Plugin.java @@ -224,7 +224,7 @@ public void configure(JSONObject formData) throws IOException, javax.servlet.Ser *

* If you are using this method, you'll likely be interested in * using {@link #save()} and {@link #load()}. - * @since TODO + * @since 2.475 */ public void configure(StaplerRequest2 req, JSONObject formData) throws IOException, ServletException, FormException { try { @@ -250,7 +250,7 @@ public void configure(StaplerRequest req, JSONObject formData) throws IOExceptio /** * This method serves static resources in the plugin under {@code hudson/plugin/SHORTNAME}. * - * @since TODO + * @since 2.475 */ public void doDynamic(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { if (Util.isOverridden(Plugin.class, getClass(), "doDynamic", StaplerRequest.class, StaplerResponse.class)) { diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index e1f5d4cc1184..b90b2eb9f6d4 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -379,7 +379,7 @@ PluginManager doCreate(@NonNull Class klass, private final PluginStrategy strategy; /** - * @since TODO + * @since 2.475 */ protected PluginManager(ServletContext context, File rootDir) { this.context = context; diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index 5ca66e9c4424..b4529a0ea279 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -1852,7 +1852,7 @@ public static long daysElapsedSince(@NonNull Date date) { * Find the specific ancestor, or throw an exception. * Useful for an ancestor we know is inside the URL to ease readability * - * @since TODO + * @since 2.475 */ @Restricted(NoExternalUse.class) public static @NonNull T getNearestAncestorOfTypeOrThrow(@NonNull StaplerRequest2 request, @NonNull Class clazz) { diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index 986452797f90..d62e8da6223a 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -322,7 +322,7 @@ private void recordBootAttempt(File home) { } /** - * @since TODO + * @since 2.475 */ public static void installExpressionFactory(ServletContextEvent event) { JellyFacet.setExpressionFactory(event, new ExpressionFactory2()); diff --git a/core/src/main/java/hudson/console/AnnotatedLargeText.java b/core/src/main/java/hudson/console/AnnotatedLargeText.java index 1798512f3e03..963435afe1ae 100644 --- a/core/src/main/java/hudson/console/AnnotatedLargeText.java +++ b/core/src/main/java/hudson/console/AnnotatedLargeText.java @@ -95,7 +95,7 @@ public AnnotatedLargeText(ByteBuffer memory, Charset charset, boolean completed, } /** - * @since TODO + * @since 2.475 */ public void doProgressiveHtml(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException { if (Util.isOverridden(AnnotatedLargeText.class, getClass(), "doProgressiveHtml", StaplerRequest.class, StaplerResponse.class)) { @@ -122,7 +122,7 @@ private void doProgressiveHtmlImpl(StaplerRequest2 req, StaplerResponse2 rsp) th /** * Aliasing what I think was a wrong name in {@link LargeText} * - * @since TODO + * @since 2.475 */ public void doProgressiveText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException { doProgressText(req, rsp); @@ -146,7 +146,7 @@ private boolean isHtml() { } /** - * @since TODO + * @since 2.475 */ @Override protected void setContentType(StaplerResponse2 rsp) { diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index af64ff19df34..0e712d8a2e88 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -649,7 +649,7 @@ private Object readResolve() { /** * Accepts the new description. * - * @since TODO + * @since 2.475 */ @RequirePOST public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { @@ -690,7 +690,7 @@ private void doSubmitDescriptionImpl(StaplerRequest2 req, StaplerResponse2 rsp) * since it predates {@code }. {@code /delete} goes to a Jelly page * which should now be unused by core but is left in case plugins are still using it. * - * @since TODO + * @since 2.475 */ @RequirePOST public void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, InterruptedException { @@ -736,7 +736,7 @@ private void doDoDeleteImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IO } /** - * @since TODO + * @since 2.475 */ @Override public void delete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { @@ -830,7 +830,7 @@ protected void performDelete() throws IOException, InterruptedException { /** * Accepts {@code config.xml} submission, as well as serve it. * - * @since TODO + * @since 2.475 */ @WebMethod(name = "config.xml") public void doConfigDotXml(StaplerRequest2 req, StaplerResponse2 rsp) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index a380943687f7..61f407034c43 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1778,7 +1778,7 @@ public void doPolling(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExcept } /** - * @since TODO + * @since 2.475 */ @Override protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException { diff --git a/core/src/main/java/hudson/model/Actionable.java b/core/src/main/java/hudson/model/Actionable.java index d8088319021b..45a8978a0388 100644 --- a/core/src/main/java/hudson/model/Actionable.java +++ b/core/src/main/java/hudson/model/Actionable.java @@ -342,7 +342,7 @@ public T getAction(Class type) { } /** - * @since TODO + * @since 2.475 */ public Object getDynamic(String token, StaplerRequest2 req, StaplerResponse2 rsp) { if (Util.isOverridden(Actionable.class, getClass(), "getDynamic", String.class, StaplerRequest.class, StaplerResponse.class)) { @@ -374,7 +374,7 @@ private Object getDynamicImpl(String token, StaplerRequest2 req, StaplerResponse } /** - * @since TODO + * @since 2.475 */ @Override public ContextMenu doContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception { diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java index 3611824fb54d..365403124c3a 100644 --- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java +++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java @@ -54,7 +54,7 @@ public BuildAuthorizationToken(String token) { } /** - * @since TODO + * @since 2.475 */ public static BuildAuthorizationToken create(StaplerRequest2 req) { if (req.getParameter("pseudoRemoteTrigger") != null) { @@ -79,7 +79,7 @@ public static BuildAuthorizationToken create(StaplerRequest req) { } /** - * @since TODO + * @since 2.475 */ public static void checkPermission(Job project, BuildAuthorizationToken token, StaplerRequest2 req, StaplerResponse2 rsp) throws IOException { if (token != null && token.token != null) { diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index e2067bfc6944..562b96e37b8e 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -580,7 +580,7 @@ public T newInstance(StaplerRequest req) throws FormException { * * @throws FormException * Signals a problem in the submitted form. - * @since TODO + * @since 2.475 */ public T newInstance(@Nullable StaplerRequest2 req, @NonNull JSONObject formData) throws FormException { if (Util.isOverridden(Descriptor.class, getClass(), "newInstance", StaplerRequest.class, JSONObject.class)) { @@ -626,7 +626,7 @@ private T newInstanceImpl(@Nullable StaplerRequest2 req, @NonNull JSONObject for * Replacement for {@link StaplerRequest2#bindJSON(Class, JSONObject)} which honors {@link #newInstance(StaplerRequest2, JSONObject)}. * This is automatically used inside {@link #newInstance(StaplerRequest2, JSONObject)} so a direct call would only be necessary * in case the top level binding might use a {@link Descriptor} which overrides {@link #newInstance(StaplerRequest2, JSONObject)}. - * @since TODO + * @since 2.475 */ public static T bindJSON(StaplerRequest2 req, Class type, JSONObject src) { return bindJSON(req, type, src, false); @@ -859,7 +859,7 @@ public boolean configure(StaplerRequest req) throws FormException { * See the developer documentation. * @return false * to keep the client in the same config page. - * @since TODO + * @since 2.475 */ public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException { if (Util.isOverridden(Descriptor.class, getClass(), "configure", StaplerRequest.class, JSONObject.class)) { @@ -1062,7 +1062,7 @@ private void doHelpImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExce } /** - * @since TODO + * @since 2.475 */ @Restricted(NoExternalUse.class) public static URL getStaticHelpUrl(StaplerRequest2 req, Klass c, String suffix) { @@ -1142,7 +1142,7 @@ Map, T> toMap(Iterable describables) { * List of descriptors to create instances from. * @return * Can be empty but never null. - * @since TODO + * @since 2.475 */ public static > List newInstancesFromHeteroList(StaplerRequest2 req, JSONObject formData, String key, @@ -1162,7 +1162,7 @@ List newInstancesFromHeteroList(StaplerRequest req, JSONObject formData, Stri } /** - * @since TODO + * @since 2.475 */ public static > List newInstancesFromHeteroList(StaplerRequest2 req, Object formData, diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 7d45fd63d749..5ae161199c63 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -81,7 +81,7 @@ public static Hudson getInstance() { } /** - * @since TODO + * @since 2.475 */ public Hudson(File root, ServletContext context) throws IOException, InterruptedException, ReactorException { this(root, context, null); @@ -96,7 +96,7 @@ public Hudson(File root, javax.servlet.ServletContext context) throws IOExceptio } /** - * @since TODO + * @since 2.475 */ public Hudson(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException { super(root, context, pluginManager); diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index 62a46f395247..404d213f7344 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -144,7 +144,7 @@ public static Map loadChildren(ItemGroup parent, File * Creates a {@link TopLevelItem} for example from the submission of the {@code /lib/hudson/newFromList/form} tag * or throws an exception if it fails. * - * @since TODO + * @since 2.475 */ public synchronized TopLevelItem createTopLevelItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { acl.checkPermission(Item.CREATE); diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 2ba53d7182a0..e4d54d44b375 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -860,7 +860,7 @@ public RunT getNearestOldBuild(int n) { } /** - * @since TODO + * @since 2.475 */ @Override public Object getDynamic(String token, StaplerRequest2 req, @@ -1208,7 +1208,7 @@ public String getEntryAuthor(FeedItem entry) { /** - * @since TODO + * @since 2.475 */ @Override public ContextMenu doChildrenContextMenu(StaplerRequest2 request, StaplerResponse2 response) throws Exception { @@ -1434,7 +1434,7 @@ public synchronized void doConfigSubmit(StaplerRequest2 req, * Derived class can override this to perform additional config submission * work. * - * @since TODO + * @since 2.475 */ protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException { diff --git a/core/src/main/java/hudson/model/JobProperty.java b/core/src/main/java/hudson/model/JobProperty.java index 70ef159547c0..c7444de3343a 100644 --- a/core/src/main/java/hudson/model/JobProperty.java +++ b/core/src/main/java/hudson/model/JobProperty.java @@ -186,7 +186,7 @@ public Collection getJobOverrides() { } /** - * @since TODO + * @since 2.475 */ @Override public JobProperty reconfigure(StaplerRequest2 req, JSONObject form) throws FormException { diff --git a/core/src/main/java/hudson/model/Project.java b/core/src/main/java/hudson/model/Project.java index eb31add23938..30efe857e891 100644 --- a/core/src/main/java/hudson/model/Project.java +++ b/core/src/main/java/hudson/model/Project.java @@ -228,7 +228,7 @@ public MavenInstallation inferMavenInstallation() { // /** - * @since TODO + * @since 2.475 */ @Override protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException { diff --git a/core/src/main/java/hudson/model/RSS.java b/core/src/main/java/hudson/model/RSS.java index bb41c8af10a2..98cf0fb74032 100644 --- a/core/src/main/java/hudson/model/RSS.java +++ b/core/src/main/java/hudson/model/RSS.java @@ -56,7 +56,7 @@ public final class RSS { * Entries to be listed in the RSS feed. * @param adapter * Controls how to render entries to RSS. - * @since TODO + * @since 2.475 */ public static void forwardToRss(String title, String url, Collection entries, FeedAdapter adapter, StaplerRequest2 req, HttpServletResponse rsp) throws IOException, ServletException { req.setAttribute("adapter", adapter); @@ -98,7 +98,7 @@ public static void forwardToRss(String title, String url, Collection feedAdapter) throws IOException, ServletException { final FeedAdapter feedAdapter_ = feedAdapter == null ? Run.FEED_ADAPTER : feedAdapter; diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java index 5359634d9642..37b09fd47d25 100644 --- a/core/src/main/java/hudson/model/Run.java +++ b/core/src/main/java/hudson/model/Run.java @@ -2209,7 +2209,7 @@ public void doBuildTimestamp(StaplerRequest2 req, StaplerResponse2 rsp, @QueryPa /** * Sends out the raw console output. * - * @since TODO + * @since 2.475 */ public void doConsoleText(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException { if (Util.isOverridden(Run.class, getClass(), "doConsoleText", StaplerRequest.class, StaplerResponse.class)) { @@ -2287,7 +2287,7 @@ public void keepLog(boolean newValue) throws IOException { /** * Deletes the build when the button is pressed. * - * @since TODO + * @since 2.475 */ @RequirePOST public void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index e807fa23de30..5d53a49ef0b7 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -788,7 +788,7 @@ public synchronized void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) t * * @return * null if fails. - * @since TODO + * @since 2.475 */ @RequirePOST public /* abstract */ Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { @@ -1104,7 +1104,7 @@ public static Permission getItemCreatePermission() { } /** - * @since TODO + * @since 2.475 */ public static View create(StaplerRequest2 req, StaplerResponse2 rsp, ViewGroup owner) throws FormException, IOException, ServletException { diff --git a/core/src/main/java/hudson/scm/RepositoryBrowsers.java b/core/src/main/java/hudson/scm/RepositoryBrowsers.java index 3562f1c13964..3c1e818a0385 100644 --- a/core/src/main/java/hudson/scm/RepositoryBrowsers.java +++ b/core/src/main/java/hudson/scm/RepositoryBrowsers.java @@ -83,7 +83,7 @@ T createInstance(Class type, StaplerRequest req, String fieldName) throws For /** * Creates an instance of {@link RepositoryBrowser} from a form submission. * - * @since TODO + * @since 2.475 */ public static T createInstance(Class type, StaplerRequest2 req, JSONObject parent, String fieldName) throws FormException { diff --git a/core/src/main/java/hudson/security/SecurityRealm.java b/core/src/main/java/hudson/security/SecurityRealm.java index d99e3487eaa6..0706f99a4a31 100644 --- a/core/src/main/java/hudson/security/SecurityRealm.java +++ b/core/src/main/java/hudson/security/SecurityRealm.java @@ -278,7 +278,7 @@ public boolean canLogOut() { * This parameter allows you to redirect people to different pages depending on who they are. * @return * never null. - * @since TODO + * @since 2.475 * @see #doLogout(StaplerRequest2, StaplerResponse2) */ protected String getPostLogOutUrl2(StaplerRequest2 req, Authentication auth) { @@ -340,7 +340,7 @@ public List> getCaptchaSupportDescriptors() { * The default implementation erases the session and do a few other clean up, then * redirect the user to the URL specified by {@link #getPostLogOutUrl2(StaplerRequest2, Authentication)}. * - * @since TODO + * @since 2.475 */ public void doLogout(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { if (Util.isOverridden(SecurityRealm.class, getClass(), "doLogout", StaplerRequest.class, StaplerResponse.class)) { @@ -619,7 +619,7 @@ public synchronized SecurityComponents getSecurityComponents() { * For other plugins that want to contribute {@link Filter}, see * {@link PluginServletFilter}. * - * @since TODO + * @since 2.475 */ public Filter createFilter(FilterConfig filterConfig) { if (Util.isOverridden(SecurityRealm.class, getClass(), "createFilter", javax.servlet.FilterConfig.class)) { diff --git a/core/src/main/java/hudson/slaves/Cloud.java b/core/src/main/java/hudson/slaves/Cloud.java index 3bff60c0d0ad..05f9bb9c0139 100644 --- a/core/src/main/java/hudson/slaves/Cloud.java +++ b/core/src/main/java/hudson/slaves/Cloud.java @@ -342,7 +342,7 @@ public HttpResponse doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) th } /** - * @since TODO + * @since 2.475 */ public Cloud reconfigure(@NonNull final StaplerRequest2 req, JSONObject form) throws Descriptor.FormException { if (Util.isOverridden(Cloud.class, getClass(), "reconfigure", StaplerRequest.class, JSONObject.class)) { diff --git a/core/src/main/java/hudson/slaves/ComputerListener.java b/core/src/main/java/hudson/slaves/ComputerListener.java index f5d220c1104e..6e52220ce3a8 100644 --- a/core/src/main/java/hudson/slaves/ComputerListener.java +++ b/core/src/main/java/hudson/slaves/ComputerListener.java @@ -214,7 +214,7 @@ public void onConfigurationChange() {} /** * Indicates that the computer has become idle. * - * @since TODO + * @since 2.476 */ public void onIdle(Computer c) {} diff --git a/core/src/main/java/hudson/tasks/LogRotator.java b/core/src/main/java/hudson/tasks/LogRotator.java index c22d5af2e3d2..ca95081b0385 100644 --- a/core/src/main/java/hudson/tasks/LogRotator.java +++ b/core/src/main/java/hudson/tasks/LogRotator.java @@ -111,7 +111,7 @@ public CollatedLogRotatorException(String msg, Collection values) { /** * If enabled also remove last successful build. - * @since TODO + * @since 2.474 */ private boolean removeLastBuild; diff --git a/core/src/main/java/hudson/util/FormApply.java b/core/src/main/java/hudson/util/FormApply.java index dc5e4d64df9b..280a3051286a 100644 --- a/core/src/main/java/hudson/util/FormApply.java +++ b/core/src/main/java/hudson/util/FormApply.java @@ -63,7 +63,7 @@ public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object n /** * Is this submission from the "apply" button? * - * @since TODO + * @since 2.475 */ public static boolean isApply(StaplerRequest2 req) { return Boolean.parseBoolean(req.getParameter("core:apply")); diff --git a/core/src/main/java/hudson/util/Graph.java b/core/src/main/java/hudson/util/Graph.java index 6e4ef6c59515..6d89fd6a6369 100644 --- a/core/src/main/java/hudson/util/Graph.java +++ b/core/src/main/java/hudson/util/Graph.java @@ -152,7 +152,7 @@ public static Dimension safeDimension(int width, int height, int defaultWidth, i /** * Renders a graph. * - * @since TODO + * @since 2.475 */ public void doPng(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException { if (Util.isOverridden(Graph.class, getClass(), "doPng", StaplerRequest.class, StaplerResponse.class)) { @@ -225,7 +225,7 @@ private void doPngImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExcep /** * Renders a clickable map. * - * @since TODO + * @since 2.475 */ public void doMap(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException { if (Util.isOverridden(Graph.class, getClass(), "doMap", StaplerRequest.class, StaplerResponse.class)) { diff --git a/core/src/main/java/hudson/util/ListBoxModel.java b/core/src/main/java/hudson/util/ListBoxModel.java index c97ed0f431e7..27efa0a8c573 100644 --- a/core/src/main/java/hudson/util/ListBoxModel.java +++ b/core/src/main/java/hudson/util/ListBoxModel.java @@ -171,7 +171,7 @@ public ListBoxModel add(@NonNull String nameAndValue) { } /** - * @since TODO + * @since 2.475 */ public void writeTo(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { if (Util.isOverridden(ListBoxModel.class, getClass(), "writeTo", StaplerRequest.class, StaplerResponse.class)) { diff --git a/core/src/main/java/hudson/util/PluginServletFilter.java b/core/src/main/java/hudson/util/PluginServletFilter.java index bb4ecfc18d9b..5e6ca8704dff 100644 --- a/core/src/main/java/hudson/util/PluginServletFilter.java +++ b/core/src/main/java/hudson/util/PluginServletFilter.java @@ -105,7 +105,7 @@ public void init(FilterConfig config) throws ServletException { * May be paired with {@link #removeFilter}. *

For most purposes you can instead use {@link HttpServletFilter}. * - * @since TODO + * @since 2.475 */ public static void addFilter(Filter filter) throws ServletException { Jenkins j = Jenkins.getInstanceOrNull(); @@ -141,7 +141,7 @@ public static void addFilter(javax.servlet.Filter filter) throws javax.servlet.S * Checks whether the given filter is already registered in the chain. * @param filter the filter to check. * @return true if the filter is already registered in the chain. - * @since TODO + * @since 2.475 */ public static boolean hasFilter(Filter filter) { Jenkins j = Jenkins.getInstanceOrNull(); @@ -166,7 +166,7 @@ public static boolean hasFilter(javax.servlet.Filter filter) { } /** - * @since TODO + * @since 2.475 */ public static void removeFilter(Filter filter) throws ServletException { Jenkins j = Jenkins.getInstanceOrNull(); diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java index dcd3883ba07c..637cf10145c6 100644 --- a/core/src/main/java/jenkins/console/ConsoleUrlProvider.java +++ b/core/src/main/java/jenkins/console/ConsoleUrlProvider.java @@ -85,7 +85,7 @@ default Descriptor getDescriptor() { /** * Looks up the {@link #getConsoleUrl} value from the first provider to offer one. - * @since TODO + * @since 2.476 */ static @NonNull String consoleUrlOf(Run run) { final List providers = new ArrayList<>(); diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 3c756bbb7ba0..9af524b6b1d9 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -759,7 +759,7 @@ private static int getSlaveAgentPortInitialValue(int def) { private final transient ServletContext jakartaServletContext; /** - * @since TODO + * @since 2.475 */ public ServletContext getServletContext() { return this.jakartaServletContext; @@ -4435,7 +4435,7 @@ public void doLoginEntry(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExc /** * Logs out the user. * - * @since TODO + * @since 2.475 */ public void doLogout(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException { String user = getAuthentication2().getName(); @@ -4933,7 +4933,7 @@ public void doScriptText(StaplerRequest req, StaplerResponse rsp) throws IOExcep } /** - * @since TODO + * @since 2.475 */ public static void _doScript(StaplerRequest2 req, StaplerResponse2 rsp, RequestDispatcher view, VirtualChannel channel, ACL acl) throws IOException, ServletException { // ability to run arbitrary script is dangerous diff --git a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java index 98055fb39b2e..9e0a2cef24fb 100644 --- a/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java +++ b/core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java @@ -29,7 +29,7 @@ public abstract class GlobalSettingsProvider extends AbstractDescribableImpl build, TaskListener listener); /** - * @since TODO + * @since 2.475 */ public static GlobalSettingsProvider parseSettingsProvider(StaplerRequest2 req) throws Descriptor.FormException, ServletException { JSONObject settings = req.getSubmittedForm().getJSONObject("globalSettings"); diff --git a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java b/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java index 2906a1aa461b..7b012292efbd 100644 --- a/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java +++ b/core/src/main/java/jenkins/security/BasicHeaderAuthenticator.java @@ -38,7 +38,7 @@ public abstract class BasicHeaderAuthenticator implements ExtensionPoint { *

* When no processor can validate the username/password pair, caller will make * the request processing fail. - * @since TODO + * @since 2.475 */ @CheckForNull public Authentication authenticate2(HttpServletRequest req, HttpServletResponse rsp, String username, String password) throws IOException, ServletException { From 4e9b0462e526e93672091fbe222d8d6ae6a67e28 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:21:46 -0600 Subject: [PATCH 4/8] Update peter-evans/create-pull-request digest to d121e62 (#9725) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/run-since-updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml index 03bcfe5b7c9d..409520a5f73f 100644 --- a/.github/workflows/run-since-updater.yml +++ b/.github/workflows/run-since-updater.yml @@ -29,7 +29,7 @@ jobs: id: run_script shell: bash - name: Create Pull Request - uses: peter-evans/create-pull-request@8867c4aba1b742c39f8d0ba35429c2dfa4b6cb20 # v7 + uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Fill in since annotations From 7ff5aaa0fdc337fcc6e7f02d95dd6df2721763d5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:21:55 -0600 Subject: [PATCH 5/8] Update dependency org.springframework:spring-framework-bom to v6.1.13 (#9726) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index cd55b58d52c9..39e1714b809a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -62,7 +62,7 @@ THE SOFTWARE. org.springframework spring-framework-bom - 6.1.12 + 6.1.13 pom import From 239ced05afca9312e4563785f84acb7abfe68433 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 15 Sep 2024 20:28:22 +0100 Subject: [PATCH 6/8] Use Notice component for views lacking jobs (#9724) * Use notice for views lacking jobs * Update _notice.scss * Rename text to title, use 'invokeBody' rather than description field --- .../hudson/PluginManager/installed.jelly | 2 +- .../resources/hudson/PluginManager/updates.jelly | 2 +- .../hudson/logging/LogRecorder/index.jelly | 2 +- .../main/resources/hudson/model/View/noJob.jelly | 11 ++++++----- .../jenkins/model/Jenkins/systemInfo.jelly | 2 +- core/src/main/resources/lib/layout/notice.jelly | 11 +++++++---- war/src/main/scss/components/_notice.scss | 15 +++++++++++++-- 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 951e0cf2877d..c9b7dd93f200 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -71,7 +71,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly index da79d1958cf9..d4163fb7cfbe 100644 --- a/core/src/main/resources/hudson/PluginManager/updates.jelly +++ b/core/src/main/resources/hudson/PluginManager/updates.jelly @@ -230,7 +230,7 @@ THE SOFTWARE.
- + diff --git a/core/src/main/resources/hudson/logging/LogRecorder/index.jelly b/core/src/main/resources/hudson/logging/LogRecorder/index.jelly index 0428fbc5bd9f..eedda4e43049 100644 --- a/core/src/main/resources/hudson/logging/LogRecorder/index.jelly +++ b/core/src/main/resources/hudson/logging/LogRecorder/index.jelly @@ -67,7 +67,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/model/View/noJob.jelly b/core/src/main/resources/hudson/model/View/noJob.jelly index 4145b1118be8..23011d448e4b 100644 --- a/core/src/main/resources/hudson/model/View/noJob.jelly +++ b/core/src/main/resources/hudson/model/View/noJob.jelly @@ -23,9 +23,10 @@ THE SOFTWARE. --> - - ${%description_1} - - ${%description_2} - + + + + ${%description_2} + + diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly index 554215da00c3..f9d7825ed233 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly +++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly @@ -53,7 +53,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/lib/layout/notice.jelly b/core/src/main/resources/lib/layout/notice.jelly index 247f4e34b1e3..8a2e666a8b38 100644 --- a/core/src/main/resources/lib/layout/notice.jelly +++ b/core/src/main/resources/lib/layout/notice.jelly @@ -23,10 +23,10 @@ THE SOFTWARE. --> - + - - Sets the text for the notice. HTML isn't supported. + + Sets the title for the notice. HTML isn't supported. Sets the icon for the notice. Supports Jenkins Symbols and regular images. @@ -35,6 +35,9 @@ THE SOFTWARE.
-
${attrs.text}
+
${attrs.title}
+
+ +
diff --git a/war/src/main/scss/components/_notice.scss b/war/src/main/scss/components/_notice.scss index d02928fa3aec..44f70de01a90 100644 --- a/war/src/main/scss/components/_notice.scss +++ b/war/src/main/scss/components/_notice.scss @@ -8,11 +8,22 @@ background: var(--button-background); border-radius: 0.66rem; font-size: var(--font-size-base); - margin-bottom: 30px; - font-weight: 500; + margin-bottom: var(--section-padding); + font-weight: 450; + padding: calc(var(--section-padding) * 2); + text-align: center; svg { width: 2.5rem; height: 2.5rem; } + + &__description { + color: var(--text-color-secondary); + margin-top: -0.375rem; + + &:empty { + display: none; + } + } } From 0037be68b722373a95941aac5e459f43db993962 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Mon, 16 Sep 2024 11:40:32 +0200 Subject: [PATCH 7/8] [JENKINS-73744] npm scripts lint:fix do not work (#9718) Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Co-authored-by: Mark Waite --- war/.babelrc => .babelrc | 0 .gitignore | 24 +- war/.prettierignore => .prettierignore | 14 +- war/.stylelintrc.js => .stylelintrc.js | 2 +- CONTRIBUTING.md | 8 +- eslint.config.cjs | 6 +- war/package.json => package.json | 14 +- pom.xml | 193 ++++++ war/pom.xml | 134 +--- war/yarn.lock => yarn.lock | 821 +++++++++++++------------ 10 files changed, 653 insertions(+), 563 deletions(-) rename war/.babelrc => .babelrc (100%) rename war/.prettierignore => .prettierignore (58%) rename war/.stylelintrc.js => .stylelintrc.js (94%) rename war/package.json => package.json (75%) rename war/yarn.lock => yarn.lock (91%) diff --git a/war/.babelrc b/.babelrc similarity index 100% rename from war/.babelrc rename to .babelrc diff --git a/.gitignore b/.gitignore index 021201b717a3..c09d79fcf8c4 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,27 @@ jenkins_*.changes *.pkg *.zip push-build.sh -war/node_modules/ -war/yarn-error.log +node_modules/ +yarn-error.log .java-version .checkstyle + +/rebel.xml +junit.xml + +# Yarn +# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored +.pnp.* +.yarn/* +.yarnrc.yml +!.yarn/patches +!.yarn/plugins +!.yarn/sdks +!.yarn/versions + +# Node +node/ +node_modules/ + +# Generated JavaScript Bundles +jsbundles diff --git a/war/.prettierignore b/.prettierignore similarity index 58% rename from war/.prettierignore rename to .prettierignore index 8047dce8ba4f..042e5d268c0c 100644 --- a/war/.prettierignore +++ b/.prettierignore @@ -10,14 +10,14 @@ node/ .yarnrc.yml # libraries / external deps / generated files -src/main/js/plugin-setup-wizard/bootstrap-detached.js -src/main/webapp/scripts/yui -src/main/webapp/jsbundles/ -src/main/scss/_bootstrap.scss +war/src/main/js/plugin-setup-wizard/bootstrap-detached.js +war/src/main/webapp/scripts/yui +war/src/main/webapp/jsbundles/ +war/src/main/scss/_bootstrap.scss # test files that we don't need formatted -../test/src/test/resources -../test/jmh-report.json +test/src/test/resources +test/jmh-report.json # doesn't work, see https://github.com/prettier/prettier/issues/5340 *.hbs @@ -25,4 +25,4 @@ src/main/scss/_bootstrap.scss .yarn # Incorrectly flagging forwarding slashes in regex -../.github/renovate.json +.github/renovate.json diff --git a/war/.stylelintrc.js b/.stylelintrc.js similarity index 94% rename from war/.stylelintrc.js rename to .stylelintrc.js index cfea225e3035..711c7c77f83a 100644 --- a/war/.stylelintrc.js +++ b/.stylelintrc.js @@ -1,7 +1,7 @@ module.exports = { extends: "stylelint-config-standard", customSyntax: "postcss-scss", - ignoreFiles: ["src/main/scss/_bootstrap.scss"], + ignoreFiles: ["war/src/main/scss/_bootstrap.scss"], rules: { "no-descending-specificity": null, "selector-class-pattern": "[a-z]", diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5933560a951b..d2f4700a3ab7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,13 +55,12 @@ MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/ja To run the Yarn frontend build, after [building the WAR file](#building-the-war-file), add the downloaded versions of Node and Yarn to your path: ```sh -export PATH=$PWD/war/node:$PWD/war/node/yarn/dist/bin:$PATH +export PATH=$PWD/node:$PWD/node/yarn/dist/bin:$PATH ``` Then you can run Yarn with e.g. ```sh -cd war yarn ``` @@ -75,10 +74,9 @@ On one terminal, start a development server that will not process frontend asset MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED' mvn -pl war jetty:run -Dskip.yarn ``` -On another terminal, move to the `war` folder and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build): +Open another terminal and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build): ```sh -cd war yarn start ``` @@ -113,14 +111,12 @@ mvn spotless:apply To view frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run: ```sh -cd war yarn lint ``` To fix frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run: ```sh -cd war yarn lint:fix ``` diff --git a/eslint.config.cjs b/eslint.config.cjs index c25e303ba5db..f6c1c6181e46 100644 --- a/eslint.config.cjs +++ b/eslint.config.cjs @@ -16,8 +16,8 @@ module.exports = [ "**/jsbundles/", // External scripts - "war/.pnp.cjs", - "war/.pnp.loader.mjs", + ".pnp.cjs", + ".pnp.loader.mjs", "war/src/main/js/plugin-setup-wizard/bootstrap-detached.js", "war/src/main/webapp/scripts/yui/*", ], @@ -93,7 +93,7 @@ module.exports = [ "eslint.config.cjs", "war/postcss.config.js", "war/webpack.config.js", - "war/.stylelintrc.js", + ".stylelintrc.js", ], languageOptions: { globals: { diff --git a/war/package.json b/package.json similarity index 75% rename from war/package.json rename to package.json index 882d4220c8d6..9f40f36fff5b 100644 --- a/war/package.json +++ b/package.json @@ -10,16 +10,16 @@ }, "private": true, "scripts": { - "dev": "webpack --config webpack.config.js", - "prod": "webpack --config webpack.config.js --mode=production", + "dev": "webpack --config war/webpack.config.js", + "prod": "webpack --config war/webpack.config.js --mode=production", "build": "yarn prod", "start": "yarn dev --watch", - "lint:js": "eslint ../ && prettier --check ../", - "lint:js-ci": "eslint ../ -f checkstyle -o target/eslint-warnings.xml && prettier --check ../", - "lint:css": "stylelint src/main/scss", - "lint:css-ci": "stylelint src/main/scss --custom-formatter stylelint-checkstyle-reporter -o target/stylelint-warnings.xml", + "lint:js": "eslint . && prettier --check .", + "lint:js-ci": "eslint . -f checkstyle -o target/eslint-warnings.xml && prettier --check .", + "lint:css": "stylelint war/src/main/scss", + "lint:css-ci": "stylelint war/src/main/scss --custom-formatter stylelint-checkstyle-reporter -o target/stylelint-warnings.xml", "lint:ci": "yarn lint:js-ci && yarn lint:css-ci", - "lint:fix": "eslint --fix ../ && prettier --write ../ && stylelint src/main/scss --fix", + "lint:fix": "eslint --fix . && prettier --write . && stylelint war/src/main/scss --fix", "lint": "yarn lint:js && yarn lint:css" }, "devDependencies": { diff --git a/pom.xml b/pom.xml index 9f52b05a6ff9..86265c667654 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,12 @@ THE SOFTWARE. false 8.1 + 20.17.0 + + 1.22.19 + + 4.4.1 + 920b4530755296dc2ce8b4351f057d4a26429524fcb2789d277560d94837c27e + + + + + yarn install + + yarn + + initialize + + + + yarn build + + yarn + + generate-sources + + build + + + + + yarn lint + + yarn + + + lint:ci + ${yarn.lint.skip} + + + + + + + + + + clean-node + + + cleanNode + + + package.json + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + + node + false + + + node_modules + false + + + + + + + diff --git a/war/pom.xml b/war/pom.xml index 32a0c23d9dca..ab2100469ba4 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -49,12 +49,7 @@ THE SOFTWARE. 2.13.2-125.v200281b_61d59 3107.v665000b_51092 - 20.17.0 - - 1.22.19 - - 4.4.1 - 920b4530755296dc2ce8b4351f057d4a26429524fcb2789d277560d94837c27e + @@ -727,132 +722,5 @@ THE SOFTWARE. - - - yarn-execution - - - package.json - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - download-yarn - - run - - initialize - - - - - - - - - - - Checksum error - yarnPath: ${yarn.dest} - - - - - - - com.github.eirslett - frontend-maven-plugin - 1.15.0 - - - - install node and yarn - - install-node-and-yarn - - initialize - - v${node.version} - v${yarn.version} - https://repo.jenkins-ci.org/nodejs-dist/ - - - - - - yarn install - - yarn - - initialize - - - - yarn build - - yarn - - generate-sources - - build - - - - - yarn lint - - yarn - - - lint:ci - ${yarn.lint.skip} - - - - - - - - - - clean-node - - - cleanNode - - - package.json - - - - - - org.apache.maven.plugins - maven-clean-plugin - - - - - node - false - - - node_modules - false - - - - - - - diff --git a/war/yarn.lock b/yarn.lock similarity index 91% rename from war/yarn.lock rename to yarn.lock index eb14c96722b8..de7c0e057fe5 100644 --- a/war/yarn.lock +++ b/yarn.lock @@ -5,20 +5,13 @@ __metadata: version: 8 cacheKey: 10c0 -"@aashutoshrathi/word-wrap@npm:^1.2.3": - version: 1.2.6 - resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" - checksum: 10c0/53c2b231a61a46792b39a0d43bc4f4f776bb4542aa57ee04930676802e5501282c2fc8aac14e4cd1f1120ff8b52616b6ff5ab539ad30aa2277d726444b71619f - languageName: node - linkType: hard - "@ampproject/remapping@npm:^2.2.0": - version: 2.2.1 - resolution: "@ampproject/remapping@npm:2.2.1" + version: 2.3.0 + resolution: "@ampproject/remapping@npm:2.3.0" dependencies: - "@jridgewell/gen-mapping": "npm:^0.3.0" - "@jridgewell/trace-mapping": "npm:^0.3.9" - checksum: 10c0/92ce5915f8901d8c7cd4f4e6e2fe7b9fd335a29955b400caa52e0e5b12ca3796ada7c2f10e78c9c5b0f9c2539dff0ffea7b19850a56e1487aa083531e1e46d43 + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.24" + checksum: 10c0/81d63cca5443e0f0c72ae18b544cc28c7c0ec2cea46e7cb888bb0e0f411a1191d0d6b7af798d54e30777d8d1488b2ec0732aac2be342d3d7d3ffd271c6f489ed languageName: node linkType: hard @@ -89,15 +82,15 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.4": - version: 7.25.5 - resolution: "@babel/generator@npm:7.25.5" +"@babel/generator@npm:^7.25.0, @babel/generator@npm:^7.25.6": + version: 7.25.6 + resolution: "@babel/generator@npm:7.25.6" dependencies: - "@babel/types": "npm:^7.25.4" + "@babel/types": "npm:^7.25.6" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10c0/eb8af30c39476e4f4d6b953f355fcf092258291f78d65fb759b7d5e5e6fd521b5bfee64a4e2e4290279f0dcd25ccf8c49a61807828b99b5830d2b734506da1fd + checksum: 10c0/f89282cce4ddc63654470b98086994d219407d025497f483eb03ba102086e11e2b685b27122f6ff2e1d93b5b5fa0c3a6b7e974fbf2e4a75b685041a746a4291e languageName: node linkType: hard @@ -163,7 +156,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-define-polyfill-provider@npm:^0.6.1, @babel/helper-define-polyfill-provider@npm:^0.6.2": +"@babel/helper-define-polyfill-provider@npm:^0.6.2": version: 0.6.2 resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2" dependencies: @@ -307,12 +300,12 @@ __metadata: linkType: hard "@babel/helpers@npm:^7.25.0": - version: 7.25.0 - resolution: "@babel/helpers@npm:7.25.0" + version: 7.25.6 + resolution: "@babel/helpers@npm:7.25.6" dependencies: "@babel/template": "npm:^7.25.0" - "@babel/types": "npm:^7.25.0" - checksum: 10c0/b7fe007fc4194268abf70aa3810365085e290e6528dcb9fbbf7a765d43c74b6369ce0f99c5ccd2d44c413853099daa449c9a0123f0b212ac8d18643f2e8174b8 + "@babel/types": "npm:^7.25.6" + checksum: 10c0/448c1cdabccca42fd97a252f73f1e4bcd93776dbf24044f3b4f49b756bf2ece73ee6df05177473bb74ea7456dddd18d6f481e4d96d2cc7839d078900d48c696c languageName: node linkType: hard @@ -328,14 +321,14 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.4": - version: 7.25.4 - resolution: "@babel/parser@npm:7.25.4" +"@babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.6": + version: 7.25.6 + resolution: "@babel/parser@npm:7.25.6" dependencies: - "@babel/types": "npm:^7.25.4" + "@babel/types": "npm:^7.25.6" bin: parser: ./bin/babel-parser.js - checksum: 10c0/bdada5662f15d1df11a7266ec3bc9bb769bf3637ecf3d051eafcfc8f576dcf5a3ac1007c5e059db4a1e1387db9ae9caad239fc4f79e4c2200930ed610e779993 + checksum: 10c0/f88a0e895dbb096fd37c4527ea97d12b5fc013720602580a941ac3a339698872f0c911e318c292b184c36b5fbe23b612f05aff9d24071bc847c7b1c21552c41d languageName: node linkType: hard @@ -463,24 +456,24 @@ __metadata: linkType: hard "@babel/plugin-syntax-import-assertions@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7" + version: 7.25.6 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.25.6" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.24.8" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/b82c53e095274ee71c248551352d73441cf65b3b3fc0107258ba4e9aef7090772a425442b3ed1c396fa207d0efafde8929c87a17d3c885b3ca2021316e87e246 + checksum: 10c0/55afa63b1b1355bcc1d85a9ad9d2c78983e27beee38e232d5c1ab59eac39127ce3c3817d6686e3ab1d0aff5edd8e38a6852885c65d3e518accdd183a445ef411 languageName: node linkType: hard "@babel/plugin-syntax-import-attributes@npm:^7.24.7": - version: 7.24.7 - resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7" + version: 7.25.6 + resolution: "@babel/plugin-syntax-import-attributes@npm:7.25.6" dependencies: - "@babel/helper-plugin-utils": "npm:^7.24.7" + "@babel/helper-plugin-utils": "npm:^7.24.8" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10c0/eccc54d0f03c96d0eec7a6e2fa124dadbc7298345b62ffc4238f173308c4325b5598f139695ff05a95cf78412ef6903599e4b814496612bf39aad4715a16375b + checksum: 10c0/0e9359cf2d117476310961dfcfd7204ed692e933707da10d6194153d3996cd2ea5b7635fc90d720dce3612083af89966bb862561064a509c350320dc98644751 languageName: node linkType: hard @@ -1309,11 +1302,11 @@ __metadata: linkType: hard "@babel/runtime@npm:^7.8.4": - version: 7.23.8 - resolution: "@babel/runtime@npm:7.23.8" + version: 7.25.6 + resolution: "@babel/runtime@npm:7.25.6" dependencies: regenerator-runtime: "npm:^0.14.0" - checksum: 10c0/ba5e8fbb32ef04f6cab5e89c54a0497c2fde7b730595cc1af93496270314f13ff2c6a9360fdb2f0bdd4d6b376752ce3cf85642bd6b876969a6a62954934c2df8 + checksum: 10c0/d6143adf5aa1ce79ed374e33fdfd74fa975055a80bc6e479672ab1eadc4e4bfd7484444e17dd063a1d180e051f3ec62b357c7a2b817e7657687b47313158c3d2 languageName: node linkType: hard @@ -1329,28 +1322,28 @@ __metadata: linkType: hard "@babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0, @babel/traverse@npm:^7.25.1, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.25.3, @babel/traverse@npm:^7.25.4": - version: 7.25.4 - resolution: "@babel/traverse@npm:7.25.4" + version: 7.25.6 + resolution: "@babel/traverse@npm:7.25.6" dependencies: "@babel/code-frame": "npm:^7.24.7" - "@babel/generator": "npm:^7.25.4" - "@babel/parser": "npm:^7.25.4" + "@babel/generator": "npm:^7.25.6" + "@babel/parser": "npm:^7.25.6" "@babel/template": "npm:^7.25.0" - "@babel/types": "npm:^7.25.4" + "@babel/types": "npm:^7.25.6" debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 10c0/37c9b49b277e051fe499ef5f6f217370c4f648d6370564d70b5e6beb2da75bfda6d7dab1d39504d89e9245448f8959bc1a5880d2238840cdc3979b35338ed0f5 + checksum: 10c0/964304c6fa46bd705428ba380bf73177eeb481c3f26d82ea3d0661242b59e0dd4329d23886035e9ca9a4ceb565c03a76fd615109830687a27bcd350059d6377e languageName: node linkType: hard -"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.4, @babel/types@npm:^7.4.4": - version: 7.25.4 - resolution: "@babel/types@npm:7.25.4" +"@babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.25.6, @babel/types@npm:^7.4.4": + version: 7.25.6 + resolution: "@babel/types@npm:7.25.6" dependencies: "@babel/helper-string-parser": "npm:^7.24.8" "@babel/helper-validator-identifier": "npm:^7.24.7" to-fast-properties: "npm:^2.0.0" - checksum: 10c0/9aa25dfcd89cc4e4dde3188091c34398a005a49e2c2b069d0367b41e1122c91e80fd92998c52a90f2fb500f7e897b6090ec8be263d9cb53d0d75c756f44419f2 + checksum: 10c0/89d45fbee24e27a05dca2d08300a26b905bd384a480448823f6723c72d3a30327c517476389b7280ce8cb9a2c48ef8f47da7f9f6d326faf6f53fd6b68237bdc4 languageName: node linkType: hard @@ -1952,7 +1945,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.5": +"@jridgewell/gen-mapping@npm:^0.3.5": version: 0.3.5 resolution: "@jridgewell/gen-mapping@npm:0.3.5" dependencies: @@ -1964,9 +1957,9 @@ __metadata: linkType: hard "@jridgewell/resolve-uri@npm:^3.1.0": - version: 3.1.1 - resolution: "@jridgewell/resolve-uri@npm:3.1.1" - checksum: 10c0/0dbc9e29bc640bbbdc5b9876d2859c69042bfcf1423c1e6421bcca53e826660bff4e41c7d4bcb8dbea696404231a6f902f76ba41835d049e20f2dd6cffb713bf + version: 3.1.2 + resolution: "@jridgewell/resolve-uri@npm:3.1.2" + checksum: 10c0/d502e6fb516b35032331406d4e962c21fe77cdf1cbdb49c6142bcbd9e30507094b18972778a6e27cbad756209cfe34b1a27729e6fa08a2eb92b33943f680cf1e languageName: node linkType: hard @@ -1978,23 +1971,23 @@ __metadata: linkType: hard "@jridgewell/source-map@npm:^0.3.3": - version: 0.3.5 - resolution: "@jridgewell/source-map@npm:0.3.5" + version: 0.3.6 + resolution: "@jridgewell/source-map@npm:0.3.6" dependencies: - "@jridgewell/gen-mapping": "npm:^0.3.0" - "@jridgewell/trace-mapping": "npm:^0.3.9" - checksum: 10c0/b985d9ebd833a21a6e9ace820c8a76f60345a34d9e28d98497c16b6e93ce1f131bff0abd45f8585f14aa382cce678ed680d628c631b40a9616a19cfbc2049b68 + "@jridgewell/gen-mapping": "npm:^0.3.5" + "@jridgewell/trace-mapping": "npm:^0.3.25" + checksum: 10c0/6a4ecc713ed246ff8e5bdcc1ef7c49aaa93f7463d948ba5054dda18b02dcc6a055e2828c577bcceee058f302ce1fc95595713d44f5c45e43d459f88d267f2f04 languageName: node linkType: hard "@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": - version: 1.4.15 - resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" - checksum: 10c0/0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5 + version: 1.5.0 + resolution: "@jridgewell/sourcemap-codec@npm:1.5.0" + checksum: 10c0/2eb864f276eb1096c3c11da3e9bb518f6d9fc0023c78344cdc037abadc725172c70314bdb360f2d4b7bffec7f5d657ce006816bc5d4ecb35e61b66132db00c18 languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.9": +"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25": version: 0.3.25 resolution: "@jridgewell/trace-mapping@npm:0.3.25" dependencies: @@ -2039,24 +2032,24 @@ __metadata: linkType: hard "@npmcli/agent@npm:^2.0.0": - version: 2.2.0 - resolution: "@npmcli/agent@npm:2.2.0" + version: 2.2.2 + resolution: "@npmcli/agent@npm:2.2.2" dependencies: agent-base: "npm:^7.1.0" http-proxy-agent: "npm:^7.0.0" https-proxy-agent: "npm:^7.0.1" lru-cache: "npm:^10.0.1" - socks-proxy-agent: "npm:^8.0.1" - checksum: 10c0/7b89590598476dda88e79c473766b67c682aae6e0ab0213491daa6083dcc0c171f86b3868f5506f22c09aa5ea69ad7dfb78f4bf39a8dca375d89a42f408645b3 + socks-proxy-agent: "npm:^8.0.3" + checksum: 10c0/325e0db7b287d4154ecd164c0815c08007abfb07653cc57bceded17bb7fd240998a3cbdbe87d700e30bef494885eccc725ab73b668020811d56623d145b524ae languageName: node linkType: hard "@npmcli/fs@npm:^3.1.0": - version: 3.1.0 - resolution: "@npmcli/fs@npm:3.1.0" + version: 3.1.1 + resolution: "@npmcli/fs@npm:3.1.1" dependencies: semver: "npm:^7.3.5" - checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e + checksum: 10c0/c37a5b4842bfdece3d14dfdb054f73fe15ed2d3da61b34ff76629fb5b1731647c49166fd2a8bf8b56fcfa51200382385ea8909a3cbecdad612310c114d3f6c99 languageName: node linkType: hard @@ -2182,11 +2175,11 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 20.11.6 - resolution: "@types/node@npm:20.11.6" + version: 22.5.4 + resolution: "@types/node@npm:22.5.4" dependencies: - undici-types: "npm:~5.26.4" - checksum: 10c0/922bc1e78076bb79fd168902c80321b54487181e3be3386e183fc535d102d91c8902da25148eaec841410fab7fb872fd4a93ec9ac9299cedf0ebcbf16b442aa1 + undici-types: "npm:~6.19.2" + checksum: 10c0/b445daa7eecd761ad4d778b882d6ff7bcc3b4baad2086ea9804db7c5d4a4ab0298b00d7f5315fc640a73b5a1d52bbf9628e09c9fec0cf44dbf9b4df674a8717d languageName: node linkType: hard @@ -2198,11 +2191,11 @@ __metadata: linkType: hard "@types/yargs@npm:^17.0.8": - version: 17.0.32 - resolution: "@types/yargs@npm:17.0.32" + version: 17.0.33 + resolution: "@types/yargs@npm:17.0.33" dependencies: "@types/yargs-parser": "npm:*" - checksum: 10c0/2095e8aad8a4e66b86147415364266b8d607a3b95b4239623423efd7e29df93ba81bb862784a6e08664f645cc1981b25fd598f532019174cd3e5e1e689e1cccf + checksum: 10c0/d16937d7ac30dff697801c3d6f235be2166df42e4a88bf730fa6dc09201de3727c0a9500c59a672122313341de5f24e45ee0ff579c08ce91928e519090b7906b languageName: node linkType: hard @@ -2430,20 +2423,20 @@ __metadata: linkType: hard "acorn@npm:^8.12.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2": - version: 8.12.0 - resolution: "acorn@npm:8.12.0" + version: 8.12.1 + resolution: "acorn@npm:8.12.1" bin: acorn: bin/acorn - checksum: 10c0/a19f9dead009d3b430fa3c253710b47778cdaace15b316de6de93a68c355507bc1072a9956372b6c990cbeeb167d4a929249d0faeb8ae4bb6911d68d53299549 + checksum: 10c0/51fb26cd678f914e13287e886da2d7021f8c2bc0ccc95e03d3e0447ee278dd3b40b9c57dc222acd5881adcf26f3edc40901a4953403232129e3876793cd17386 languageName: node linkType: hard -"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": - version: 7.1.0 - resolution: "agent-base@npm:7.1.0" +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": + version: 7.1.1 + resolution: "agent-base@npm:7.1.1" dependencies: debug: "npm:^4.3.4" - checksum: 10c0/fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce + checksum: 10c0/e59ce7bed9c63bf071a30cc471f2933862044c97fd9958967bfe22521d7a0f601ce4ed5a8c011799d0c726ca70312142ae193bbebb60f576b52be19d4a363b50 languageName: node linkType: hard @@ -2504,14 +2497,14 @@ __metadata: linkType: hard "ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.9.0": - version: 8.12.0 - resolution: "ajv@npm:8.12.0" + version: 8.17.1 + resolution: "ajv@npm:8.17.1" dependencies: - fast-deep-equal: "npm:^3.1.1" + fast-deep-equal: "npm:^3.1.3" + fast-uri: "npm:^3.0.1" json-schema-traverse: "npm:^1.0.0" require-from-string: "npm:^2.0.2" - uri-js: "npm:^4.2.2" - checksum: 10c0/ac4f72adf727ee425e049bc9d8b31d4a57e1c90da8d28bcd23d60781b12fcd6fc3d68db5df16994c57b78b94eed7988f5a6b482fd376dc5b084125e20a0a622e + checksum: 10c0/ec3ba10a573c6b60f94639ffc53526275917a2df6810e4ab5a6b959d87459f9ef3f00d5e7865b82677cb7d21590355b34da14d1d0b9c32d75f95a187e76fff35 languageName: node linkType: hard @@ -2523,9 +2516,9 @@ __metadata: linkType: hard "ansi-regex@npm:^6.0.1": - version: 6.0.1 - resolution: "ansi-regex@npm:6.0.1" - checksum: 10c0/cbe16dbd2c6b2735d1df7976a7070dd277326434f0212f43abf6d87674095d247968209babdaad31bb00882fa68807256ba9be340eec2f1004de14ca75f52a08 + version: 6.1.0 + resolution: "ansi-regex@npm:6.1.0" + checksum: 10c0/a91daeddd54746338478eef88af3439a7edf30f8e23196e2d6ed182da9add559c601266dbef01c2efa46a958ad6f1f8b176799657616c702b5b02e799e7fd8dc languageName: node linkType: hard @@ -2618,27 +2611,27 @@ __metadata: linkType: hard "async@npm:^3.2.2": - version: 3.2.5 - resolution: "async@npm:3.2.5" - checksum: 10c0/1408287b26c6db67d45cb346e34892cee555b8b59e6c68e6f8c3e495cad5ca13b4f218180e871f3c2ca30df4ab52693b66f2f6ff43644760cab0b2198bda79c1 + version: 3.2.6 + resolution: "async@npm:3.2.6" + checksum: 10c0/36484bb15ceddf07078688d95e27076379cc2f87b10c03b6dd8a83e89475a3c8df5848859dd06a4c95af1e4c16fc973de0171a77f18ea00be899aca2a4f85e70 languageName: node linkType: hard "autoprefixer@npm:^10.4.19": - version: 10.4.19 - resolution: "autoprefixer@npm:10.4.19" + version: 10.4.20 + resolution: "autoprefixer@npm:10.4.20" dependencies: - browserslist: "npm:^4.23.0" - caniuse-lite: "npm:^1.0.30001599" + browserslist: "npm:^4.23.3" + caniuse-lite: "npm:^1.0.30001646" fraction.js: "npm:^4.3.7" normalize-range: "npm:^0.1.2" - picocolors: "npm:^1.0.0" + picocolors: "npm:^1.0.1" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.1.0 bin: autoprefixer: bin/autoprefixer - checksum: 10c0/fe0178eb8b1da4f15c6535cd329926609b22d1811e047371dccce50563623f8075dd06fb167daff059e4228da651b0bdff6d9b44281541eaf0ce0b79125bfd19 + checksum: 10c0/e1f00978a26e7c5b54ab12036d8c13833fad7222828fc90914771b1263f51b28c7ddb5803049de4e77696cbd02bb25cfc3634e80533025bb26c26aacdf938940 languageName: node linkType: hard @@ -2656,15 +2649,15 @@ __metadata: linkType: hard "babel-plugin-polyfill-corejs2@npm:^0.4.10": - version: 0.4.10 - resolution: "babel-plugin-polyfill-corejs2@npm:0.4.10" + version: 0.4.11 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.11" dependencies: "@babel/compat-data": "npm:^7.22.6" - "@babel/helper-define-polyfill-provider": "npm:^0.6.1" + "@babel/helper-define-polyfill-provider": "npm:^0.6.2" semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 10c0/910bfb1d809cae49cf43348f9b1e4a5e4c895aa25686fdd2ff8af7b7a996b88ad39597707905d097e08d4e70e14340ac935082ef4e035e77f68741f813f2a80d + checksum: 10c0/b2217bc8d5976cf8142453ed44daabf0b2e0e75518f24eac83b54a8892e87a88f1bd9089daa92fd25df979ecd0acfd29b6bc28c4182c1c46344cee15ef9bce84 languageName: node linkType: hard @@ -2681,13 +2674,13 @@ __metadata: linkType: hard "babel-plugin-polyfill-regenerator@npm:^0.6.1": - version: 0.6.1 - resolution: "babel-plugin-polyfill-regenerator@npm:0.6.1" + version: 0.6.2 + resolution: "babel-plugin-polyfill-regenerator@npm:0.6.2" dependencies: - "@babel/helper-define-polyfill-provider": "npm:^0.6.1" + "@babel/helper-define-polyfill-provider": "npm:^0.6.2" peerDependencies: "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 - checksum: 10c0/0b55a35a75a261f62477d8d0f0c4a8e3b66f109323ce301d7de6898e168c41224de3bc26a92f48f2c7fcc19dfd1fc60fe71098bfd4f804a0463ff78586892403 + checksum: 10c0/bc541037cf7620bc84ddb75a1c0ce3288f90e7d2799c070a53f8a495c8c8ae0316447becb06f958dd25dcce2a2fce855d318ecfa48036a1ddb218d55aa38a744 languageName: node linkType: hard @@ -2713,9 +2706,9 @@ __metadata: linkType: hard "binary-extensions@npm:^2.0.0": - version: 2.2.0 - resolution: "binary-extensions@npm:2.2.0" - checksum: 10c0/d73d8b897238a2d3ffa5f59c0241870043aa7471335e89ea5e1ff48edb7c2d0bb471517a3e4c5c3f4c043615caa2717b5f80a5e61e07503d51dc85cb848e665d + version: 2.3.0 + resolution: "binary-extensions@npm:2.3.0" + checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5 languageName: node linkType: hard @@ -2754,7 +2747,7 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3": +"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.23.1, browserslist@npm:^4.23.3": version: 4.23.3 resolution: "browserslist@npm:4.23.3" dependencies: @@ -2776,8 +2769,8 @@ __metadata: linkType: hard "cacache@npm:^18.0.0": - version: 18.0.2 - resolution: "cacache@npm:18.0.2" + version: 18.0.4 + resolution: "cacache@npm:18.0.4" dependencies: "@npmcli/fs": "npm:^3.1.0" fs-minipass: "npm:^3.0.0" @@ -2791,7 +2784,7 @@ __metadata: ssri: "npm:^10.0.0" tar: "npm:^6.1.11" unique-filename: "npm:^3.0.0" - checksum: 10c0/7992665305cc251a984f4fdbab1449d50e88c635bc43bf2785530c61d239c61b349e5734461baa461caaee65f040ab14e2d58e694f479c0810cffd181ba5eabc + checksum: 10c0/6c055bafed9de4f3dcc64ac3dc7dd24e863210902b7c470eb9ce55a806309b3efff78033e3d8b4f7dcc5d467f2db43c6a2857aaaf26f0094b8a351d44c42179f languageName: node linkType: hard @@ -2814,10 +2807,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001646": - version: 1.0.30001653 - resolution: "caniuse-lite@npm:1.0.30001653" - checksum: 10c0/7aedf037541c93744148f599daea93d46d1f93ab4347997189efa2d1f003af8eadd7e1e05347ef09261ac1dc635ce375b8c6c00796245fffb4120a124824a14f +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001646": + version: 1.0.30001660 + resolution: "caniuse-lite@npm:1.0.30001660" + checksum: 10c0/d28900b56c597176d515c3175ca75c454f2d30cb2c09a44d7bdb009bb0c4d8a2557905adb77642889bbe9feb85fbfe9d974c8b8e53521fb4b50ee16ab246104e languageName: node linkType: hard @@ -2869,9 +2862,9 @@ __metadata: linkType: hard "chrome-trace-event@npm:^1.0.2": - version: 1.0.3 - resolution: "chrome-trace-event@npm:1.0.3" - checksum: 10c0/080ce2d20c2b9e0f8461a380e9585686caa768b1c834a464470c9dc74cda07f27611c7b727a2cd768a9cecd033297fdec4ce01f1e58b62227882c1059dec321c + version: 1.0.4 + resolution: "chrome-trace-event@npm:1.0.4" + checksum: 10c0/3058da7a5f4934b87cf6a90ef5fb68ebc5f7d06f143ed5a4650208e5d7acae47bc03ec844b29fbf5ba7e46e8daa6acecc878f7983a4f4bb7271593da91e61ff5 languageName: node linkType: hard @@ -3201,43 +3194,43 @@ __metadata: languageName: node linkType: hard -"cssnano-preset-default@npm:^7.0.1": - version: 7.0.1 - resolution: "cssnano-preset-default@npm:7.0.1" +"cssnano-preset-default@npm:^7.0.6": + version: 7.0.6 + resolution: "cssnano-preset-default@npm:7.0.6" dependencies: - browserslist: "npm:^4.23.0" + browserslist: "npm:^4.23.3" css-declaration-sorter: "npm:^7.2.0" cssnano-utils: "npm:^5.0.0" - postcss-calc: "npm:^10.0.0" - postcss-colormin: "npm:^7.0.0" - postcss-convert-values: "npm:^7.0.0" - postcss-discard-comments: "npm:^7.0.0" - postcss-discard-duplicates: "npm:^7.0.0" + postcss-calc: "npm:^10.0.2" + postcss-colormin: "npm:^7.0.2" + postcss-convert-values: "npm:^7.0.4" + postcss-discard-comments: "npm:^7.0.3" + postcss-discard-duplicates: "npm:^7.0.1" postcss-discard-empty: "npm:^7.0.0" postcss-discard-overridden: "npm:^7.0.0" - postcss-merge-longhand: "npm:^7.0.0" - postcss-merge-rules: "npm:^7.0.0" + postcss-merge-longhand: "npm:^7.0.4" + postcss-merge-rules: "npm:^7.0.4" postcss-minify-font-values: "npm:^7.0.0" postcss-minify-gradients: "npm:^7.0.0" - postcss-minify-params: "npm:^7.0.0" - postcss-minify-selectors: "npm:^7.0.0" + postcss-minify-params: "npm:^7.0.2" + postcss-minify-selectors: "npm:^7.0.4" postcss-normalize-charset: "npm:^7.0.0" postcss-normalize-display-values: "npm:^7.0.0" postcss-normalize-positions: "npm:^7.0.0" postcss-normalize-repeat-style: "npm:^7.0.0" postcss-normalize-string: "npm:^7.0.0" postcss-normalize-timing-functions: "npm:^7.0.0" - postcss-normalize-unicode: "npm:^7.0.0" + postcss-normalize-unicode: "npm:^7.0.2" postcss-normalize-url: "npm:^7.0.0" postcss-normalize-whitespace: "npm:^7.0.0" - postcss-ordered-values: "npm:^7.0.0" - postcss-reduce-initial: "npm:^7.0.0" + postcss-ordered-values: "npm:^7.0.1" + postcss-reduce-initial: "npm:^7.0.2" postcss-reduce-transforms: "npm:^7.0.0" - postcss-svgo: "npm:^7.0.0" - postcss-unique-selectors: "npm:^7.0.0" + postcss-svgo: "npm:^7.0.1" + postcss-unique-selectors: "npm:^7.0.3" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/bee65239d25de2ba87e85b4091cbc1cac9ba1b57c9f803dff5a71ea8a55a885045805840dd732be284c28cca6343dece37fc76d7096aba37cfa02eff2ee7714c + checksum: 10c0/5c827a9f6b35475267af0512d55f569994b8334eb06565498daa2070ef52f0cdd2013f5efc1cbc0b4664370f491b0080f93c8ee56a7730d38fdf451fb65b030c languageName: node linkType: hard @@ -3251,14 +3244,14 @@ __metadata: linkType: hard "cssnano@npm:^7.0.1": - version: 7.0.1 - resolution: "cssnano@npm:7.0.1" + version: 7.0.6 + resolution: "cssnano@npm:7.0.6" dependencies: - cssnano-preset-default: "npm:^7.0.1" - lilconfig: "npm:^3.1.1" + cssnano-preset-default: "npm:^7.0.6" + lilconfig: "npm:^3.1.2" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/8b17d13efe98ec2db2fbde9ca24e91842b9afe2f80becc5e4271ee1170d77cf73eed3cdc2f35ed51bacdeac763ff85db45ae8e9627a8862bf01d457a819a640e + checksum: 10c0/19ff09931a1531e7c0c0d8928da554d99213aa0bb1f3b93cc6b4987727d60a8cd5537b113a5cf4f95cc1db65bba3f2b35476bd63bb57e7469d4eab73e07d736d languageName: node linkType: hard @@ -3272,14 +3265,14 @@ __metadata: linkType: hard "debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6": - version: 4.3.6 - resolution: "debug@npm:4.3.6" + version: 4.3.7 + resolution: "debug@npm:4.3.7" dependencies: - ms: "npm:2.1.2" + ms: "npm:^2.1.3" peerDependenciesMeta: supports-color: optional: true - checksum: 10c0/3293416bff072389c101697d4611c402a6bacd1900ac20c0492f61a9cdd6b3b29750fc7f5e299f8058469ef60ff8fb79b86395a30374fbd2490113c1c7112285 + checksum: 10c0/1471db19c3b06d485a622d62f65947a19a23fbd0dd73f7fd3eafb697eec5360cde447fb075919987899b1a2096e85d35d4eb5a4de09a57600ac9cf7e6c8e768b languageName: node linkType: hard @@ -3360,9 +3353,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.4": - version: 1.5.13 - resolution: "electron-to-chromium@npm:1.5.13" - checksum: 10c0/1d88ac39447e1d718c4296f92fe89836df4688daf2d362d6c49108136795f05a56dd9c950f1c6715e0395fa037c3b5f5ea686c543fdc90e6d74a005877c45022 + version: 1.5.19 + resolution: "electron-to-chromium@npm:1.5.19" + checksum: 10c0/73e25a928e041d707565fb08371b6ba5f3d7d99c78adddfd553660f28809ca22f1608ff295da3c764903a8eae890cbdd701b1b64b3e1eaeb298cb8aecbf21937 languageName: node linkType: hard @@ -3421,11 +3414,11 @@ __metadata: linkType: hard "envinfo@npm:^7.7.3": - version: 7.11.0 - resolution: "envinfo@npm:7.11.0" + version: 7.13.0 + resolution: "envinfo@npm:7.13.0" bin: envinfo: dist/cli.js - checksum: 10c0/4415b9c1ca32cdf92ce126136b9965eeac2efd6ab7e5278c06e8f86d048edad87ef4084710313a6d938ef9bc084ab17e1caee16339d731d230f3e2650f3aaf4d + checksum: 10c0/9c279213cbbb353b3171e8e333fd2ed564054abade08ab3d735fe136e10a0e14e0588e1ce77e6f01285f2462eaca945d64f0778be5ae3d9e82804943e36a4411 languageName: node linkType: hard @@ -3446,16 +3439,16 @@ __metadata: linkType: hard "es-module-lexer@npm:^1.2.1": - version: 1.4.1 - resolution: "es-module-lexer@npm:1.4.1" - checksum: 10c0/b7260a138668554d3f0ddcc728cb4b60c2fa463f15545cf155ecbdd5450a1348952d58298a7f48642e900ee579f21d7f5304b6b3c61b3d9fc2d4b2109b5a9dff + version: 1.5.4 + resolution: "es-module-lexer@npm:1.5.4" + checksum: 10c0/300a469488c2f22081df1e4c8398c78db92358496e639b0df7f89ac6455462aaf5d8893939087c1a1cbcbf20eed4610c70e0bcb8f3e4b0d80a5d2611c539408c languageName: node linkType: hard "escalade@npm:^3.1.2": - version: 3.1.2 - resolution: "escalade@npm:3.1.2" - checksum: 10c0/6b4adafecd0682f3aa1cd1106b8fff30e492c7015b178bc81b2d2f75106dabea6c6d6e8508fc491bd58e597c74abb0e8e2368f943ecb9393d4162e3c2f3cf287 + version: 3.2.0 + resolution: "escalade@npm:3.2.0" + checksum: 10c0/ced4dd3a78e15897ed3be74e635110bbf3b08877b0a41be50dcb325ee0e0b5f65fc2d50e9845194d7c4633f327e2e1c6cce00a71b617c5673df0374201d67f65 languageName: node linkType: hard @@ -3596,11 +3589,11 @@ __metadata: linkType: hard "esquery@npm:^1.5.0": - version: 1.5.0 - resolution: "esquery@npm:1.5.0" + version: 1.6.0 + resolution: "esquery@npm:1.6.0" dependencies: estraverse: "npm:^5.1.0" - checksum: 10c0/a084bd049d954cc88ac69df30534043fb2aee5555b56246493f42f27d1e168f00d9e5d4192e46f10290d312dc30dc7d58994d61a609c579c1219d636996f9213 + checksum: 10c0/cb9065ec605f9da7a76ca6dadb0619dfb611e37a81e318732977d90fab50a256b95fee2d925fba7c2f3f0523aa16f91587246693bc09bc34d5a59575fe6e93d2 languageName: node linkType: hard @@ -3682,6 +3675,13 @@ __metadata: languageName: node linkType: hard +"fast-uri@npm:^3.0.1": + version: 3.0.1 + resolution: "fast-uri@npm:3.0.1" + checksum: 10c0/3cd46d6006083b14ca61ffe9a05b8eef75ef87e9574b6f68f2e17ecf4daa7aaadeff44e3f0f7a0ef4e0f7e7c20fc07beec49ff14dc72d0b500f00386592f2d10 + languageName: node + linkType: hard + "fastest-levenshtein@npm:^1.0.12, fastest-levenshtein@npm:^1.0.16": version: 1.0.16 resolution: "fastest-levenshtein@npm:1.0.16" @@ -3697,11 +3697,11 @@ __metadata: linkType: hard "fastq@npm:^1.6.0": - version: 1.16.0 - resolution: "fastq@npm:1.16.0" + version: 1.17.1 + resolution: "fastq@npm:1.17.1" dependencies: reusify: "npm:^1.0.4" - checksum: 10c0/38c1b49adba639af020727284a02af021acab764efd7f088bc31364e8a5b01ce9031eb6c5f7f304019b8267c3b7c236e79d6904884f50f94f83b1700b8a6619a + checksum: 10c0/1095f16cea45fb3beff558bb3afa74ca7a9250f5a670b65db7ed585f92b4b48381445cd328b3d87323da81e43232b5d5978a8201bde84e0cd514310f1ea6da34 languageName: node linkType: hard @@ -3715,11 +3715,11 @@ __metadata: linkType: hard "file-entry-cache@npm:^9.0.0": - version: 9.0.0 - resolution: "file-entry-cache@npm:9.0.0" + version: 9.1.0 + resolution: "file-entry-cache@npm:9.1.0" dependencies: flat-cache: "npm:^5.0.0" - checksum: 10c0/07b0a4f062dc0aa258f3e1b06ac083ea25313f5e289943e146fafdaf3315dcc031635545eea7fe98fe5598b91d6c7f48dba7a251dd7ac20108a6ebf7d00b0b1c + checksum: 10c0/4b4dbc1e972f50202b1a4430d30fd99378ef6e2a64857176abdc65c5e4730a948fb37e274478520a7bacbc70f3abba455a4b9d2c1915c53f30d11dc85d3fef5e languageName: node linkType: hard @@ -3773,13 +3773,12 @@ __metadata: linkType: hard "flat-cache@npm:^4.0.0": - version: 4.0.0 - resolution: "flat-cache@npm:4.0.0" + version: 4.0.1 + resolution: "flat-cache@npm:4.0.1" dependencies: flatted: "npm:^3.2.9" keyv: "npm:^4.5.4" - rimraf: "npm:^5.0.5" - checksum: 10c0/8f99e27bb3de94e91e7b4ca5120488cdc2b7f8cd952a538f1a566101963057eb42ca318e9fac0d36987dcca34316ff04b61c1dc3dcc8084f6f5e801a52a8e547 + checksum: 10c0/2c59d93e9faa2523e4fda6b4ada749bed432cfa28c8e251f33b25795e426a1c6dbada777afb1f74fcfff33934fdbdea921ee738fcc33e71adc9d6eca984a1cfc languageName: node linkType: hard @@ -3810,12 +3809,12 @@ __metadata: linkType: hard "foreground-child@npm:^3.1.0": - version: 3.1.1 - resolution: "foreground-child@npm:3.1.1" + version: 3.3.0 + resolution: "foreground-child@npm:3.3.0" dependencies: cross-spawn: "npm:^7.0.0" signal-exit: "npm:^4.0.1" - checksum: 10c0/9700a0285628abaeb37007c9a4d92bd49f67210f09067638774338e146c8e9c825c5c877f072b2f75f41dc6a2d0be8664f79ffc03f6576649f54a84fb9b47de0 + checksum: 10c0/028f1d41000553fcfa6c4bb5c372963bf3d9bf0b1f25a87d1a6253014343fb69dfb1b42d9625d7cf44c8ba429940f3d0ff718b62105d4d4a4f6ef8ca0a53faa2 languageName: node linkType: hard @@ -3923,18 +3922,19 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7": - version: 10.3.10 - resolution: "glob@npm:10.3.10" +"glob@npm:^10.2.2, glob@npm:^10.3.10": + version: 10.4.5 + resolution: "glob@npm:10.4.5" dependencies: foreground-child: "npm:^3.1.0" - jackspeak: "npm:^2.3.5" - minimatch: "npm:^9.0.1" - minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry: "npm:^1.10.1" + jackspeak: "npm:^3.1.2" + minimatch: "npm:^9.0.4" + minipass: "npm:^7.1.2" + package-json-from-dist: "npm:^1.0.0" + path-scurry: "npm:^1.11.1" bin: glob: dist/esm/bin.mjs - checksum: 10c0/13d8a1feb7eac7945f8c8480e11cd4a44b24d26503d99a8d8ac8d5aefbf3e9802a2b6087318a829fad04cb4e829f25c5f4f1110c68966c498720dd261c7e344d + checksum: 10c0/19a9759ea77b8e3ca0a43c2f07ecddc2ad46216b786bb8f993c445aee80d345925a21e5280c7b7c6c59e860a0154b84e4b2b60321fea92cd3c56b4a7489f160e languageName: node linkType: hard @@ -4080,12 +4080,12 @@ __metadata: languageName: node linkType: hard -"hasown@npm:^2.0.0": - version: 2.0.0 - resolution: "hasown@npm:2.0.0" +"hasown@npm:^2.0.2": + version: 2.0.2 + resolution: "hasown@npm:2.0.2" dependencies: function-bind: "npm:^1.1.2" - checksum: 10c0/5d415b114f410661208c95e7ab4879f1cc2765b8daceff4dc8718317d1cb7b9ffa7c5d1eafd9a4389c9aab7445d6ea88e05f3096cb1e529618b55304956b87fc + checksum: 10c0/3769d434703b8ac66b209a4cca0737519925bbdb61dd887f93a16372b14694c63ff4e797686d87c90f08168e81082248b9b028bad60d4da9e0d1148766f56eb9 languageName: node linkType: hard @@ -4111,22 +4111,22 @@ __metadata: linkType: hard "http-proxy-agent@npm:^7.0.0": - version: 7.0.0 - resolution: "http-proxy-agent@npm:7.0.0" + version: 7.0.2 + resolution: "http-proxy-agent@npm:7.0.2" dependencies: agent-base: "npm:^7.1.0" debug: "npm:^4.3.4" - checksum: 10c0/a11574ff39436cee3c7bc67f259444097b09474605846ddd8edf0bf4ad8644be8533db1aa463426e376865047d05dc22755e638632819317c0c2f1b2196657c8 + checksum: 10c0/4207b06a4580fb85dd6dff521f0abf6db517489e70863dca1a0291daa7f2d3d2d6015a57bd702af068ea5cf9f1f6ff72314f5f5b4228d299c0904135d2aef921 languageName: node linkType: hard "https-proxy-agent@npm:^7.0.1": - version: 7.0.2 - resolution: "https-proxy-agent@npm:7.0.2" + version: 7.0.5 + resolution: "https-proxy-agent@npm:7.0.5" dependencies: agent-base: "npm:^7.0.2" debug: "npm:4" - checksum: 10c0/7735eb90073db087e7e79312e3d97c8c04baf7ea7ca7b013382b6a45abbaa61b281041a98f4e13c8c80d88f843785bcc84ba189165b4b4087b1e3496ba656d77 + checksum: 10c0/2490e3acec397abeb88807db52cac59102d5ed758feee6df6112ab3ccd8325e8a1ce8bce6f4b66e5470eca102d31e425ace904242e4fa28dbe0c59c4bafa7b2c languageName: node linkType: hard @@ -4156,9 +4156,9 @@ __metadata: linkType: hard "immutable@npm:^4.0.0": - version: 4.3.4 - resolution: "immutable@npm:4.3.4" - checksum: 10c0/c15b9f0fa7b3c9315725cb00704fddad59f0e668a7379c39b9a528a8386140ee9effb015ae51a5b423e05c59d15fc0b38c970db6964ad6b3e05d0761db68441f + version: 4.3.7 + resolution: "immutable@npm:4.3.7" + checksum: 10c0/9b099197081b22f6433003e34929da8ecddbbdc1474cdc8aa3b7669dee4adda349c06143de22def36016d1b6de5322b043eccd7a11db1dad2ca85dad4fff5435 languageName: node linkType: hard @@ -4173,14 +4173,14 @@ __metadata: linkType: hard "import-local@npm:^3.0.2": - version: 3.1.0 - resolution: "import-local@npm:3.1.0" + version: 3.2.0 + resolution: "import-local@npm:3.2.0" dependencies: pkg-dir: "npm:^4.2.0" resolve-cwd: "npm:^3.0.0" bin: import-local-fixture: fixtures/cli.js - checksum: 10c0/c67ecea72f775fe8684ca3d057e54bdb2ae28c14bf261d2607c269c18ea0da7b730924c06262eca9aed4b8ab31e31d65bc60b50e7296c85908a56e2f7d41ecd2 + checksum: 10c0/94cd6367a672b7e0cb026970c85b76902d2710a64896fa6de93bd5c571dd03b228c5759308959de205083e3b1c61e799f019c9e36ee8e9c523b993e1057f0433 languageName: node linkType: hard @@ -4229,10 +4229,13 @@ __metadata: languageName: node linkType: hard -"ip@npm:^2.0.0": - version: 2.0.1 - resolution: "ip@npm:2.0.1" - checksum: 10c0/cab8eb3e88d0abe23e4724829621ec4c4c5cb41a7f936a2e626c947128c1be16ed543448d42af7cca95379f9892bfcacc1ccd8d09bc7e8bea0e86d492ce33616 +"ip-address@npm:^9.0.5": + version: 9.0.5 + resolution: "ip-address@npm:9.0.5" + dependencies: + jsbn: "npm:1.1.0" + sprintf-js: "npm:^1.1.3" + checksum: 10c0/331cd07fafcb3b24100613e4b53e1a2b4feab11e671e655d46dc09ee233da5011284d09ca40c4ecbdfe1d0004f462958675c224a804259f2f78d2465a87824bc languageName: node linkType: hard @@ -4253,11 +4256,11 @@ __metadata: linkType: hard "is-core-module@npm:^2.13.0": - version: 2.13.1 - resolution: "is-core-module@npm:2.13.1" + version: 2.15.1 + resolution: "is-core-module@npm:2.15.1" dependencies: - hasown: "npm:^2.0.0" - checksum: 10c0/2cba9903aaa52718f11c4896dabc189bab980870aae86a62dc0d5cedb546896770ee946fb14c84b7adf0735f5eaea4277243f1b95f5cefa90054f92fbcac2518 + hasown: "npm:^2.0.2" + checksum: 10c0/53432f10c69c40bfd2fa8914133a68709ff9498c86c3bf5fca3cdf3145a56fd2168cbf4a43b29843a6202a120a5f9c5ffba0a4322e1e3441739bc0b641682612 languageName: node linkType: hard @@ -4367,16 +4370,16 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.3.5": - version: 2.3.6 - resolution: "jackspeak@npm:2.3.6" +"jackspeak@npm:^3.1.2": + version: 3.4.3 + resolution: "jackspeak@npm:3.4.3" dependencies: "@isaacs/cliui": "npm:^8.0.2" "@pkgjs/parseargs": "npm:^0.11.0" dependenciesMeta: "@pkgjs/parseargs": optional: true - checksum: 10c0/f01d8f972d894cd7638bc338e9ef5ddb86f7b208ce177a36d718eac96ec86638a6efa17d0221b10073e64b45edc2ce15340db9380b1f5d5c5d000cbc517dc111 + checksum: 10c0/6acc10d139eaefdbe04d2f679e6191b3abf073f111edf10b1de5302c97ec93fffeb2fdd8681ed17f16268aa9dd4f8c588ed9d1d3bffbbfa6e8bf897cbb3149b9 languageName: node linkType: hard @@ -4460,11 +4463,11 @@ __metadata: linkType: hard "jiti@npm:^1.20.0": - version: 1.21.0 - resolution: "jiti@npm:1.21.0" + version: 1.21.6 + resolution: "jiti@npm:1.21.6" bin: jiti: bin/jiti.js - checksum: 10c0/7f361219fe6c7a5e440d5f1dba4ab763a5538d2df8708cdc22561cf25ea3e44b837687931fca7cdd8cdd9f567300e90be989dd1321650045012d8f9ed6aab07f + checksum: 10c0/05b9ed58cd30d0c3ccd3c98209339e74f50abd9a17e716f65db46b6a35812103f6bde6e134be7124d01745586bca8cc5dae1d0d952267c3ebe55171949c32e56 languageName: node linkType: hard @@ -4505,6 +4508,13 @@ __metadata: languageName: node linkType: hard +"jsbn@npm:1.1.0": + version: 1.1.0 + resolution: "jsbn@npm:1.1.0" + checksum: 10c0/4f907fb78d7b712e11dea8c165fe0921f81a657d3443dde75359ed52eb2b5d33ce6773d97985a089f09a65edd80b11cb75c767b57ba47391fee4c969f7215c96 + languageName: node + linkType: hard + "jsesc@npm:^2.5.1": version: 2.5.2 resolution: "jsesc@npm:2.5.2" @@ -4611,10 +4621,10 @@ __metadata: languageName: node linkType: hard -"lilconfig@npm:^3.1.1": - version: 3.1.1 - resolution: "lilconfig@npm:3.1.1" - checksum: 10c0/311b559794546894e3fe176663427326026c1c644145be9e8041c58e268aa9328799b8dfe7e4dd8c6a4ae305feae95a1c9e007db3569f35b42b6e1bc8274754c +"lilconfig@npm:^3.1.2": + version: 3.1.2 + resolution: "lilconfig@npm:3.1.2" + checksum: 10c0/f059630b1a9bddaeba83059db00c672b64dc14074e9f232adce32b38ca1b5686ab737eb665c5ba3c32f147f0002b4bee7311ad0386a9b98547b5623e87071fbe languageName: node linkType: hard @@ -4712,10 +4722,10 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0": - version: 10.1.0 - resolution: "lru-cache@npm:10.1.0" - checksum: 10c0/778bc8b2626daccd75f24c4b4d10632496e21ba064b126f526c626fbdbc5b28c472013fccd45d7646b9e1ef052444824854aed617b59cd570d01a8b7d651fc1e +"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": + version: 10.4.3 + resolution: "lru-cache@npm:10.4.3" + checksum: 10c0/ebd04fbca961e6c1d6c0af3799adcc966a1babe798f685bb84e6599266599cd95d94630b10262f5424539bc4640107e8a33aa28585374abf561d30d16f4b39fb languageName: node linkType: hard @@ -4728,15 +4738,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^6.0.0": - version: 6.0.0 - resolution: "lru-cache@npm:6.0.0" - dependencies: - yallist: "npm:^4.0.0" - checksum: 10c0/cb53e582785c48187d7a188d3379c181b5ca2a9c78d2bce3e7dee36f32761d1c42983da3fe12b55cb74e1779fa94cdc2e5367c028a9b35317184ede0c07a30a9 - languageName: node - linkType: hard - "make-dir@npm:^2.1.0": version: 2.1.0 resolution: "make-dir@npm:2.1.0" @@ -4748,8 +4749,8 @@ __metadata: linkType: hard "make-fetch-happen@npm:^13.0.0": - version: 13.0.0 - resolution: "make-fetch-happen@npm:13.0.0" + version: 13.0.1 + resolution: "make-fetch-happen@npm:13.0.1" dependencies: "@npmcli/agent": "npm:^2.0.0" cacache: "npm:^18.0.0" @@ -4760,9 +4761,10 @@ __metadata: minipass-flush: "npm:^1.0.5" minipass-pipeline: "npm:^1.2.4" negotiator: "npm:^0.6.3" + proc-log: "npm:^4.2.0" promise-retry: "npm:^2.0.1" ssri: "npm:^10.0.0" - checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55 + checksum: 10c0/df5f4dbb6d98153b751bccf4dc4cc500de85a96a9331db9805596c46aa9f99d9555983954e6c1266d9f981ae37a9e4647f42b9a4bb5466f867f4012e582c9e7e languageName: node linkType: hard @@ -4855,12 +4857,12 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.1": - version: 9.0.3 - resolution: "minimatch@npm:9.0.3" +"minimatch@npm:^9.0.4": + version: 9.0.5 + resolution: "minimatch@npm:9.0.5" dependencies: brace-expansion: "npm:^2.0.1" - checksum: 10c0/85f407dcd38ac3e180f425e86553911d101455ca3ad5544d6a7cec16286657e4f8a9aa6695803025c55e31e35a91a2252b5dc8e7d527211278b8b65b4dbd5eac + checksum: 10c0/de96cf5e35bdf0eab3e2c853522f98ffbe9a36c37797778d2665231ec1f20a9447a7e567cb640901f89e4daaa95ae5d70c65a9e8aa2bb0019b6facbc3c0575ed languageName: node linkType: hard @@ -4881,8 +4883,8 @@ __metadata: linkType: hard "minipass-fetch@npm:^3.0.0": - version: 3.0.4 - resolution: "minipass-fetch@npm:3.0.4" + version: 3.0.5 + resolution: "minipass-fetch@npm:3.0.5" dependencies: encoding: "npm:^0.1.13" minipass: "npm:^7.0.3" @@ -4891,7 +4893,7 @@ __metadata: dependenciesMeta: encoding: optional: true - checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75 + checksum: 10c0/9d702d57f556274286fdd97e406fc38a2f5c8d15e158b498d7393b1105974b21249289ec571fa2b51e038a4872bfc82710111cf75fae98c662f3d6f95e72152b languageName: node linkType: hard @@ -4938,10 +4940,10 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3": - version: 7.0.4 - resolution: "minipass@npm:7.0.4" - checksum: 10c0/6c7370a6dfd257bf18222da581ba89a5eaedca10e158781232a8b5542a90547540b4b9b7e7f490e4cda43acfbd12e086f0453728ecf8c19e0ef6921bc5958ac5 +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2": + version: 7.1.2 + resolution: "minipass@npm:7.1.2" + checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557 languageName: node linkType: hard @@ -4964,10 +4966,10 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.2": - version: 2.1.2 - resolution: "ms@npm:2.1.2" - checksum: 10c0/a437714e2f90dbf881b5191d35a6db792efbca5badf112f87b9e1c712aace4b4b9b742dd6537f3edf90fd6f684de897cec230abde57e87883766712ddda297cc +"ms@npm:^2.1.3": + version: 2.1.3 + resolution: "ms@npm:2.1.3" + checksum: 10c0/d924b57e7312b3b63ad21fc5b3dc0af5e78d61a1fc7cfb5457edaf26326bf62be5307cc87ffb6862ef1c2b33b0233cdb5d4f01c4c958cc0d660948b65a287a48 languageName: node linkType: hard @@ -5002,8 +5004,8 @@ __metadata: linkType: hard "node-gyp@npm:latest": - version: 10.0.1 - resolution: "node-gyp@npm:10.0.1" + version: 10.2.0 + resolution: "node-gyp@npm:10.2.0" dependencies: env-paths: "npm:^2.2.0" exponential-backoff: "npm:^3.1.1" @@ -5011,13 +5013,13 @@ __metadata: graceful-fs: "npm:^4.2.6" make-fetch-happen: "npm:^13.0.0" nopt: "npm:^7.0.0" - proc-log: "npm:^3.0.0" + proc-log: "npm:^4.1.0" semver: "npm:^7.3.5" - tar: "npm:^6.1.2" + tar: "npm:^6.2.1" which: "npm:^4.0.0" bin: node-gyp: bin/node-gyp.js - checksum: 10c0/abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa + checksum: 10c0/00630d67dbd09a45aee0a5d55c05e3916ca9e6d427ee4f7bc392d2d3dc5fad7449b21fc098dd38260a53d9dcc9c879b36704a1994235d4707e7271af7e9a835b languageName: node linkType: hard @@ -5029,13 +5031,13 @@ __metadata: linkType: hard "nopt@npm:^7.0.0": - version: 7.2.0 - resolution: "nopt@npm:7.2.0" + version: 7.2.1 + resolution: "nopt@npm:7.2.1" dependencies: abbrev: "npm:^2.0.0" bin: nopt: bin/nopt.js - checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff + checksum: 10c0/a069c7c736767121242037a22a788863accfa932ab285a1eb569eb8cd534b09d17206f68c37f096ae785647435e0c5a5a0a67b42ec743e481a455e5ae6a6df81 languageName: node linkType: hard @@ -5079,16 +5081,16 @@ __metadata: linkType: hard "optionator@npm:^0.9.3": - version: 0.9.3 - resolution: "optionator@npm:0.9.3" + version: 0.9.4 + resolution: "optionator@npm:0.9.4" dependencies: - "@aashutoshrathi/word-wrap": "npm:^1.2.3" deep-is: "npm:^0.1.3" fast-levenshtein: "npm:^2.0.6" levn: "npm:^0.4.1" prelude-ls: "npm:^1.2.1" type-check: "npm:^0.4.0" - checksum: 10c0/66fba794d425b5be51353035cf3167ce6cfa049059cbb93229b819167687e0f48d2bc4603fcb21b091c99acb516aae1083624675b15c4765b2e4693a085e959c + word-wrap: "npm:^1.2.5" + checksum: 10c0/4afb687a059ee65b61df74dfe87d8d6815cd6883cb8b3d5883a910df72d0f5d029821f37025e4bccf4048873dbdb09acc6d303d27b8f76b1a80dd5a7d5334675 languageName: node linkType: hard @@ -5169,6 +5171,13 @@ __metadata: languageName: node linkType: hard +"package-json-from-dist@npm:^1.0.0": + version: 1.0.0 + resolution: "package-json-from-dist@npm:1.0.0" + checksum: 10c0/e3ffaf6ac1040ab6082a658230c041ad14e72fabe99076a2081bb1d5d41210f11872403fc09082daf4387fc0baa6577f96c9c0e94c90c394fd57794b66aa4033 + languageName: node + linkType: hard + "parent-module@npm:^1.0.0": version: 1.0.1 resolution: "parent-module@npm:1.0.1" @@ -5232,13 +5241,13 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.10.1": - version: 1.10.1 - resolution: "path-scurry@npm:1.10.1" +"path-scurry@npm:^1.11.1": + version: 1.11.1 + resolution: "path-scurry@npm:1.11.1" dependencies: - lru-cache: "npm:^9.1.1 || ^10.0.0" + lru-cache: "npm:^10.2.0" minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - checksum: 10c0/e5dc78a7348d25eec61ab166317e9e9c7b46818aa2c2b9006c507a6ff48c672d011292d9662527213e558f5652ce0afcc788663a061d8b59ab495681840c0c1e + checksum: 10c0/32a13711a2a505616ae1cc1b5076801e453e7aae6ac40ab55b388bb91b9d0547a52f5aaceff710ea400205f18691120d4431e520afbe4266b836fadede15872d languageName: node linkType: hard @@ -5250,9 +5259,9 @@ __metadata: linkType: hard "picocolors@npm:^1.0.0, picocolors@npm:^1.0.1": - version: 1.0.1 - resolution: "picocolors@npm:1.0.1" - checksum: 10c0/c63cdad2bf812ef0d66c8db29583802355d4ca67b9285d846f390cc15c2f6ccb94e8cb7eb6a6e97fc5990a6d3ad4ae42d86c84d3146e667c739a4234ed50d400 + version: 1.1.0 + resolution: "picocolors@npm:1.1.0" + checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023 languageName: node linkType: hard @@ -5322,15 +5331,15 @@ __metadata: languageName: node linkType: hard -"postcss-calc@npm:^10.0.0": - version: 10.0.0 - resolution: "postcss-calc@npm:10.0.0" +"postcss-calc@npm:^10.0.2": + version: 10.0.2 + resolution: "postcss-calc@npm:10.0.2" dependencies: - postcss-selector-parser: "npm:^6.0.16" + postcss-selector-parser: "npm:^6.1.2" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4.38 - checksum: 10c0/d4d529f2f71b49f17441eed74a7564ccd2779c72ed8648d4bb2530261a27c0ca01fe6a07260e7bf57e55f46dd68dea07e52fd1a6b538db7bc13015124be258a5 + checksum: 10c0/f57c9db7a7a2f3a0cdf45990089c051248d995bb2b9d1bd1fcd1634507851e92ea85bbc71a3594e359e9e9287ba0a820c90d6d292126a4b735cda364a86ce9cf languageName: node linkType: hard @@ -5384,29 +5393,29 @@ __metadata: languageName: node linkType: hard -"postcss-colormin@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-colormin@npm:7.0.0" +"postcss-colormin@npm:^7.0.2": + version: 7.0.2 + resolution: "postcss-colormin@npm:7.0.2" dependencies: - browserslist: "npm:^4.23.0" + browserslist: "npm:^4.23.3" caniuse-api: "npm:^3.0.0" colord: "npm:^2.9.3" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/d365a5365e0a94748309d32c7208cd06249bc53eb82cc32c771de4073b109fa8552e58d60dbe84d7e69e68081ed8a01fbf645d38a650e90cb2e13b21043cd796 + checksum: 10c0/76d09fb7e0218698e622a7c2cfc9087985f48f3a7e44f2655d5eefac4ae9c04198ae9d408dc7ace15d3aa5bde80e7031e462b0cb9b5bd50cfa76bbb1503c755b languageName: node linkType: hard -"postcss-convert-values@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-convert-values@npm:7.0.0" +"postcss-convert-values@npm:^7.0.4": + version: 7.0.4 + resolution: "postcss-convert-values@npm:7.0.4" dependencies: - browserslist: "npm:^4.23.0" + browserslist: "npm:^4.23.3" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/5d7cfa06f307e024574a1842016f006691e0c1932352f53a99ce8f2f9930c64c3c1ae17518e9e4e5176630b99f1beaab37bc339bc779fb07dc543670ae66bb21 + checksum: 10c0/9839b29f7c638672115c9fef5ed7df016aa43ea9dd42a4a2ace16e6a49c75246d2c19f3e03a6409ed3bc7c2fa4de6203bf5789cef8268c76618326b68e3bc591 languageName: node linkType: hard @@ -5464,21 +5473,23 @@ __metadata: languageName: node linkType: hard -"postcss-discard-comments@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-discard-comments@npm:7.0.0" +"postcss-discard-comments@npm:^7.0.3": + version: 7.0.3 + resolution: "postcss-discard-comments@npm:7.0.3" + dependencies: + postcss-selector-parser: "npm:^6.1.2" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/7fef7deea85c1e68161f69057be19a3aedd54d23c9b464c9b1531faa7a115f0c96a4f0ee3a560ce300578599dbc8114fe0fb744208b20b9d2fd8df1b4b39c58a + checksum: 10c0/7700c8fb9a83c6ea5cc784267b9afd6e2968fda0358d583af5913baa28dfc91b0f2a4bd0b2bd62a86ebcb8dadb2547e287beae25b5a097e21c1f723367ccf112 languageName: node linkType: hard -"postcss-discard-duplicates@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-discard-duplicates@npm:7.0.0" +"postcss-discard-duplicates@npm:^7.0.1": + version: 7.0.1 + resolution: "postcss-discard-duplicates@npm:7.0.1" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/37d568dc18d47b8b9f0fd6d5115b1faf96c2bf429fc4586508a773533479e18627d6260cad6a3ca7d3bfc2f220fd9448410aee40e07f2ec6c6f96bbe3595dbc8 + checksum: 10c0/5cc2cac249f68004864865ea2ec38b7d5e28184f33e904e531ff57b533aacb73ec49e4a7d83219184001b8d167e5bcabc1673248134468d7ebaa0bfb9ff78f0a languageName: node linkType: hard @@ -5611,29 +5622,29 @@ __metadata: languageName: node linkType: hard -"postcss-merge-longhand@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-merge-longhand@npm:7.0.0" +"postcss-merge-longhand@npm:^7.0.4": + version: 7.0.4 + resolution: "postcss-merge-longhand@npm:7.0.4" dependencies: postcss-value-parser: "npm:^4.2.0" - stylehacks: "npm:^7.0.0" + stylehacks: "npm:^7.0.4" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/5f814f396a5107dcb5e74c2d4e55ebcd03b9bc2b3619ed7aea63a441854023ce349bc371d30aec1ac33a375139afac02709e7721e055b5e624701ac6576e8a10 + checksum: 10c0/6f50f7775dd361f83daf1acb3e0001d700ed2b7b9bea02df172143adc7fa196ce9209c9e482010ce36fd704512433b62692c5ab2eef5226db71ea3e694654dc7 languageName: node linkType: hard -"postcss-merge-rules@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-merge-rules@npm:7.0.0" +"postcss-merge-rules@npm:^7.0.4": + version: 7.0.4 + resolution: "postcss-merge-rules@npm:7.0.4" dependencies: - browserslist: "npm:^4.23.0" + browserslist: "npm:^4.23.3" caniuse-api: "npm:^3.0.0" cssnano-utils: "npm:^5.0.0" - postcss-selector-parser: "npm:^6.0.16" + postcss-selector-parser: "npm:^6.1.2" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/d9cb3a4e55db57aa7ba0bb1caefb82db93c8493d2b3db66091dae9d5794ca04729e660115765ff254d0eb960e4db037f6c5b92562b396b05216888d12acc08e0 + checksum: 10c0/fffdcef4ada68e92ab8e6dc34a3b9aa2b87188cd4d08f5ba0ff2aff7e3e3c7f086830748ff64db091b5ccb9ac59ac37cfaab1268ed3efb50ab9c4f3714eb5f6d languageName: node linkType: hard @@ -5661,27 +5672,28 @@ __metadata: languageName: node linkType: hard -"postcss-minify-params@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-minify-params@npm:7.0.0" +"postcss-minify-params@npm:^7.0.2": + version: 7.0.2 + resolution: "postcss-minify-params@npm:7.0.2" dependencies: - browserslist: "npm:^4.23.0" + browserslist: "npm:^4.23.3" cssnano-utils: "npm:^5.0.0" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/28a7ae313a197aeaff8b3fa1e695a6443b11a74258374a05adee6a1b05f5849ef52037b7a5069d6910614b03b4610acdaf4a76f38b89cb42e813a8cb5ec2fc01 + checksum: 10c0/0e041f70554bae9d4a66c8ab2f2f3ed8bf73862c9d5ff9972ac7f1a596badd1544f093fa2362dd33e96c038af9e10287cdbfec9f480c49bffdcbaca9fdcb1e4e languageName: node linkType: hard -"postcss-minify-selectors@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-minify-selectors@npm:7.0.0" +"postcss-minify-selectors@npm:^7.0.4": + version: 7.0.4 + resolution: "postcss-minify-selectors@npm:7.0.4" dependencies: - postcss-selector-parser: "npm:^6.0.16" + cssesc: "npm:^3.0.0" + postcss-selector-parser: "npm:^6.1.2" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/6baf0ea71b8dfd01bdb5b516d01aa00244c55cad8d9c674358d735cef2a6aca6586dd480d419cc8d3f470e6d2d7d19354592044f19766993caf9800d3d7e0d36 + checksum: 10c0/212b8f3d62eb2a27ed57d4e76b75b0886806ddb9e2497c0bb79308fa75dabaaaa4ed2b97734896e87603272d05231fd74aee2c256a48d77aa468b5b64cc7866a languageName: node linkType: hard @@ -5806,15 +5818,15 @@ __metadata: languageName: node linkType: hard -"postcss-normalize-unicode@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-normalize-unicode@npm:7.0.0" +"postcss-normalize-unicode@npm:^7.0.2": + version: 7.0.2 + resolution: "postcss-normalize-unicode@npm:7.0.2" dependencies: - browserslist: "npm:^4.23.0" + browserslist: "npm:^4.23.3" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/f2d6ab0076c006dcf3ed33ba30686f2d29e81a408c66acced22e2c942df6d613697ea786137833dd258aafab5fda4d3eb27df13a82df830357dbad9b79154881 + checksum: 10c0/0df1aac932cc2340715178fd024e0f6d872ea5a4bee1bc8357317a75a7b2c904d885f754cc162af001aa2a9ded7c54fac7cbcd701e21e995c1ace92dc08f2b9d languageName: node linkType: hard @@ -5849,15 +5861,15 @@ __metadata: languageName: node linkType: hard -"postcss-ordered-values@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-ordered-values@npm:7.0.0" +"postcss-ordered-values@npm:^7.0.1": + version: 7.0.1 + resolution: "postcss-ordered-values@npm:7.0.1" dependencies: cssnano-utils: "npm:^5.0.0" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/42b14f9518b573318594c2aeb2f13fd1fbe44936d14f1b28a438e7a82644ace9a2946699bebfe7a2d383534dc24e7203c35308d749f3c585a86daa238ad920a4 + checksum: 10c0/9fc62e9039c7d4fa417d165678b065fc577a7232aa41a94a4e9208ad7db2268e1ce003aaad7c6a569afdf890a43416b0bf21047461505b4e3a16eec311a6eb63 languageName: node linkType: hard @@ -5974,15 +5986,15 @@ __metadata: languageName: node linkType: hard -"postcss-reduce-initial@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-reduce-initial@npm:7.0.0" +"postcss-reduce-initial@npm:^7.0.2": + version: 7.0.2 + resolution: "postcss-reduce-initial@npm:7.0.2" dependencies: - browserslist: "npm:^4.23.0" + browserslist: "npm:^4.23.3" caniuse-api: "npm:^3.0.0" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/ed50cd680ce258df953b82ce9b3fb52564d08548724577810800e236d017d80430cbccb4b1ad38b0f4d521663598e44ab93136b20064231181ef49e1e113ae10 + checksum: 10c0/1e6fafaf5fac52b351c8de156ed62e4e1f48da7eb07f9ce90da54b45dca61da9af1e954b8a343271cb3e4ec99e0c5f18d7f9f96da0ca144511fca04498fac78c languageName: node linkType: hard @@ -6042,7 +6054,7 @@ __metadata: languageName: node linkType: hard -"postcss-selector-parser@npm:^6.0.16, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.2": +"postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.0, postcss-selector-parser@npm:^6.1.2": version: 6.1.2 resolution: "postcss-selector-parser@npm:6.1.2" dependencies: @@ -6052,26 +6064,26 @@ __metadata: languageName: node linkType: hard -"postcss-svgo@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-svgo@npm:7.0.0" +"postcss-svgo@npm:^7.0.1": + version: 7.0.1 + resolution: "postcss-svgo@npm:7.0.1" dependencies: postcss-value-parser: "npm:^4.2.0" - svgo: "npm:^3.2.0" + svgo: "npm:^3.3.2" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/0e724069b5de83aa2b8f8a4746cb60cb663e0a8bbab0e4ba995649cb0562205af57d1f54b89fb90d8ae04a4b7ac3ac6e3751afffc3cff697cb19f7a36b71b195 + checksum: 10c0/7c7b177e6f4e2a3e9ada76d53afa02e08d900c8ac15600ba9daa80480269d538405e544bd8091bc5eb7529173a476896fad885a72a247258265424b29a9195ed languageName: node linkType: hard -"postcss-unique-selectors@npm:^7.0.0": - version: 7.0.0 - resolution: "postcss-unique-selectors@npm:7.0.0" +"postcss-unique-selectors@npm:^7.0.3": + version: 7.0.3 + resolution: "postcss-unique-selectors@npm:7.0.3" dependencies: - postcss-selector-parser: "npm:^6.0.16" + postcss-selector-parser: "npm:^6.1.2" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/33b532ad0e9271c5a379859e18adfdc72986bb538672cc0fbc06295d824f82dba3f7b57264e18a3214901bc5244ff5408d28b530374d24a088507287c7f520ce + checksum: 10c0/2eb90eb0745d1e29d411ea5108f1cd9737de5b8f739cabc717074872bc4015950c9963f870b23b33b9ef45e7887eecfe5560cffee56616d4e0b8d0fac4f7cb10 languageName: node linkType: hard @@ -6109,10 +6121,10 @@ __metadata: languageName: node linkType: hard -"proc-log@npm:^3.0.0": - version: 3.0.0 - resolution: "proc-log@npm:3.0.0" - checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc +"proc-log@npm:^4.1.0, proc-log@npm:^4.2.0": + version: 4.2.0 + resolution: "proc-log@npm:4.2.0" + checksum: 10c0/17db4757c2a5c44c1e545170e6c70a26f7de58feb985091fb1763f5081cab3d01b181fb2dd240c9f4a4255a1d9227d163d5771b7e69c9e49a561692db865efb9 languageName: node linkType: hard @@ -6305,17 +6317,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^5.0.5": - version: 5.0.5 - resolution: "rimraf@npm:5.0.5" - dependencies: - glob: "npm:^10.3.7" - bin: - rimraf: dist/esm/bin.mjs - checksum: 10c0/d50dbe724f33835decd88395b25ed35995077c60a50ae78ded06e0185418914e555817aad1b4243edbff2254548c2f6ad6f70cc850040bebb4da9e8cc016f586 - languageName: node - linkType: hard - "run-parallel@npm:^1.1.9": version: 1.2.0 resolution: "run-parallel@npm:1.2.0" @@ -6420,13 +6421,11 @@ __metadata: linkType: hard "semver@npm:^7.3.5, semver@npm:^7.5.4": - version: 7.5.4 - resolution: "semver@npm:7.5.4" - dependencies: - lru-cache: "npm:^6.0.0" + version: 7.6.3 + resolution: "semver@npm:7.6.3" bin: semver: bin/semver.js - checksum: 10c0/5160b06975a38b11c1ab55950cb5b8a23db78df88275d3d8a42ccf1f29e55112ac995b3a26a522c36e3b5f76b0445f1eef70d696b8c7862a2b4303d7b0e7609e + checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf languageName: node linkType: hard @@ -6503,24 +6502,24 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^8.0.1": - version: 8.0.2 - resolution: "socks-proxy-agent@npm:8.0.2" +"socks-proxy-agent@npm:^8.0.3": + version: 8.0.4 + resolution: "socks-proxy-agent@npm:8.0.4" dependencies: - agent-base: "npm:^7.0.2" + agent-base: "npm:^7.1.1" debug: "npm:^4.3.4" - socks: "npm:^2.7.1" - checksum: 10c0/a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7 + socks: "npm:^2.8.3" + checksum: 10c0/345593bb21b95b0508e63e703c84da11549f0a2657d6b4e3ee3612c312cb3a907eac10e53b23ede3557c6601d63252103494caa306b66560f43af7b98f53957a languageName: node linkType: hard -"socks@npm:^2.7.1": - version: 2.7.1 - resolution: "socks@npm:2.7.1" +"socks@npm:^2.8.3": + version: 2.8.3 + resolution: "socks@npm:2.8.3" dependencies: - ip: "npm:^2.0.0" + ip-address: "npm:^9.0.5" smart-buffer: "npm:^4.2.0" - checksum: 10c0/43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130 + checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7 languageName: node linkType: hard @@ -6532,9 +6531,9 @@ __metadata: linkType: hard "source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0": - version: 1.2.0 - resolution: "source-map-js@npm:1.2.0" - checksum: 10c0/7e5f896ac10a3a50fe2898e5009c58ff0dc102dcb056ed27a354623a0ece8954d4b2649e1a1b2b52ef2e161d26f8859c7710350930751640e71e374fe2d321a4 + version: 1.2.1 + resolution: "source-map-js@npm:1.2.1" + checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf languageName: node linkType: hard @@ -6555,6 +6554,13 @@ __metadata: languageName: node linkType: hard +"sprintf-js@npm:^1.1.3": + version: 1.1.3 + resolution: "sprintf-js@npm:1.1.3" + checksum: 10c0/09270dc4f30d479e666aee820eacd9e464215cdff53848b443964202bf4051490538e5dd1b42e1a65cf7296916ca17640aebf63dae9812749c7542ee5f288dec + languageName: node + linkType: hard + "sprintf-js@npm:~1.0.2": version: 1.0.3 resolution: "sprintf-js@npm:1.0.3" @@ -6563,11 +6569,11 @@ __metadata: linkType: hard "ssri@npm:^10.0.0": - version: 10.0.5 - resolution: "ssri@npm:10.0.5" + version: 10.0.6 + resolution: "ssri@npm:10.0.6" dependencies: minipass: "npm:^7.0.3" - checksum: 10c0/b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8 + checksum: 10c0/e5a1e23a4057a86a97971465418f22ea89bd439ac36ade88812dd920e4e61873e8abd6a9b72a03a67ef50faa00a2daf1ab745c5a15b46d03e0544a0296354227 languageName: node linkType: hard @@ -6627,15 +6633,15 @@ __metadata: languageName: node linkType: hard -"stylehacks@npm:^7.0.0": - version: 7.0.0 - resolution: "stylehacks@npm:7.0.0" +"stylehacks@npm:^7.0.4": + version: 7.0.4 + resolution: "stylehacks@npm:7.0.4" dependencies: - browserslist: "npm:^4.23.0" - postcss-selector-parser: "npm:^6.0.16" + browserslist: "npm:^4.23.3" + postcss-selector-parser: "npm:^6.1.2" peerDependencies: postcss: ^8.4.31 - checksum: 10c0/c1c0231974ab7922af3a535a9cb78bfe84997767da7defe111cc76d7f10c9e139fe8cb0f9d5bea87b0c0cc0166c82a6ec98a3d6242d7e29ef90adceecfd330ae + checksum: 10c0/b4d0b280ba274503ecc04111cc11c713e0d65db079fbcd8b42d6350be1cca20e28611eddee93b419aa208176a0d3a5fff83d83ef958d1876713809b6a2787c0c languageName: node linkType: hard @@ -6771,9 +6777,9 @@ __metadata: languageName: node linkType: hard -"svgo@npm:^3.2.0": - version: 3.2.0 - resolution: "svgo@npm:3.2.0" +"svgo@npm:^3.3.2": + version: 3.3.2 + resolution: "svgo@npm:3.3.2" dependencies: "@trysound/sax": "npm:0.2.0" commander: "npm:^7.2.0" @@ -6784,7 +6790,7 @@ __metadata: picocolors: "npm:^1.0.0" bin: svgo: ./bin/svgo - checksum: 10c0/28fa9061ccbcf2e3616d48d1feb613aaa05f8f290a329beb0e585914f1864385152934a7d4d683a4609fafbae3d51666633437c359c5c5ef74fb58ad09092a7c + checksum: 10c0/a6badbd3d1d6dbb177f872787699ab34320b990d12e20798ecae915f0008796a0f3c69164f1485c9def399e0ce0a5683eb4a8045e51a5e1c364bb13a0d9f79e1 languageName: node linkType: hard @@ -6808,7 +6814,7 @@ __metadata: languageName: node linkType: hard -"tar@npm:^6.1.11, tar@npm:^6.1.2": +"tar@npm:^6.1.11, tar@npm:^6.2.1": version: 6.2.1 resolution: "tar@npm:6.2.1" dependencies: @@ -6845,8 +6851,8 @@ __metadata: linkType: hard "terser@npm:^5.26.0": - version: 5.27.0 - resolution: "terser@npm:5.27.0" + version: 5.32.0 + resolution: "terser@npm:5.32.0" dependencies: "@jridgewell/source-map": "npm:^0.3.3" acorn: "npm:^8.8.2" @@ -6854,7 +6860,7 @@ __metadata: source-map-support: "npm:~0.5.20" bin: terser: bin/terser - checksum: 10c0/bed0d39d9a7f2b82c87173e48081c46426a8820ba1dcb864bbfccd2df2b7fb8498a7ea4c8ef045ccce5713b23a6b4c3a784967f1b9f3115adaa7f51712f6e6ae + checksum: 10c0/94daae4881258eb7d09abd46378e23d11ee46caa507b2fb26c5595c7e490914be734e0de38c50041dc38fae5fca24de11badf042dfbbfc1d336ed117335c420a languageName: node linkType: hard @@ -6900,18 +6906,18 @@ __metadata: linkType: hard "uglify-js@npm:^3.1.4": - version: 3.17.4 - resolution: "uglify-js@npm:3.17.4" + version: 3.19.3 + resolution: "uglify-js@npm:3.19.3" bin: uglifyjs: bin/uglifyjs - checksum: 10c0/8b7fcdca69deb284fed7d2025b73eb747ce37f9aca6af53422844f46427152d5440601b6e2a033e77856a2f0591e4167153d5a21b68674ad11f662034ec13ced + checksum: 10c0/83b0a90eca35f778e07cad9622b80c448b6aad457c9ff8e568afed978212b42930a95f9e1be943a1ffa4258a3340fbb899f41461131c05bb1d0a9c303aed8479 languageName: node linkType: hard -"undici-types@npm:~5.26.4": - version: 5.26.5 - resolution: "undici-types@npm:5.26.5" - checksum: 10c0/bb673d7876c2d411b6eb6c560e0c571eef4a01c1c19925175d16e3a30c4c428181fb8d7ae802a261f283e4166a0ac435e2f505743aa9e45d893f9a3df017b501 +"undici-types@npm:~6.19.2": + version: 6.19.8 + resolution: "undici-types@npm:6.19.8" + checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344 languageName: node linkType: hard @@ -6995,12 +7001,12 @@ __metadata: linkType: hard "watchpack@npm:^2.4.1": - version: 2.4.1 - resolution: "watchpack@npm:2.4.1" + version: 2.4.2 + resolution: "watchpack@npm:2.4.2" dependencies: glob-to-regexp: "npm:^0.4.1" graceful-fs: "npm:^4.1.2" - checksum: 10c0/c694de0a61004e587a8a0fdc9cfec20ee692c52032d9ab2c2e99969a37fdab9e6e1bd3164ed506f9a13f7c83e65563d563e0d6b87358470cdb7309b83db78683 + checksum: 10c0/ec60a5f0e9efaeca0102fd9126346b3b2d523e01c34030d3fddf5813a7125765121ebdc2552981136dcd2c852deb1af0b39340f2fcc235f292db5399d0283577 languageName: node linkType: hard @@ -7148,6 +7154,13 @@ __metadata: languageName: node linkType: hard +"word-wrap@npm:^1.2.5": + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: 10c0/e0e4a1ca27599c92a6ca4c32260e8a92e8a44f4ef6ef93f803f8ed823f486e0889fc0b93be4db59c8d51b3064951d25e43d434e95dc8c960cc3a63d65d00ba20 + languageName: node + linkType: hard + "wordwrap@npm:^1.0.0": version: 1.0.0 resolution: "wordwrap@npm:1.0.0" @@ -7228,8 +7241,8 @@ __metadata: linkType: hard "yocto-queue@npm:^1.0.0": - version: 1.0.0 - resolution: "yocto-queue@npm:1.0.0" - checksum: 10c0/856117aa15cf5103d2a2fb173f0ab4acb12b4b4d0ed3ab249fdbbf612e55d1cadfd27a6110940e24746fb0a78cf640b522cc8bca76f30a3b00b66e90cf82abe0 + version: 1.1.1 + resolution: "yocto-queue@npm:1.1.1" + checksum: 10c0/cb287fe5e6acfa82690acb43c283de34e945c571a78a939774f6eaba7c285bacdf6c90fbc16ce530060863984c906d2b4c6ceb069c94d1e0a06d5f2b458e2a92 languageName: node linkType: hard From 2d2adefabdf9edf025a277c95d1fc9d33bbfe14c Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 13:38:47 +0100 Subject: [PATCH 8/8] Refine content and appearance of the user account screen (#9521) Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- .../java/hudson/model/TimeZoneProperty.java | 5 ++++ .../hudson/model/UserPropertyDescriptor.java | 12 ++++++++++ .../ConsoleUrlProviderUserProperty.java | 5 ++++ .../hudson/model/Messages.properties | 3 ++- .../model/TimeZoneProperty/config.jelly | 2 +- .../model/TimeZoneProperty/config.properties | 20 ---------------- .../TimeZoneProperty/config_fr.properties | 20 ---------------- .../TimeZoneProperty/config_it.properties | 22 ------------------ .../TimeZoneProperty/config_ja.properties | 22 ------------------ .../TimeZoneProperty/config_pt_BR.properties | 23 ------------------- .../TimeZoneProperty/config_sv_SE.properties | 20 ---------------- .../TimeZoneProperty/config_zh_TW.properties | 20 ---------------- .../TimeZoneProperty/help-timeZoneName.html | 3 --- .../help-timeZoneName_ja.html | 3 --- .../help-timeZoneName_sv_SE.html | 4 ---- .../index.jelly | 18 ++++++++------- .../index.properties | 4 +++- .../config.jelly | 3 --- .../config.properties | 1 - .../config_sv_SE.properties | 1 - .../jenkins/console/Messages.properties | 1 + .../src/main/resources/lib/form/section.jelly | 8 +++++++ war/src/main/scss/components/_section.scss | 7 ++++++ .../main/webapp/help/user/description.html | 5 ---- .../main/webapp/help/user/description_bg.html | 6 ----- .../main/webapp/help/user/description_de.html | 6 ----- .../main/webapp/help/user/description_fr.html | 5 ---- .../main/webapp/help/user/description_it.html | 7 ------ .../main/webapp/help/user/description_ja.html | 4 ---- .../main/webapp/help/user/description_nl.html | 7 ------ .../webapp/help/user/description_pt_BR.html | 6 ----- .../main/webapp/help/user/description_ru.html | 5 ---- .../main/webapp/help/user/description_tr.html | 7 ------ .../webapp/help/user/description_zh_TW.html | 4 ---- war/src/main/webapp/help/user/fullName.html | 5 ---- .../main/webapp/help/user/fullName_bg.html | 4 ---- .../main/webapp/help/user/fullName_de.html | 6 ----- .../main/webapp/help/user/fullName_fr.html | 5 ---- .../main/webapp/help/user/fullName_it.html | 6 ----- .../main/webapp/help/user/fullName_ja.html | 4 ---- .../main/webapp/help/user/fullName_nl.html | 5 ---- .../main/webapp/help/user/fullName_pt_BR.html | 6 ----- .../main/webapp/help/user/fullName_ru.html | 5 ---- .../main/webapp/help/user/fullName_tr.html | 6 ----- .../main/webapp/help/user/fullName_zh_TW.html | 4 ---- 45 files changed, 54 insertions(+), 291 deletions(-) delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config.properties delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html delete mode 100644 core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html delete mode 100644 core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties delete mode 100644 core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties delete mode 100644 war/src/main/webapp/help/user/description.html delete mode 100644 war/src/main/webapp/help/user/description_bg.html delete mode 100644 war/src/main/webapp/help/user/description_de.html delete mode 100644 war/src/main/webapp/help/user/description_fr.html delete mode 100644 war/src/main/webapp/help/user/description_it.html delete mode 100644 war/src/main/webapp/help/user/description_ja.html delete mode 100644 war/src/main/webapp/help/user/description_nl.html delete mode 100644 war/src/main/webapp/help/user/description_pt_BR.html delete mode 100644 war/src/main/webapp/help/user/description_ru.html delete mode 100644 war/src/main/webapp/help/user/description_tr.html delete mode 100644 war/src/main/webapp/help/user/description_zh_TW.html delete mode 100644 war/src/main/webapp/help/user/fullName.html delete mode 100644 war/src/main/webapp/help/user/fullName_bg.html delete mode 100644 war/src/main/webapp/help/user/fullName_de.html delete mode 100644 war/src/main/webapp/help/user/fullName_fr.html delete mode 100644 war/src/main/webapp/help/user/fullName_it.html delete mode 100644 war/src/main/webapp/help/user/fullName_ja.html delete mode 100644 war/src/main/webapp/help/user/fullName_nl.html delete mode 100644 war/src/main/webapp/help/user/fullName_pt_BR.html delete mode 100644 war/src/main/webapp/help/user/fullName_ru.html delete mode 100644 war/src/main/webapp/help/user/fullName_tr.html delete mode 100644 war/src/main/webapp/help/user/fullName_zh_TW.html diff --git a/core/src/main/java/hudson/model/TimeZoneProperty.java b/core/src/main/java/hudson/model/TimeZoneProperty.java index 2675448dad80..95956026a76e 100644 --- a/core/src/main/java/hudson/model/TimeZoneProperty.java +++ b/core/src/main/java/hudson/model/TimeZoneProperty.java @@ -62,6 +62,11 @@ public String getDisplayName() { return Messages.TimeZoneProperty_DisplayName(); } + @Override + public String getDescription() { + return Messages.TimeZoneProperty_Description(); + } + @Override public UserProperty newInstance(User user) { return new TimeZoneProperty(); diff --git a/core/src/main/java/hudson/model/UserPropertyDescriptor.java b/core/src/main/java/hudson/model/UserPropertyDescriptor.java index 66762bf3c716..b5a115404be3 100644 --- a/core/src/main/java/hudson/model/UserPropertyDescriptor.java +++ b/core/src/main/java/hudson/model/UserPropertyDescriptor.java @@ -26,6 +26,7 @@ import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.Nullable; import hudson.model.userproperty.UserPropertyCategory; import java.util.Optional; import org.jenkinsci.Symbol; @@ -126,4 +127,15 @@ public boolean isEnabled() { protected @CheckForNull String getUserPropertyCategoryAsString() { return null; } + + /** + * Optional description for the configurable object + * Displays as plain text + * + * @since TODO + */ + @Nullable + public String getDescription() { + return null; + } } diff --git a/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java b/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java index 3763036b9686..5308a6d7c6ee 100644 --- a/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java +++ b/core/src/main/java/jenkins/console/ConsoleUrlProviderUserProperty.java @@ -65,6 +65,11 @@ public String getDisplayName() { return Messages.consoleUrlProviderDisplayName(); } + @Override + public String getDescription() { + return Messages.consoleUrlProviderDisplayName_Description(); + } + @Override public UserProperty newInstance(User user) { return new ConsoleUrlProviderUserProperty(); diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index d56c57ff5ee0..fbe7a70ae53b 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -408,7 +408,8 @@ Jenkins.IsRestarting=Jenkins is restarting User.IllegalUsername="{0}" is prohibited as a username for security reasons. User.IllegalFullname="{0}" is prohibited as a full name for security reasons. -TimeZoneProperty.DisplayName=User Defined Time Zone +TimeZoneProperty.DisplayName=Time zone +TimeZoneProperty.Description=Select a time zone to use rather than the system default TimeZoneProperty.DisplayDefaultTimeZone=Default TimeZoneProperty.current_time_in_=Current time in {0}: {1} TimeZoneProperty.current_time_on_server_in_in_proposed_di=Current time on server in {0}: {1}; in proposed display zone: {2} diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly b/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly index 2c3bde11f734..988c2993af69 100644 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly +++ b/core/src/main/resources/hudson/model/TimeZoneProperty/config.jelly @@ -23,7 +23,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties deleted file mode 100644 index df0ea286bace..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config.properties +++ /dev/null @@ -1,20 +0,0 @@ -# The MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -title=Time Zone diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties deleted file mode 100644 index 754326ab5ed3..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_fr.properties +++ /dev/null @@ -1,20 +0,0 @@ -# The MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -title=Fuseau horaire diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties deleted file mode 100644 index dd8664b821bc..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_it.properties +++ /dev/null @@ -1,22 +0,0 @@ -# Italian localization plugin for Jenkins -# Copyright © 2020 Alessandro Menti -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -title=Fuso orario diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties deleted file mode 100644 index 9a2e6c2da365..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_ja.properties +++ /dev/null @@ -1,22 +0,0 @@ -# The MIT License -# -# Copyright (c) 2020 Takashi Harano -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -title=タイムゾーン diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties deleted file mode 100644 index 69165e681fc9..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_pt_BR.properties +++ /dev/null @@ -1,23 +0,0 @@ -# The MIT License -# -# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -title=Fuso horário diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties deleted file mode 100644 index 81b54683063b..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_sv_SE.properties +++ /dev/null @@ -1,20 +0,0 @@ -# The MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -title=Tidszon diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties b/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties deleted file mode 100644 index a35c89f565ff..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/config_zh_TW.properties +++ /dev/null @@ -1,20 +0,0 @@ -# The MIT License -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -title=時區 diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html deleted file mode 100644 index 4bb418b353c4..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Specify user defined time zone for displaying time rather than system default. -
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html deleted file mode 100644 index 92d9ed7db039..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_ja.html +++ /dev/null @@ -1,3 +0,0 @@ -
- システムデフォルトの代わりに、ユーザーが指定したタイムゾーンで時刻を表示します。 -
diff --git a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html b/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html deleted file mode 100644 index 25f230308212..000000000000 --- a/core/src/main/resources/hudson/model/TimeZoneProperty/help-timeZoneName_sv_SE.html +++ /dev/null @@ -1,4 +0,0 @@ -
- Ange användardefinierad tidszon för visa klockslag istället för - systemstandarden. -
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly index 8d2a8e9368e7..c6b458cecfe9 100644 --- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly +++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly @@ -30,7 +30,7 @@ THE SOFTWARE. - +

${%title}

@@ -39,18 +39,20 @@ THE SOFTWARE. - - - - - - + + + + + + + + - + diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties index 41e4d5b9689f..dfeb5024042c 100644 --- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties +++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.properties @@ -21,5 +21,7 @@ # THE SOFTWARE. title=Account -Full\ name=Full Name +Full\ name=Full name +Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID Description=Description +Description.Description=Enter a short description about yourself so that visitors know who you are diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly index 57f5af6d2097..3ea825131863 100644 --- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly +++ b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.jelly @@ -5,9 +5,6 @@ - - ${%description} - diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties deleted file mode 100644 index 9ebb3cd824ca..000000000000 --- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config.properties +++ /dev/null @@ -1 +0,0 @@ -description=Controls what visualization tool handles build console links. Providers higher in the list take precedence over providers lower in the list. All providers configured here take precedence over those configured globally by administrators. \ No newline at end of file diff --git a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties b/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties deleted file mode 100644 index d0a8ed3d0459..000000000000 --- a/core/src/main/resources/jenkins/console/ConsoleUrlProviderUserProperty/config_sv_SE.properties +++ /dev/null @@ -1 +0,0 @@ -description=Styr vilket visualiseringsverktyg som hanterar konsollänkar för byggen. Leverantörer högre upp i listan har företräde framför leverantörer längre ned i listan. Alla leverantörer som konfigurerats här har företräde framför de som har konfigurerats globalt av administratörer. \ No newline at end of file diff --git a/core/src/main/resources/jenkins/console/Messages.properties b/core/src/main/resources/jenkins/console/Messages.properties index 20a460d49709..72347e1df5b6 100644 --- a/core/src/main/resources/jenkins/console/Messages.properties +++ b/core/src/main/resources/jenkins/console/Messages.properties @@ -1,2 +1,3 @@ consoleUrlProviderDisplayName=Console URL Provider +consoleUrlProviderDisplayName.Description=Select which view you want to use for build console links. Views listed higher will be prioritized over those listed lower. The views you choose here will be used rather than those set by administrators. defaultProviderDisplayName=Default \ No newline at end of file diff --git a/core/src/main/resources/lib/form/section.jelly b/core/src/main/resources/lib/form/section.jelly index 706920ad6ecc..1e7e7ebbb2d5 100644 --- a/core/src/main/resources/lib/form/section.jelly +++ b/core/src/main/resources/lib/form/section.jelly @@ -32,6 +32,9 @@ THE SOFTWARE. If null is given, the entire tag becomes no-op. ]]> + + Optional attribute to set a description for the section + Optional attribute to set an icon for the section, this is only visible when using section-to-sidebar-items.js @@ -50,6 +53,11 @@ THE SOFTWARE. ${attrs.title} + +
+ ${attrs.description} +
+ diff --git a/war/src/main/scss/components/_section.scss b/war/src/main/scss/components/_section.scss index 9a53a7238339..4e0768d8f6e0 100644 --- a/war/src/main/scss/components/_section.scss +++ b/war/src/main/scss/components/_section.scss @@ -34,6 +34,13 @@ font-weight: 500; } +.jenkins-section__description { + // Tweaked margin so that it appears visually centred when placed next to `.jenkins-section__title` + margin: -0.5rem 0 1rem; + color: var(--text-color-secondary); + line-height: 1.66; +} + .jenkins-section__items { display: grid; grid-template-columns: 1fr; diff --git a/war/src/main/webapp/help/user/description.html b/war/src/main/webapp/help/user/description.html deleted file mode 100644 index 8d4d4ee62729..000000000000 --- a/war/src/main/webapp/help/user/description.html +++ /dev/null @@ -1,5 +0,0 @@ -
- This description is placed on the user top page so that visitors can know who - you are. You can use any HTML tags (or markup in the configured language) - here. Consider putting some links to other pages related to you. -
diff --git a/war/src/main/webapp/help/user/description_bg.html b/war/src/main/webapp/help/user/description_bg.html deleted file mode 100644 index 81894e55816e..000000000000 --- a/war/src/main/webapp/help/user/description_bg.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Това описание стои отгоре на вашата страница като потребител, така че другите - потребители да знаят кой сте. Може да използвате HTML или друг език с - маркиране, стига да е настроен. Добре е да поставите връзки към други - страници, които ви описват. -
diff --git a/war/src/main/webapp/help/user/description_de.html b/war/src/main/webapp/help/user/description_de.html deleted file mode 100644 index 4ddca12dfbf9..000000000000 --- a/war/src/main/webapp/help/user/description_de.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Diese Beschreibung wird in der Benutzeransicht angezeigt. Andere Benutzer - können dadurch mehr über Sie erfahren. Sie können in der Beschreibung - beliebige HTML-Auszeichnungen verwenden, also beispielsweise auch Links auf - andere Webangebote, die mit Ihnen in Zusammenhang stehen. -
diff --git a/war/src/main/webapp/help/user/description_fr.html b/war/src/main/webapp/help/user/description_fr.html deleted file mode 100644 index 7744e9764cea..000000000000 --- a/war/src/main/webapp/help/user/description_fr.html +++ /dev/null @@ -1,5 +0,0 @@ -
- Cette description est placée sur la page principale de l'utilisateur, afin que - les visiteurs puissent vous connaitre. Vous pouvez utiliser des tags HTML. - N'hésitez pas à ajouter des liens vers d'autres pages vous concernant. -
diff --git a/war/src/main/webapp/help/user/description_it.html b/war/src/main/webapp/help/user/description_it.html deleted file mode 100644 index 009e9203ac3d..000000000000 --- a/war/src/main/webapp/help/user/description_it.html +++ /dev/null @@ -1,7 +0,0 @@ -
- Questa descrizione è collocata nella pagina principale utente in modo che i - visitatori possano conoscere la propria identità. In questo campo è possibile - utilizzare tutti i tag HTML (o i marcatori nel linguaggio configurato). Si - prenda in considerazione l'aggiunta di alcuni collegamenti ad altre pagine - correlate a sé stessi. -
diff --git a/war/src/main/webapp/help/user/description_ja.html b/war/src/main/webapp/help/user/description_ja.html deleted file mode 100644 index c2a1c9a21f53..000000000000 --- a/war/src/main/webapp/help/user/description_ja.html +++ /dev/null @@ -1,4 +0,0 @@ -
- この説明はあなたが誰なのか知ることができるように、ユーザーのトップページに表示されます。 - ここではどんなHTMLタグでも使用できます。あなたに関する他のページにリンクすることを考えてみてください。 -
diff --git a/war/src/main/webapp/help/user/description_nl.html b/war/src/main/webapp/help/user/description_nl.html deleted file mode 100644 index 458d60b66613..000000000000 --- a/war/src/main/webapp/help/user/description_nl.html +++ /dev/null @@ -1,7 +0,0 @@ -
- Deze beschrijving zal worden toegevoegd aan de specifiek pagina van een - gebruiker. Op deze manier zullen andere gebruikers van Jenkins, eenvoudig, te - weten kunnen komen wie U bent. HTML kan gebruikt worden in dit veld. Het kan - interessant zijn om in deze beschrijving, referentie toe te voegen naar ander - pagina's over uzelf of uw activiteiten. -
diff --git a/war/src/main/webapp/help/user/description_pt_BR.html b/war/src/main/webapp/help/user/description_pt_BR.html deleted file mode 100644 index 15e9a0c45428..000000000000 --- a/war/src/main/webapp/help/user/description_pt_BR.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Esta descrição é colocada no topo da página do - usuário tal que os visitantes possam saber quem você é. - Você pode usar qualquer marcação HTML aqui. Considere colocar - alguns links para outras páginas relacionadas a você. -
diff --git a/war/src/main/webapp/help/user/description_ru.html b/war/src/main/webapp/help/user/description_ru.html deleted file mode 100644 index 08e6008fde69..000000000000 --- a/war/src/main/webapp/help/user/description_ru.html +++ /dev/null @@ -1,5 +0,0 @@ -
- Это описание будет помещено в шапку страницы пользователя, так чтобы - посетители могли определить кто вы. Вы можете использовать HTML. Возможно, - размещение ссылок с подробной информацией о вас будет уместным. -
diff --git a/war/src/main/webapp/help/user/description_tr.html b/war/src/main/webapp/help/user/description_tr.html deleted file mode 100644 index ca5cf685ca82..000000000000 --- a/war/src/main/webapp/help/user/description_tr.html +++ /dev/null @@ -1,7 +0,0 @@ -
- Bu açıklama alanı, kullanıcı sayfasının en - üstünde yer alacaktır. Ziyaretçilerin sizi - tanımaları için bu alanı bilgilendirme amaçlı - kullanabilirsiniz. HTML tag'leri kullanılabilir. Sizinle ilgili - olabilecek başka sayfaların linklerini de koyabilirsiniz. -
diff --git a/war/src/main/webapp/help/user/description_zh_TW.html b/war/src/main/webapp/help/user/description_zh_TW.html deleted file mode 100644 index 4ff51596f575..000000000000 --- a/war/src/main/webapp/help/user/description_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 這個說明會放在使用者首頁上，讓訪客知道您是誰。 您可以使用任何 HTML - 標籤。說不定您可以放一些有關自己的連結。 -
diff --git a/war/src/main/webapp/help/user/fullName.html b/war/src/main/webapp/help/user/fullName.html deleted file mode 100644 index 453efdda5e5e..000000000000 --- a/war/src/main/webapp/help/user/fullName.html +++ /dev/null @@ -1,5 +0,0 @@ -
- Specify your name in a more human-friendly format, so that people can see your - real name as opposed to your ID. For example, "Jane Doe" is usually easier for - people to understand than IDs like "jd513". -
diff --git a/war/src/main/webapp/help/user/fullName_bg.html b/war/src/main/webapp/help/user/fullName_bg.html deleted file mode 100644 index 6c27c38ad910..000000000000 --- a/war/src/main/webapp/help/user/fullName_bg.html +++ /dev/null @@ -1,4 +0,0 @@ -
- Указване на име вместо идентификатор, с което хората да ви разпознават - по-лесно. „Иван Петров“ е по-разбираемо от „ip2873“. -
diff --git a/war/src/main/webapp/help/user/fullName_de.html b/war/src/main/webapp/help/user/fullName_de.html deleted file mode 100644 index e7f1a6d4fe59..000000000000 --- a/war/src/main/webapp/help/user/fullName_de.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Geben Sie Ihren vollständigen Namen an, damit andere Benutzer Ihren echten - Namen anstelle Ihres Benutzerkontos sehen können. Beispiel: "Jasmin - Mustermann" ist für die meisten Benutzer verständlicher als das Benutzerkonto - "jm531". -
diff --git a/war/src/main/webapp/help/user/fullName_fr.html b/war/src/main/webapp/help/user/fullName_fr.html deleted file mode 100644 index e6438c57da48..000000000000 --- a/war/src/main/webapp/help/user/fullName_fr.html +++ /dev/null @@ -1,5 +0,0 @@ -
- Indiquez votre nom dans un format lisible pour un humain. Les visiteurs - verront votre vrai nom à côté de votre identifiant. "Jean Dupont" est plus - facile à retenir que "jd513"... -
diff --git a/war/src/main/webapp/help/user/fullName_it.html b/war/src/main/webapp/help/user/fullName_it.html deleted file mode 100644 index 9a81fd145602..000000000000 --- a/war/src/main/webapp/help/user/fullName_it.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Specificare il proprio nome in un formato più a misura d'uomo in modo che gli - utenti possano visualizzare il proprio nome reale anziché il proprio ID. Ad - esempio, "Mario Rossi" è solitamente più facile da comprendere per le persone - anziché "mr513". -
diff --git a/war/src/main/webapp/help/user/fullName_ja.html b/war/src/main/webapp/help/user/fullName_ja.html deleted file mode 100644 index 451745435d07..000000000000 --- a/war/src/main/webapp/help/user/fullName_ja.html +++ /dev/null @@ -1,4 +0,0 @@ -
- IDではなく本名が分かるように、より親しみのある形式であなたの名前を指定します。 - 例えば、"Jane Doe"は"jd513"のようなIDよりも分かりやすいでしょう。 -
diff --git a/war/src/main/webapp/help/user/fullName_nl.html b/war/src/main/webapp/help/user/fullName_nl.html deleted file mode 100644 index 225051ab6181..000000000000 --- a/war/src/main/webapp/help/user/fullName_nl.html +++ /dev/null @@ -1,5 +0,0 @@ -
- Vul uw volledige naam in. Deze naam zal gebruikt worden i.p.v. uw id waar - mogelijk. Bv. "Els Desmet" is voor de meeste mensen duidelijker dan een id - zoals "ed513". -
diff --git a/war/src/main/webapp/help/user/fullName_pt_BR.html b/war/src/main/webapp/help/user/fullName_pt_BR.html deleted file mode 100644 index 5a69cacb7065..000000000000 --- a/war/src/main/webapp/help/user/fullName_pt_BR.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Especifique seu nome em um formato mais amigável, tal que as pessoas - possam ver seu verdadeiro nome ao invés de seu ID. Por exemplo, - "João da Silva" é geralmente mais fácil para as pessoas - entenderem do que "js513". -
diff --git a/war/src/main/webapp/help/user/fullName_ru.html b/war/src/main/webapp/help/user/fullName_ru.html deleted file mode 100644 index 6de0eb415bab..000000000000 --- a/war/src/main/webapp/help/user/fullName_ru.html +++ /dev/null @@ -1,5 +0,0 @@ -
- Укажите ваше имя в более дружелюбной форме, чтобы могли видеть ваше настоящее - имя, а не просто идентификатор. Например, "Василий Пупкин" обычно приятнее - видеть, чем "vas_pup_1". -
diff --git a/war/src/main/webapp/help/user/fullName_tr.html b/war/src/main/webapp/help/user/fullName_tr.html deleted file mode 100644 index 229a7dea2a09..000000000000 --- a/war/src/main/webapp/help/user/fullName_tr.html +++ /dev/null @@ -1,6 +0,0 @@ -
- Kullanıcıların sizi kullanıcı adınızdan - daha anlamlı bir isimle tanıyabilmesini isterseniz, tam - adınızı bu kısıma yazabilirsiniz. Mesela, "Jane Doe", - "jd513"ten daha anlamlıdır. -
diff --git a/war/src/main/webapp/help/user/fullName_zh_TW.html b/war/src/main/webapp/help/user/fullName_zh_TW.html deleted file mode 100644 index ddbbb5556df7..000000000000 --- a/war/src/main/webapp/help/user/fullName_zh_TW.html +++ /dev/null @@ -1,4 +0,0 @@ -
- 設定您能讓一般人看得懂的名字，讓別人知道您的姓名，而不光只有 ID。 - 舉例來說，大多數人應該都會覺得「張三」比 "mrchang3" 這個 ID 還要容易看懂。 -