Skip to content

Commit 57a8410

Browse files
amvanbarenmbarbero
authored andcommitted
Try to fix deleting multiple versions at once (issue #816)
1 parent d9627de commit 57a8410

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ RUN curl -sSL https://deb.nodesource.com/setup_12.x | bash - \
1818
RUN npm install --global yarn@1.*
1919

2020
# bump to update website
21-
ENV WEBSITE_VERSION 0.2.0-next.6bd6b3f
21+
ENV WEBSITE_VERSION 0.1.0-next.12db3ed
2222
COPY . /workdir
2323

2424
RUN /usr/bin/yarn --cwd website \
2525
&& /usr/bin/yarn --cwd website build
2626

2727
# Main image derived from openvsx-server
28-
FROM ghcr.io/eclipse/openvsx-server:f14d956
28+
FROM docker.io/amvanbaren/openvsx-server:12db3ed
2929

3030
COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
3131
COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/ config/

website/dev/main-dev.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import * as React from 'react';
1313
import { BrowserRouter } from 'react-router-dom';
1414
import { ThemeProvider } from '@material-ui/styles';
1515
import { useMediaQuery } from '@material-ui/core';
16-
import { Main } from 'openvsx-webui';
16+
import { Main } from 'openvsx-webui-staging';
1717
import createPageSettings from '../src/page-settings';
18-
import createDefaultTheme from 'openvsx-webui/lib/default/theme';
18+
import createDefaultTheme from 'openvsx-webui-staging/lib/default/theme';
1919
import { MockRegistryService } from './mock-service';
2020

2121
const App: React.FunctionComponent = () => {

website/dev/mock-service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
ExtensionRegistryService, SearchResult, ErrorResult, Extension, ExtensionReviewList, SuccessResult,
1313
UserData, ExtensionReview, PersonalAccessToken, CsrfTokenJson, ExtensionReference, Namespace,
1414
NamespaceMembershipList, AdminService, PublisherInfo
15-
} from "openvsx-webui";
15+
} from "openvsx-webui-staging";
1616

1717
const avatarUrl = 'https://upload.wikimedia.org/wikipedia/commons/1/19/Spongebob_Squarepants_as_a_balloon.jpg';
1818

website/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"repository": "https://github.com/eclipse/open-vsx.org",
77
"license": "EPL-2.0",
88
"dependencies": {
9-
"openvsx-webui": "0.2.0-next.6bd6b3f"
9+
"openvsx-webui-staging": "0.1.0-next.12db3ed"
1010
},
1111
"devDependencies": {
1212
"@types/markdown-it": "^10.0.3",

website/src/document.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
import * as React from 'react';
1212
import { Box } from '@material-ui/core';
13-
import { SanitizedMarkdown } from 'openvsx-webui/lib/components/sanitized-markdown';
14-
import { DelayedLoadIndicator } from 'openvsx-webui/lib/components/delayed-load-indicator';
15-
import { MainContext } from 'openvsx-webui/lib/context';
13+
import { SanitizedMarkdown } from 'openvsx-webui-staging/lib/components/sanitized-markdown';
14+
import { DelayedLoadIndicator } from 'openvsx-webui-staging/lib/components/delayed-load-indicator';
15+
import { MainContext } from 'openvsx-webui-staging/lib/context';
1616

1717
export class Document extends React.Component<Document.Props, Document.State> {
1818

website/src/main.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import * as React from 'react';
1313
import { BrowserRouter } from 'react-router-dom';
1414
import { ThemeProvider } from '@material-ui/styles';
1515
import { useMediaQuery } from '@material-ui/core';
16-
import { Main, ExtensionRegistryService } from 'openvsx-webui';
17-
import createDefaultTheme from 'openvsx-webui/lib/default/theme';
16+
import { Main, ExtensionRegistryService } from 'openvsx-webui-staging';
17+
import createDefaultTheme from 'openvsx-webui-staging/lib/default/theme';
1818
import createPageSettings from './page-settings';
1919

2020
const App: React.FunctionComponent = () => {

website/src/page-settings.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import * as React from 'react';
1212
import { makeStyles } from '@material-ui/styles';
1313
import { Link, Typography, Theme, Box } from '@material-ui/core';
1414
import { Link as RouteLink, Route } from 'react-router-dom';
15-
import { PageSettings, Extension, Styleable } from 'openvsx-webui';
16-
import { ExtensionListRoutes } from 'openvsx-webui/lib/pages/extension-list/extension-list-container';
15+
import { PageSettings, Extension, Styleable } from 'openvsx-webui-staging';
16+
import { ExtensionListRoutes } from 'openvsx-webui-staging/lib/pages/extension-list/extension-list-container';
1717
import { DefaultMenuContent, MobileMenuContent } from './menu-content';
1818
import InfoIcon from '@material-ui/icons/Info';
1919
import OpenVSXRegistryLogo from './openvsx-registry-logo';

website/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,10 +1370,10 @@ opener@^1.5.2:
13701370
resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
13711371
integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
13721372

1373-
openvsx-webui@0.2.0-next.6bd6b3f:
1374-
version "0.2.0-next.6bd6b3f"
1375-
resolved "https://registry.yarnpkg.com/openvsx-webui/-/openvsx-webui-0.2.0-next.6bd6b3f.tgz#4118631063f4368798e43b4b345e5a60a0cc4881"
1376-
integrity sha512-YtjmzHQWSsU3N5+hJz+wvSZh903iEjjg9ggVodjZmPduALgUujvEZ31haVsCSefpQv4WBD+qnWoLqba20NZIRw==
1373+
openvsx-webui-staging@0.1.0-next.12db3ed:
1374+
version "0.1.0-next.12db3ed"
1375+
resolved "https://registry.yarnpkg.com/openvsx-webui-staging/-/openvsx-webui-staging-0.1.0-next.12db3ed.tgz#86c1509a4add316bbd5a01e64a77e76e28e917c8"
1376+
integrity sha512-1R/+/3yj7mKB4VKmim/cafR+oCno3HdSs91m8Kp6y7xpxR2Q1T7geFuJ/ZXA2oYi+IA41mMlIxlPZJyun4nO6Q==
13771377
dependencies:
13781378
"@material-ui/core" "~4.9.14"
13791379
"@material-ui/icons" "~4.9.1"

0 commit comments

Comments
 (0)