From d0cd1ae1ffbc88b0f030c61c82e8c0d93aa4bb2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:46:57 +0000 Subject: [PATCH 01/19] Bump dompurify from 3.0.5 to 3.1.6 in /website Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.0.5 to 3.1.6. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/3.0.5...3.1.6) --- updated-dependencies: - dependency-name: dompurify dependency-type: indirect ... Signed-off-by: dependabot[bot] --- website/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 394830ba3..5edc66673 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -1515,9 +1515,9 @@ __metadata: linkType: hard "dompurify@npm:^3.0.4": - version: 3.0.5 - resolution: "dompurify@npm:3.0.5" - checksum: 10/24ed3a26486806ec77dd4e3ab248d9c617e851237e3989609d5188312bbb5461028ea08a851f688cde8773cf45eacfeb0bff66c166ef9699fc3ed6a60a565169 + version: 3.1.6 + resolution: "dompurify@npm:3.1.6" + checksum: 10/036844bc9b717b172ba27f5863b56f950289a05d8eebfb702d6953bbf80bd021e480ce4217bd084567186f2d0ada13358ce5556963492cfe402d774e8667f120 languageName: node linkType: hard From 79d18d5507100de8009cd59dc54059bbebd59053 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 9 Oct 2024 12:11:00 +0300 Subject: [PATCH 02/19] Sonar fixes - Fix maintainability issues - Fix reliability issues --- Dockerfile | 18 ++-- website/dev/mock-service.ts | 12 ++- website/package.json | 2 +- website/src/footer-content.tsx | 95 +++++++++-------- website/src/menu-content.tsx | 6 +- website/src/page-settings.tsx | 186 ++++++++++++++++----------------- website/static/index.html | 3 +- website/yarn.lock | 10 +- 8 files changed, 166 insertions(+), 166 deletions(-) diff --git a/Dockerfile b/Dockerfile index f5fe8f94f..989f5e9f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,25 @@ ARG SERVER_VERSION=v0.17.0 # Builder image to compile the website -FROM ubuntu as builder +FROM ubuntu AS builder WORKDIR /workdir +# See https://github.com/nodesource/distributions for Node.js package RUN apt-get update \ && apt-get install --no-install-recommends -y \ bash \ ca-certificates \ curl \ + && rm -rf /var/lib/apt/lists/* \ + && curl -sSL https://deb.nodesource.com/setup_20.x | bash - \ + && apt-get install -y nodejs \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -# See https://github.com/nodesource/distributions/blob/main/README.md#debinstall -RUN curl -sSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y nodejs - -RUN corepack enable -RUN corepack prepare yarn@stable --activate + && corepack enable \ + && corepack prepare yarn@stable --activate # bump to update website -ENV WEBSITE_VERSION 0.12.0 +ENV WEBSITE_VERSION 0.12.0-next.94189ad0 COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/dev/mock-service.ts b/website/dev/mock-service.ts index dfeca5982..e98605651 100644 --- a/website/dev/mock-service.ts +++ b/website/dev/mock-service.ts @@ -19,9 +19,7 @@ const avatarUrl = 'https://upload.wikimedia.org/wikipedia/commons/9/99/Avatar_cu export class MockRegistryService extends ExtensionRegistryService { constructor() { - // FIXME cannot reference `this` in super constructor call - super('', new MockAdminService(undefined!)); - (this.admin.registry as any) = this; + super('', MockAdminService); } search(abortController: AbortController, filter?: ExtensionFilter): Promise> { @@ -152,7 +150,9 @@ export class MockRegistryService extends ExtensionRegistryService { } } -export class MockAdminService extends AdminService { +export class MockAdminService implements AdminService { + + constructor(readonly registry: ExtensionRegistryService) {} getExtension(abortController: AbortController, namespace: string, extension: string): Promise> { return this.registry.getExtensionDetail(abortController, '') as Promise; @@ -187,4 +187,8 @@ export class MockAdminService extends AdminService { async revokePublisherContributions(abortController: AbortController, provider: string, login: string): Promise> { return Promise.resolve({ success: 'ok' }); } + + changeNamespace(abortController: AbortController, req: {oldNamespace: string, newNamespace: string, removeOldNamespace: boolean, mergeIfNewNamespaceAlreadyExists: boolean}): Promise> { + return Promise.resolve({ success: 'ok' }); + } } diff --git a/website/package.json b/website/package.json index a27d8743e..355edf503 100644 --- a/website/package.json +++ b/website/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/eclipse/open-vsx.org", "license": "EPL-2.0", "dependencies": { - "openvsx-webui": "0.12.0" + "openvsx-webui": "0.12.0-next.94189ad0" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/src/footer-content.tsx b/website/src/footer-content.tsx index 6f0211aac..f626a7772 100644 --- a/website/src/footer-content.tsx +++ b/website/src/footer-content.tsx @@ -43,56 +43,59 @@ const LegalLink = styled(RouteLink)(({ theme }: { theme: Theme }) => ({ fontWeight: theme.typography.fontWeightLight })); - +interface MainFooterProps { + isSmallDisplay: boolean + isLargeDisplay: boolean +} + +const MainFooter = ({isSmallDisplay, isLargeDisplay}: MainFooterProps) => { + const itemSpacing = 2.5; + return + {isSmallDisplay ? null : repositoryLink()} + { + isLargeDisplay ? + + + {privacyPolicy()} + + + {termsOfUse()} + + + {publisherAgreement()} + + + {copyrightAgent()} + + + {legalResources()} + + + {manageCookies()} + + + {copyrightText()} + + + {rightsReservedText()} + + + : + <> + {copyrightText()} + + Legal + + + } + ; +} const FooterContent: FunctionComponent<{ expanded: boolean }> = ({ expanded }) => { const theme = useTheme(); const isSmallDisplay = useMediaQuery(theme.breakpoints.down('sm')); const isLargeDisplay = useMediaQuery(theme.breakpoints.up('xl')); - const MainFooter = () => { - const itemSpacing = 2.5; - return - {isSmallDisplay ? null : repositoryLink()} - { - isLargeDisplay ? - - - {privacyPolicy()} - - - {termsOfUse()} - - - {publisherAgreement()} - - - {copyrightAgent()} - - - {legalResources()} - - - {manageCookies()} - - - {copyrightText()} - - - {rightsReservedText()} - - - : - <> - {copyrightText()} - - Legal - - - } - ; - } - if (expanded && !isLargeDisplay) { const itemSpacing = 1; return @@ -116,10 +119,10 @@ const FooterContent: FunctionComponent<{ expanded: boolean }> = ({ expanded }) = {manageCookies()} - + ; } else { - return ; + return ; } }; diff --git a/website/src/menu-content.tsx b/website/src/menu-content.tsx index 1f3373cea..d3188db56 100644 --- a/website/src/menu-content.tsx +++ b/website/src/menu-content.tsx @@ -176,10 +176,10 @@ const SubMenuLink = styled(Link)(subMenuLink); export const DefaultMenuContent: FunctionComponent = () => { - const [workingGroupMenuOpen, setWorkingGroupOpen] = useState(false); + const [workingGroupMenuOpen, setWorkingGroupMenuOpen] = useState(false); const workingGroupMenuEl = useRef(null); - const toggleWorkingGroupMenu = () => setWorkingGroupOpen(!workingGroupMenuOpen); - const closeWorkingGroupMenu = () => setWorkingGroupOpen(false); + const toggleWorkingGroupMenu = () => setWorkingGroupMenuOpen(!workingGroupMenuOpen); + const closeWorkingGroupMenu = () => setWorkingGroupMenuOpen(false); return <> diff --git a/website/src/page-settings.tsx b/website/src/page-settings.tsx index 23ed1a5b2..0c0897243 100644 --- a/website/src/page-settings.tsx +++ b/website/src/page-settings.tsx @@ -23,7 +23,93 @@ import About from './about'; import Adopters from './adopters'; import Members from './members'; -export default function createPageSettings(theme: Theme, prefersDarkMode: boolean, serverVersionPromise: Promise): PageSettings { +//---------- HEAD TAGS +const HeadTags: FunctionComponent<{title?: string, description?: string, keywords?: string, url?: string, imageUrl?: string, type?: string}> = (props) => { + const handleChangeClientState = (newState: any, addedTags: HelmetTags, removedTags: HelmetTags): void => { + if (addedTags.metaTags) { + addedTags.metaTags.forEach((value: HTMLMetaElement) => { + if (!value.content) { + value.remove(); + } + }); + } + }; + + const twitterCard = props.imageUrl ? 'summary_large_image' : 'summary'; + const type = props.type || 'website'; + return + {props.title} + + {/* SEO Meta Tags */} + + + + + + + + + {/* Google Meta Tags */} + + + + + {/* Twitter Meta Tags */} + + + + + ; +}; + +const MainHeadTags: FunctionComponent<{pageSettings: PageSettings}> = (props) => { + const title = props.pageSettings.pageTitle; + const description = 'Open VSX is an Eclipse open-source project and alternative to the Visual Studio Marketplace. It is deployed by the Eclipse Foundation at open-vsx.org.'; + const keywords = 'eclipse,ide,open source,development environment,development,vs code,visual studio code,extension,plugin,plug-in,registry,theia'; + const url = `${location.protocol}//${location.host}`; + const imageUrl = url + '/openvsx-preview.png'; + + return (); +}; + +const ExtensionHeadTags: FunctionComponent<{extension?: Extension, pageSettings: PageSettings}> = (props) => { + const { name, namespace } = useParams(); + let title = ` – ${props.pageSettings.pageTitle}`; + let url = `${location.protocol}//${location.host}/extension/`; + let description: string | undefined; + let keywords: string | undefined; + if (props.extension) { + title = (props.extension.displayName || props.extension.name) + title; + url += `${props.extension.namespace}/${props.extension.name}`; + description = props.extension.description; + // extension description can be up to 2048 characters, truncate it. + if (description && description.length > 255) { + let lastWordIndex = description.indexOf(' ', 255); + lastWordIndex = lastWordIndex !== -1 ? lastWordIndex - 1 : 255; + description = description.substring(0, lastWordIndex); + } + if (props.extension.tags) { + keywords = props.extension.tags.filter(t => !t.startsWith('__')).join(); + } + } else { + title = name + title; + url += `${namespace}/${name}`; + } + + return() +}; + +const NamespaceHeadTags: FunctionComponent<{namespaceDetails?: NamespaceDetails, pageSettings: PageSettings}> = (props) => { + const { name } = useParams(); + const namespaceName = props.namespaceDetails?.displayName ?? props.namespaceDetails?.name ?? name + const title = `${namespaceName} – ${props.pageSettings.pageTitle}`; + const url = `${location.protocol}//${location.host}/namespace/${namespaceName}`; + const description = props.namespaceDetails?.description + return() +}; + +export default function createPageSettings(theme: Theme, prefersDarkMode: boolean, serverVersionPromise: Promise): PageSettings { + //---------- SERVER VERSION const ServerVersion = lazy(async () => { const version = await serverVersionPromise; @@ -98,99 +184,7 @@ export default function createPageSettings(theme: Theme, prefersDarkMode: boolea Claim Ownership ; - //---------- HEAD TAGS - const headTags: FunctionComponent<{title?: string, description?: string, keywords?: string, url?: string, imageUrl?: string, type?: string}> = (props) => { - const handleChangeClientState = (newState: any, addedTags: HelmetTags, removedTags: HelmetTags): void => { - if (addedTags.metaTags) { - addedTags.metaTags.forEach((value: HTMLMetaElement) => { - if (!value.content) { - value.remove(); - } - }); - } - }; - - const twitterCard = props.imageUrl ? 'summary_large_image' : 'summary'; - const type = props.type || 'website'; - return - {props.title} - - {/* SEO Meta Tags */} - - - - - - - - - {/* Google Meta Tags */} - - - - - {/* Twitter Meta Tags */} - - - - - ; - }; - - const mainHeadTags: FunctionComponent<{pageSettings: PageSettings}> = (props) => { - const title = props.pageSettings.pageTitle; - const description = 'Open VSX is an Eclipse open-source project and alternative to the Visual Studio Marketplace. It is deployed by the Eclipse Foundation at open-vsx.org.'; - const keywords = 'eclipse,ide,open source,development environment,development,vs code,visual studio code,extension,plugin,plug-in,registry,theia'; - const url = `${location.protocol}//${location.host}`; - const imageUrl = url + '/openvsx-preview.png'; - - return headTags({ title, description, keywords, url, imageUrl }); - }; - - const extensionHeadTags: FunctionComponent<{extension?: Extension, pageSettings: PageSettings}> = (props) => { - let title = ` – ${props.pageSettings.pageTitle}`; - let url = `${location.protocol}//${location.host}/extension/`; - let description: string | undefined; - let keywords: string | undefined; - if (props.extension) { - title = (props.extension.displayName || props.extension.name) + title; - url += `${props.extension.namespace}/${props.extension.name}`; - description = props.extension.description; - // extension description can be up to 2048 characters, truncate it. - if (description && description.length > 255) { - let lastWordIndex = description.indexOf(' ', 255); - lastWordIndex = lastWordIndex !== -1 ? lastWordIndex - 1 : 255; - description = description.substring(0, lastWordIndex); - } - if (props.extension.tags) { - keywords = props.extension.tags.filter(t => !t.startsWith('__')).join(); - } - } else { - const { name, namespace } = useParams(); - title = name + title; - url += `${namespace}/${name}`; - } - - return headTags({ title, url, description, keywords }); - }; - - const namespaceHeadTags: FunctionComponent<{namespaceDetails?: NamespaceDetails, pageSettings: PageSettings}> = (props) => { - let title = ` – ${props.pageSettings.pageTitle}`; - let url = `${location.protocol}//${location.host}/namespace/`; - let description: string | undefined; - if (props.namespaceDetails) { - title = (props.namespaceDetails.displayName || props.namespaceDetails.name) + title; - url += props.namespaceDetails.name; - description = props.namespaceDetails.description; - } else { - const { name } = useParams(); - title = name + title; - url += name; - } - return headTags({ title, url, description }); - }; - return { pageTitle: 'Open VSX Registry', themeType: prefersDarkMode ? 'dark' : 'light', @@ -224,9 +218,9 @@ export default function createPageSettings(theme: Theme, prefersDarkMode: boolea additionalRoutes, reportAbuse, claimNamespace, - mainHeadTags, - extensionHeadTags, - namespaceHeadTags + mainHeadTags: MainHeadTags, + extensionHeadTags: ExtensionHeadTags, + namespaceHeadTags: NamespaceHeadTags }, urls: { extensionDefaultIcon: '/default-icon.png', diff --git a/website/static/index.html b/website/static/index.html index 50130ecc1..cb55bf50e 100644 --- a/website/static/index.html +++ b/website/static/index.html @@ -2,6 +2,7 @@ + Open VSX Registry @@ -39,7 +40,7 @@ - +
diff --git a/website/yarn.lock b/website/yarn.lock index 5b0011d4f..711ddf7fe 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2399,7 +2399,7 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" css-loader: "npm:^6.8.1" express: "npm:^4.21.0" - openvsx-webui: "npm:0.12.0" + openvsx-webui: "npm:0.12.0-next.94189ad0" source-map-loader: "npm:^4.0.1" style-loader: "npm:^3.3.3" typescript: "npm:~5.1.6" @@ -2420,9 +2420,9 @@ __metadata: languageName: node linkType: hard -"openvsx-webui@npm:0.12.0": - version: 0.12.0 - resolution: "openvsx-webui@npm:0.12.0" +"openvsx-webui@npm:0.12.0-next.94189ad0": + version: 0.12.0-next.94189ad0 + resolution: "openvsx-webui@npm:0.12.0-next.94189ad0" dependencies: "@emotion/react": "npm:^11.11.1" "@emotion/styled": "npm:^11.11.0" @@ -2448,7 +2448,7 @@ __metadata: react-router-dom: "npm:^6.14.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/dc1881ec826aa878519d8f3ffba906c9e26840991ea0c84a088b6277cecaa9fe80721cef166e0277eb9c56756e2778fc6dcb6eac4dda9de4441ba68aea634527 + checksum: 10/b6fe5a7394e938dccc863efd42406e1ebdc02895c5981033bf7dff3266db316c5893a4f04dde01f9a66c4f8a9c9b00510fdd3ac7be04acef04ef05896a0fa29f languageName: node linkType: hard From edccb97e0ff6e3df374a27c193b95221026a8da9 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 15 Oct 2024 16:38:10 +0300 Subject: [PATCH 03/19] test ce956f8a --- Dockerfile | 5 +++-- configuration/application.yml | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 989f5e9f3..658f909cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=v0.17.0 +ARG SERVER_VERSION=ce956f8a # Builder image to compile the website FROM ubuntu AS builder @@ -27,7 +27,8 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ diff --git a/configuration/application.yml b/configuration/application.yml index 53026bbe8..31b95e4e0 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -152,6 +152,8 @@ bucket4j: time: 1 unit: seconds ovsx: + upstream: + url: https://open-vsx.org storage: primary-service: azure-blob webui: From 56209eda00247dc991c21e3b21a3507c53fe99ad Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 15 Oct 2024 17:28:06 +0300 Subject: [PATCH 04/19] test 1df89812 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 658f909cd..28b1c502c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=ce956f8a +ARG SERVER_VERSION=1df89812 # Builder image to compile the website FROM ubuntu AS builder From f14c680d4b319bf71b0f900c456909a55618db52 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 15 Oct 2024 17:40:06 +0300 Subject: [PATCH 05/19] test ce956f8a --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28b1c502c..658f909cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=1df89812 +ARG SERVER_VERSION=ce956f8a # Builder image to compile the website FROM ubuntu AS builder From d02794a9f9a9ee1f956a2dd7347883ed74a95f45 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 15 Oct 2024 18:24:06 +0300 Subject: [PATCH 06/19] test webui 0.12.0-next.ce956f8a --- Dockerfile | 2 +- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 658f909cd..51729d395 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update \ && corepack prepare yarn@stable --activate # bump to update website -ENV WEBSITE_VERSION 0.12.0-next.94189ad0 +ENV WEBSITE_VERSION 0.12.0-next.ce956f8a COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index 355edf503..7ace8d045 100644 --- a/website/package.json +++ b/website/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/eclipse/open-vsx.org", "license": "EPL-2.0", "dependencies": { - "openvsx-webui": "0.12.0-next.94189ad0" + "openvsx-webui": "0.12.0-next.ce956f8a" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 711ddf7fe..6dd905e1c 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2399,7 +2399,7 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" css-loader: "npm:^6.8.1" express: "npm:^4.21.0" - openvsx-webui: "npm:0.12.0-next.94189ad0" + openvsx-webui: "npm:0.12.0-next.ce956f8a" source-map-loader: "npm:^4.0.1" style-loader: "npm:^3.3.3" typescript: "npm:~5.1.6" @@ -2420,9 +2420,9 @@ __metadata: languageName: node linkType: hard -"openvsx-webui@npm:0.12.0-next.94189ad0": - version: 0.12.0-next.94189ad0 - resolution: "openvsx-webui@npm:0.12.0-next.94189ad0" +"openvsx-webui@npm:0.12.0-next.ce956f8a": + version: 0.12.0-next.ce956f8a + resolution: "openvsx-webui@npm:0.12.0-next.ce956f8a" dependencies: "@emotion/react": "npm:^11.11.1" "@emotion/styled": "npm:^11.11.0" @@ -2448,7 +2448,7 @@ __metadata: react-router-dom: "npm:^6.14.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/b6fe5a7394e938dccc863efd42406e1ebdc02895c5981033bf7dff3266db316c5893a4f04dde01f9a66c4f8a9c9b00510fdd3ac7be04acef04ef05896a0fa29f + checksum: 10/2b5e230080c9ff08abe4b27ca8b079dbea1c4e2f356631c508e24603b10ab22a7fabd0f23fd11984b46d342d48d6a30cf33c6e6e3b2abaf447a4fb1bb0d3f30d languageName: node linkType: hard From 30b6e50c35aaa9d1d253b7def0e95b631341e9b2 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 15 Oct 2024 19:04:09 +0300 Subject: [PATCH 07/19] test 1b89e97a --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 51729d395..b541e1f53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=ce956f8a +ARG SERVER_VERSION=1b89e97a # Builder image to compile the website FROM ubuntu AS builder From 7ce7e5c0a46a3d1c1e254788013a817a7d1b12e1 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 15 Oct 2024 19:38:39 +0300 Subject: [PATCH 08/19] test 1aabd83c --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b541e1f53..ed487711a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=1b89e97a +ARG SERVER_VERSION=1aabd83c # Builder image to compile the website FROM ubuntu AS builder From b9024eeb496fc0741386eb47ed3cc39deb0161d3 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 15 Oct 2024 20:31:28 +0300 Subject: [PATCH 09/19] test webui 0.12.0-next.7821b01b --- Dockerfile | 2 +- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed487711a..8bae14a1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get update \ && corepack prepare yarn@stable --activate # bump to update website -ENV WEBSITE_VERSION 0.12.0-next.ce956f8a +ENV WEBSITE_VERSION 0.12.0-next.7821b01b COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index 7ace8d045..efd10e9b5 100644 --- a/website/package.json +++ b/website/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/eclipse/open-vsx.org", "license": "EPL-2.0", "dependencies": { - "openvsx-webui": "0.12.0-next.ce956f8a" + "openvsx-webui": "0.12.0-next.7821b01b" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 6dd905e1c..99f68763f 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2399,7 +2399,7 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" css-loader: "npm:^6.8.1" express: "npm:^4.21.0" - openvsx-webui: "npm:0.12.0-next.ce956f8a" + openvsx-webui: "npm:0.12.0-next.7821b01b" source-map-loader: "npm:^4.0.1" style-loader: "npm:^3.3.3" typescript: "npm:~5.1.6" @@ -2420,9 +2420,9 @@ __metadata: languageName: node linkType: hard -"openvsx-webui@npm:0.12.0-next.ce956f8a": - version: 0.12.0-next.ce956f8a - resolution: "openvsx-webui@npm:0.12.0-next.ce956f8a" +"openvsx-webui@npm:0.12.0-next.7821b01b": + version: 0.12.0-next.7821b01b + resolution: "openvsx-webui@npm:0.12.0-next.7821b01b" dependencies: "@emotion/react": "npm:^11.11.1" "@emotion/styled": "npm:^11.11.0" @@ -2448,7 +2448,7 @@ __metadata: react-router-dom: "npm:^6.14.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/2b5e230080c9ff08abe4b27ca8b079dbea1c4e2f356631c508e24603b10ab22a7fabd0f23fd11984b46d342d48d6a30cf33c6e6e3b2abaf447a4fb1bb0d3f30d + checksum: 10/31cf9d39773f3f06f10924b9f4c316e94ecd95f19b7f8c685d812e061dcd5f0be5273ab536f0f81deff7e3a4a28c36403afeb433c7255101f6f13bbda93d7919 languageName: node linkType: hard From f7d9c6ae666b4b318059e055cc925ba0f228ddd6 Mon Sep 17 00:00:00 2001 From: Olivier Goulet Date: Tue, 22 Oct 2024 15:11:02 -0400 Subject: [PATCH 10/19] Add ready to join and contact button to member page --- website/src/members.tsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/website/src/members.tsx b/website/src/members.tsx index 66722f756..fee3c6af8 100644 --- a/website/src/members.tsx +++ b/website/src/members.tsx @@ -32,13 +32,20 @@ const Members = () => { VSX Registry at open-vsx.org. - + + From 0508383dd521572021da7b3b64916a5892a0b2d2 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 23 Oct 2024 20:17:26 +0300 Subject: [PATCH 11/19] test 6f6d87f4 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8bae14a1c..107e91635 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=1aabd83c +ARG SERVER_VERSION=6f6d87f4 # Builder image to compile the website FROM ubuntu AS builder @@ -27,7 +27,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +#FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION From 49992c066ba1c6fd359f1390c8f6a5c8ce38f4d8 Mon Sep 17 00:00:00 2001 From: JK Date: Wed, 23 Oct 2024 15:36:23 -0400 Subject: [PATCH 12/19] Removing banner and OCX announcement --- website/src/page-settings.tsx | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/website/src/page-settings.tsx b/website/src/page-settings.tsx index 0c0897243..6a337020b 100644 --- a/website/src/page-settings.tsx +++ b/website/src/page-settings.tsx @@ -15,7 +15,7 @@ import { Link as RouteLink, Route, useParams } from 'react-router-dom'; import { PageSettings, Extension, NamespaceDetails } from 'openvsx-webui'; import { ExtensionListRoutes } from 'openvsx-webui/lib/pages/extension-list/extension-list-container'; import { DefaultMenuContent, MobileMenuContent } from './menu-content'; -import InfoIcon from '@mui/icons-material/Info'; +// import InfoIcon from '@mui/icons-material/Info'; import OpenVSXLogo from './openvsx-registry-logo'; import footerContent from './footer-content'; import { Document } from './document'; @@ -127,18 +127,18 @@ export default function createPageSettings(theme: Theme, prefersDarkMode: boolea ; - //---------- ANNOUNCEMENT BANNER - const bannerContent: FunctionComponent = () => - - - - - - Eclipse OCX and EclipseCon 2024 are right around the corner October 22-24. Whether your IDEs are desktop cloud-based or a mix, we have a - great agenda of - talks. Register now! - - ; + // //---------- ANNOUNCEMENT BANNER + // const bannerContent: FunctionComponent = () => + // + // + // + // + // + // Eclipse OCX and EclipseCon 2024 are right around the corner October 22-24. Whether your IDEs are desktop cloud-based or a mix, we have a + // great agenda of + // talks. Register now! + // + // ; //---------- SEARCH HEADER const searchHeader: FunctionComponent = () => @@ -192,21 +192,21 @@ export default function createPageSettings(theme: Theme, prefersDarkMode: boolea defaultMenuContent: DefaultMenuContent, mobileMenuContent: MobileMenuContent, toolbarContent, - banner: { - content: bannerContent, - props: { - dismissButton: { - show: true, - label: 'Got It' - }, - color: 'info' - }, - cookie: { - key: 'ocx-2024', - value: 'closed', - path: '/' - } - }, + // banner: { + // content: bannerContent, + // props: { + // dismissButton: { + // show: true, + // label: 'Got It' + // }, + // color: 'info' + // }, + // cookie: { + // key: 'ocx-2024', + // value: 'closed', + // path: '/' + // } + // }, footer: { content: footerContent, props: { From 0c5552b29ca4576a94f8270857c34c9b91fc562d Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Thu, 24 Oct 2024 13:33:27 +0300 Subject: [PATCH 13/19] test 632bc307 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 107e91635..e6e1a3ec5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=6f6d87f4 +ARG SERVER_VERSION=632bc307 # Builder image to compile the website FROM ubuntu AS builder From 76dda08189b00d56df8eee1a9d4a25bac540b650 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Thu, 24 Oct 2024 17:18:25 +0300 Subject: [PATCH 14/19] test 47c70917 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e6e1a3ec5..98e2c2c6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=632bc307 +ARG SERVER_VERSION=47c70917 # Builder image to compile the website FROM ubuntu AS builder From 1f3ba22617c9cf5670d7aca00fef45c43c275514 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Thu, 24 Oct 2024 18:13:59 +0300 Subject: [PATCH 15/19] test 3cc06420 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 98e2c2c6d..9f7251bd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=47c70917 +ARG SERVER_VERSION=3cc06420 # Builder image to compile the website FROM ubuntu AS builder From 6edb5b5372874fc640676b0f848716557f9ea28b Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Thu, 24 Oct 2024 19:09:51 +0300 Subject: [PATCH 16/19] test 3ba5d71e --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f7251bd2..f9ca83691 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=3cc06420 +ARG SERVER_VERSION=3ba5d71e # Builder image to compile the website FROM ubuntu AS builder From 73fa5eb7941b070cfc533562985b2fbf7c502270 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Thu, 24 Oct 2024 21:52:15 +0300 Subject: [PATCH 17/19] test e717182b --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f9ca83691..48135c6c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=3ba5d71e +ARG SERVER_VERSION=e717182b # Builder image to compile the website FROM ubuntu AS builder From 858cb0f720f144cfbbf6e6f72ef934873aed23ed Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Fri, 25 Oct 2024 13:49:02 +0300 Subject: [PATCH 18/19] release v0.18.0 --- Dockerfile | 7 +++---- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48135c6c3..9822c9032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=e717182b +ARG SERVER_VERSION=v0.18.0 # Builder image to compile the website FROM ubuntu AS builder @@ -19,7 +19,7 @@ RUN apt-get update \ && corepack prepare yarn@stable --activate # bump to update website -ENV WEBSITE_VERSION 0.12.0-next.7821b01b +ENV WEBSITE_VERSION 0.13.0 COPY . /workdir RUN /usr/bin/yarn --cwd website \ @@ -27,8 +27,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -#FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} -FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} +FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ diff --git a/website/package.json b/website/package.json index efd10e9b5..fff4359d2 100644 --- a/website/package.json +++ b/website/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/eclipse/open-vsx.org", "license": "EPL-2.0", "dependencies": { - "openvsx-webui": "0.12.0-next.7821b01b" + "openvsx-webui": "0.13.0" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 99f68763f..4cf888fcf 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2399,7 +2399,7 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" css-loader: "npm:^6.8.1" express: "npm:^4.21.0" - openvsx-webui: "npm:0.12.0-next.7821b01b" + openvsx-webui: "npm:0.13.0" source-map-loader: "npm:^4.0.1" style-loader: "npm:^3.3.3" typescript: "npm:~5.1.6" @@ -2420,9 +2420,9 @@ __metadata: languageName: node linkType: hard -"openvsx-webui@npm:0.12.0-next.7821b01b": - version: 0.12.0-next.7821b01b - resolution: "openvsx-webui@npm:0.12.0-next.7821b01b" +"openvsx-webui@npm:0.13.0": + version: 0.13.0 + resolution: "openvsx-webui@npm:0.13.0" dependencies: "@emotion/react": "npm:^11.11.1" "@emotion/styled": "npm:^11.11.0" @@ -2448,7 +2448,7 @@ __metadata: react-router-dom: "npm:^6.14.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/31cf9d39773f3f06f10924b9f4c316e94ecd95f19b7f8c685d812e061dcd5f0be5273ab536f0f81deff7e3a4a28c36403afeb433c7255101f6f13bbda93d7919 + checksum: 10/b0245fd107f2b88d86cf7fea5a9ded80ad9084a13fdff16904614f5bdeb9f750b916feb976748eee9da0e230065b0d9fc06f789f74153f21005d16eef57c1f07 languageName: node linkType: hard From 28bb1939cb3c574e438b41e3f0454d46e3b39b76 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Mon, 28 Oct 2024 10:54:42 +0200 Subject: [PATCH 19/19] Remove upstream config --- configuration/application.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/configuration/application.yml b/configuration/application.yml index 31b95e4e0..53026bbe8 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -152,8 +152,6 @@ bucket4j: time: 1 unit: seconds ovsx: - upstream: - url: https://open-vsx.org storage: primary-service: azure-blob webui: