Skip to content

Commit

Permalink
Merge pull request mvnpm#7395 from phillip-kruger/ldrs
Browse files Browse the repository at this point in the history 
Small changes and version update
  • Loading branch information
@phillip-kruger
phillip-kruger authored Jun 18, 2024
2 parents ce85604 + 37ac0b7 commit 3479d5a
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 38 deletions.
78 changes: 48 additions & 30 deletions .locker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.mvnpm</groupId>
<version>3.0.39-SNAPSHOT</version>
<version>3.0.40-SNAPSHOT</version>
<artifactId>mvnpm-locker</artifactId>
<packaging>pom</packaging>

Expand Down Expand Up @@ -107,6 +107,36 @@
<version>6.26.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.fortawesome</groupId>
<artifactId>fontawesome-common-types</artifactId>
<version>6.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.fortawesome</groupId>
<artifactId>fontawesome-svg-core</artifactId>
<version>6.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.fortawesome</groupId>
<artifactId>free-brands-svg-icons</artifactId>
<version>6.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.fortawesome</groupId>
<artifactId>free-regular-svg-icons</artifactId>
<version>6.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.fortawesome</groupId>
<artifactId>free-solid-svg-icons</artifactId>
<version>6.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>common</artifactId>
Expand Down Expand Up @@ -140,7 +170,7 @@
<dependency>
<groupId>org.mvnpm.at.lezer</groupId>
<artifactId>javascript</artifactId>
<version>1.4.16</version>
<version>1.4.17</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -194,7 +224,7 @@
<dependency>
<groupId>org.mvnpm.at.mvnpm</groupId>
<artifactId>vaadin-webcomponents</artifactId>
<version>24.3.13</version>
<version>24.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -212,7 +242,7 @@
<dependency>
<groupId>org.mvnpm.at.qomponent</groupId>
<artifactId>qui-badge</artifactId>
<version>1.0.0</version>
<version>1.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -227,24 +257,18 @@
<version>1.0.16</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.qomponent</groupId>
<artifactId>qui-icons</artifactId>
<version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.types</groupId>
<artifactId>trusted-types</artifactId>
<version>2.0.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>component-base</artifactId>
<version>24.3.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>icon</artifactId>
<version>24.3.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>router</artifactId>
Expand All @@ -257,18 +281,6 @@
<version>2.0.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>vaadin-lumo-styles</artifactId>
<version>24.3.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>vaadin-themable-mixin</artifactId>
<version>24.3.13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
<artifactId>vaadin-usage-statistics</artifactId>
Expand All @@ -293,6 +305,12 @@
<version>1.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>ldrs</artifactId>
<version>1.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>lit-element</artifactId>
Expand All @@ -308,8 +326,8 @@
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>lit</artifactId>
<version>3.1.3</version>
<scope>runtime</scope>
<version>3.1.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mvnpm</groupId>
Expand Down
27 changes: 21 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.mvnpm</groupId>
<artifactId>mvnpm</artifactId>
<version>3.0.39-SNAPSHOT</version>
<version>3.0.40-SNAPSHOT</version>
<name>mvnpm</name>
<description>Maven on NPM</description>
<url>https://mvnpm.org/</url>
Expand Down Expand Up @@ -53,7 +53,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.11.0</quarkus.platform.version>
<quarkus.platform.version>3.11.2</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.2.5</surefire-plugin.version>
<formatter.plugin.version>2.23.0</formatter.plugin.version>
Expand All @@ -62,18 +62,20 @@

<pgpainless.version>1.5.5</pgpainless.version>
<!-- UI Libs -->
<quarkus-web-bundler.version>1.5.0.CR2</quarkus-web-bundler.version>
<quarkus-web-bundler.version>1.5.3</quarkus-web-bundler.version>
<importmap.version>1.0.10</importmap.version>
<vaadin.version>24.3.13</vaadin.version>
<lit.version>3.1.4</lit.version>
<vaadin.version>24.4.0</vaadin.version>
<ldrs.version>1.0.2</ldrs.version>
<vaadin-router.version>1.7.5</vaadin-router.version>
<codeblock.version>1.0.16</codeblock.version>
<compare-versions.version>6.1.0</compare-versions.version>
<marked.version>12.0.1</marked.version>
<card.version>1.0.1</card.version>
<badge.version>1.0.0</badge.version>
<badge.version>1.0.2</badge.version>
<!-- Testing-->
<playwright.version>0.0.1</playwright.version>
<esbuild-java.version>1.4.1</esbuild-java.version>
<esbuild-java.version>1.4.3</esbuild-java.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -187,13 +189,26 @@
<version>${quarkus-web-bundler.version}</version>
</dependency>
<!-- UI (from mvnpm) -->
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>lit</artifactId>
<version>${lit.version}</version>
<scope>provided</scope>
</dependency>
<!-- Vaadin Web components -->
<dependency>
<groupId>org.mvnpm.at.mvnpm</groupId>
<artifactId>vaadin-webcomponents</artifactId>
<version>${vaadin.version}</version>
<scope>provided</scope>
</dependency>
<!-- Loaders -->
<dependency>
<groupId>org.mvnpm</groupId>
<artifactId>ldrs</artifactId>
<version>${ldrs.version}</version>
<scope>provided</scope>
</dependency>
<!-- Router -->
<dependency>
<groupId>org.mvnpm.at.vaadin</groupId>
Expand Down
17 changes: 15 additions & 2 deletions src/main/resources/web/app/mvnpm-progress.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ import { LitElement, html, css } from 'lit';
import { customElement, state } from 'lit/decorators.js';
import '@vaadin/progress-bar';
import '@vaadin/message-list';
import { dotStream } from 'ldrs';

dotStream.register();

/**
* This component shows the Sync Progress screen
Expand Down Expand Up @@ -143,9 +146,19 @@ export class MvnpmProgress extends LitElement {

private _renderInitQueue() {
if (this._initQueue && this._initQueue.length > 0) {
return html`<vaadin-message-list .items="${this._initQueue}"></vaadin-message-list>`;
return html`<vaadin-message-list .items="${this._initQueue}"></vaadin-message-list>
<l-dot-stream
size="60"
speed="2.5"
color="#66a5b1"
></l-dot-stream>`;
} else {
return html`<p>Nothing in the sync queue</p>`;
return html`<l-dot-stream
size="60"
speed="2.5"
color="#66a5b1"
></l-dot-stream> <br/>Waiting for sync
`;
}
}

Expand Down

0 comments on commit 3479d5a

Please sign in to comment.