diff --git a/.locker/pom.xml b/.locker/pom.xml index 05586f3..5d0dca3 100644 --- a/.locker/pom.xml +++ b/.locker/pom.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.mvnpm - 3.0.20-SNAPSHOT + 3.0.21-SNAPSHOT mvnpm-locker pom diff --git a/composites/codeblock.xml b/composites/codeblock.xml new file mode 100644 index 0000000..c03b4e2 --- /dev/null +++ b/composites/codeblock.xml @@ -0,0 +1,150 @@ + + + 4.0.0 + org.mvnpm.at.mvnpm + codeblock + latest + Code block + a Code block web component build with Code Mirror 6 + https://github.com/quarkusio/webcomponents + + + Red Hat + https://github.com/quarkusio/webcomponents + + + + https://github.com/quarkusio/webcomponents.git + https://github.com/quarkusio/webcomponents.git + https://github.com/quarkusio/webcomponents + + + https://github.com/quarkusio/webcomponents/issues + + + + + + org.mvnpm.at.quarkus-webcomponents + codeblock + ${project.version} + + + + org.mvnpm.at.codemirror + state + 6.4.0 + + + org.mvnpm.at.codemirror + view + 6.24.0 + + + org.mvnpm.at.codemirror + commands + 6.3.3 + + + org.mvnpm.at.codemirror + lint + 6.5.0 + + + org.mvnpm.at.codemirror + autocomplete + 6.12.0 + + + org.mvnpm.at.codemirror + lang-java + 6.0.1 + + + org.mvnpm.at.codemirror + lang-javascript + 6.2.1 + + + org.mvnpm.at.codemirror + lang-json + 6.0.1 + + + org.mvnpm.at.codemirror + lang-yaml + 6.0.0 + + + org.mvnpm.at.codemirror + lang-sql + 6.5.5 + + + org.mvnpm.at.codemirror + lang-xml + 6.0.2 + + + org.mvnpm + style-mod + 4.1.0 + + + org.mvnpm + w3c-keyname + 2.2.8 + + + org.mvnpm.at.codemirror + language + 6.10.1 + + + org.mvnpm.at.lezer + common + 1.2.1 + + + org.mvnpm.at.lezer + highlight + 1.2.0 + + + org.mvnpm.at.lezer + lr + 1.4.0 + + + org.mvnpm + crelt + 1.0.6 + + + org.mvnpm.at.lezer + java + 1.1.1 + + + org.mvnpm.at.lezer + javascript + 1.4.13 + + + org.mvnpm.at.lezer + json + 1.0.2 + + + org.mvnpm.at.lezer + yaml + 1.0.2 + + + org.mvnpm.at.lezer + xml + 1.0.4 + + + diff --git a/pom.xml b/pom.xml index 7e1d302..e5415df 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 io.mvnpm mvnpm - 3.0.20-SNAPSHOT + 3.0.21-SNAPSHOT mvnpm Maven on NPM https://mvnpm.org/ diff --git a/src/main/resources/web/app/mvnpm-home.ts b/src/main/resources/web/app/mvnpm-home.ts index 8dff27c..06f9c2d 100644 --- a/src/main/resources/web/app/mvnpm-home.ts +++ b/src/main/resources/web/app/mvnpm-home.ts @@ -517,7 +517,6 @@ export class MvnpmHome extends LitElement { _findVersionsAndShowLatest(e){ const name = this._coordinates.name.trim(); if ((e.which == 13 || e.which == 0)){ - window.history.pushState({/* State */},"", "/package/" + name); this._showGA(name); } } @@ -569,6 +568,8 @@ export class MvnpmHome extends LitElement { this._coordinates.groupId = metadata.getElementsByTagName("groupId")[0].childNodes[0].nodeValue.substring(9); this._coordinates.artifactId = metadata.getElementsByTagName("artifactId")[0].childNodes[0].nodeValue; + window.history.pushState({/* State */},"", "/package/" + this._coordinates.groupId + ":" + this._coordinates.artifactId); + var latestTags = metadata.getElementsByTagName("latest"); var versionTags = metadata.getElementsByTagName("version"); diff --git a/src/main/resources/web/app/mvnpm-progress.ts b/src/main/resources/web/app/mvnpm-progress.ts index d0db1d7..3adce79 100644 --- a/src/main/resources/web/app/mvnpm-progress.ts +++ b/src/main/resources/web/app/mvnpm-progress.ts @@ -159,37 +159,24 @@ export class MvnpmProgress extends LitElement { } private _renderMavenCentral() { - return html`
- ${this._renderUploaded()} - ${this._renderClosed()} - ${this._renderReleasing()} - ${this._renderReleased()} -
- `; - } - - private _renderUploaded() { + + let merged = []; if (this._uploadedQueue && this._uploadedQueue.length > 0) { - return html``; + merged = merged.concat(this._uploadedQueue); } - } - - private _renderClosed() { if (this._closedQueue && this._closedQueue.length > 0) { - return html``; + merged = merged.concat(this._closedQueue); } - } - - private _renderReleasing() { if (this._releasingQueue && this._releasingQueue.length > 0) { - return html``; + merged = merged.concat(this._releasingQueue); } - } - - private _renderReleased() { if (this._releasedQueue && this._releasedQueue.length > 0) { - return html``; + merged = merged.concat(this._releasedQueue); } + + return html`
+ +
`; } private _addToQueue(queue: any[] | null, item: any, stagemessage: string, step: number) {