Skip to content

Commit

Permalink
Merge pull request #2983 from EclipseFdn/main
Browse files Browse the repository at this point in the history
Release v0.17.0
  • Loading branch information
kineticsquid authored Sep 25, 2024
2 parents 31e7522 + ac5f178 commit b44d28d
Show file tree
Hide file tree
Showing 6 changed files with 392 additions and 218 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SERVER_VERSION=v0.16.4
ARG SERVER_VERSION=v0.17.0

# Builder image to compile the website
FROM ubuntu as builder
Expand All @@ -21,7 +21,7 @@ RUN corepack enable
RUN corepack prepare yarn@stable --activate

# bump to update website
ENV WEBSITE_VERSION 0.11.11
ENV WEBSITE_VERSION 0.12.0
COPY . /workdir

RUN /usr/bin/yarn --cwd website \
Expand Down
2 changes: 2 additions & 0 deletions configuration/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ ovsx:
migrations:
delay:
seconds: 300
extension-control:
update-on-start: true
integrity:
key-pair: create
registry:
Expand Down
10 changes: 10 additions & 0 deletions configuration/ehcache.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,14 @@
<disk unit="MB">8</disk>
</resources>
</cache>
<cache alias="malicious.extensions">
<expiry>
<ttl unit="days">1</ttl>
</expiry>
<resources>
<heap unit="entries">1</heap>
<offheap unit="MB">2</offheap>
<disk unit="MB">8</disk>
</resources>
</cache>
</config>
6 changes: 3 additions & 3 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"repository": "https://github.com/eclipse/open-vsx.org",
"license": "EPL-2.0",
"dependencies": {
"openvsx-webui": "0.11.11"
"openvsx-webui": "0.12.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
Expand All @@ -17,11 +17,11 @@
"@types/react-dom": "^18.2.6",
"@types/react-router-dom": "^5.3.3",
"css-loader": "^6.8.1",
"express": "^4.19.2",
"express": "^4.21.0",
"source-map-loader": "^4.0.1",
"style-loader": "^3.3.3",
"typescript": "~5.1.6",
"webpack": "^5.88.1",
"webpack": "^5.94.0",
"webpack-bundle-analyzer": "^4.9.0",
"webpack-cli": "^5.1.4"
},
Expand Down
38 changes: 27 additions & 11 deletions website/src/page-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -42,16 +42,17 @@ export default function createPageSettings(theme: Theme, prefersDarkMode: boolea
</>;

//---------- ANNOUNCEMENT BANNER
// const bannerContent: FunctionComponent = () =>
// <Box display='flex' alignItems='center' pt={1} pb={1}>
// <Box mr={2}>
// <InfoIcon fontSize='large' />
// </Box>
// <Typography variant='body1'>
// We're planning a brief outage for database maintenance, currently scheduled for August 14. For scheduling details, see our&nbsp;
// <Link color='secondary' underline='hover' href="https://status.open-vsx.org/maintenance">maintenance page</Link>.
// </Typography>
// </Box>;
const bannerContent: FunctionComponent = () =>
<Box display='flex' alignItems='center' pt={1} pb={1}>
<Box mr={2}>
<InfoIcon fontSize='large' />
</Box>
<Typography variant='body1'>
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 <Link color='secondary' underline='hover' href="https://www.ocxconf.org/event/778b82cc-6834-48a4-a58e-f883c5a7b8c9/websitePage:637aabfe-dbad-4826-87c3-355bee0f7c89">agenda</Link> of
talks. <Link color='secondary' underline='hover' href="https://www.ocxconf.org/event/778b82cc-6834-48a4-a58e-f883c5a7b8c9/websitePage:6650e052-a407-44ce-a754-b31ffba18333">Register</Link> now!
</Typography>
</Box>;

//---------- SEARCH HEADER
const searchHeader: FunctionComponent = () =>
Expand Down Expand Up @@ -197,6 +198,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: '/'
}
},
footer: {
content: footerContent,
props: {
Expand Down
Loading

0 comments on commit b44d28d

Please sign in to comment.