Skip to content

Commit a3cc0fb

Browse files
committed
Intial cut of vite implementation
1 parent ad141ef commit a3cc0fb

18 files changed

+872
-700
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.eslintrc.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.gitignore

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
pnpm-debug.log*
8+
lerna-debug.log*
9+
110
node_modules
2-
npm-debug.log
3-
.idea
411
dist
5-
*.html
12+
dist-ssr
13+
*.local
14+
15+
# Editor directories and files
16+
.vscode/*
17+
!.vscode/extensions.json
18+
.idea
19+
.DS_Store
20+
*.suo
21+
*.ntvs*
22+
*.njsproj
23+
*.sln
24+
*.sw?
25+
626
sitemap.xml
7-
.DS_Store*
8-
.java-version
9-
.vscode/

package.json

Lines changed: 18 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,27 @@
33
"repository": "https://github.com/AdoptOpenJDK/openjdk-website",
44
"version": "1.0.0",
55
"license": "Apache-2.0",
6+
"type": "module",
7+
"author": "Joe Brady",
68
"scripts": {
7-
"start": "gulp",
8-
"json-validate": "gulp json-validate",
9-
"assemble": "bash assemble.sh",
10-
"lint": "eslint src/**/*.js",
11-
"lint-fix": "npm run lint --- --fix",
12-
"test": "npm run lint && npm run json-validate"
9+
"dev": "vite",
10+
"build": "vite build",
11+
"preview": "vite preview"
1312
},
14-
"author": "Joe Brady",
1513
"devDependencies": {
16-
"@babel/core": "^7.26.10",
17-
"@babel/preset-env": "^7.26.9",
18-
"ajv": "^8.17.1",
19-
"ajv-formats": "^3.0.1",
20-
"babelify": "^10.0.0",
21-
"base64-img": "^1.0.4",
22-
"browser-sync": "^3.0.3",
23-
"browser-sync-client": "^3.0.3",
24-
"browserify": "^17.0.1",
25-
"chai": "^5.2.0",
26-
"core-js": "^3.41.0",
27-
"eslint": "^8.57.0",
28-
"fancy-log": "^2.0.0",
29-
"gulp": "^5.0.0",
30-
"gulp-autoprefixer": "^9.0.0",
31-
"gulp-clean": "^0.4.0",
32-
"gulp-clean-css": "^4.3.0",
33-
"gulp-cli": "^3.0.0",
34-
"gulp-compile-handlebars": "^0.6.1",
35-
"gulp-concat": "^2.6.1",
36-
"gulp-eslint": "^6.0.0",
37-
"gulp-hash": "^4.2.2",
38-
"gulp-imagemin": "^9.1.0",
39-
"gulp-inject": "^5.0.5",
40-
"gulp-rename": "^2.0.0",
41-
"gulp-sass": "^5.1.0",
42-
"gulp-sitemap": "^8.0.0",
43-
"gulp-uglify-es": "^3.0.0",
44-
"mocha": "^11.1.0",
45-
"node-sass": "^9.0.0",
46-
"open": "^10.1.0",
47-
"plugin-error": "^2.0.1",
48-
"run-sequence": "^2.2.1",
49-
"sass": "^1.86.0",
50-
"util": "^0.12.5",
51-
"vinyl-buffer": "^1.0.1",
52-
"vinyl-source-stream": "^2.0.0"
14+
"eslint": "^9.24.0",
15+
"glob": "^11.0.1",
16+
"handlebars": "^4.7.8",
17+
"vite": "^6.2.0",
18+
"vite-plugin-eslint": "^1.8.1",
19+
"vite-plugin-handlebars": "^2.0.0",
20+
"vite-plugin-imagemin": "^0.6.1",
21+
"vite-plugin-sass-dts": "^1.3.31"
5322
},
5423
"dependencies": {
55-
"@babel/polyfill": "^7.12.1"
56-
},
57-
"type": "module"
24+
"core-js": "^3.23.3",
25+
"jquery": "^3.7.1",
26+
"moment": "^2.30.1",
27+
"regenerator-runtime": "^0.13.11"
28+
}
5829
}

src/counter.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Migrate counter.js
2+
export function setupCounter(element) {
3+
let counter = 0
4+
const setCounter = (count) => {
5+
counter = count
6+
element.innerHTML = `count is ${counter}`
7+
}
8+
element.addEventListener('click', () => setCounter(counter + 1))
9+
setCounter(0)
10+
}

src/handlebars/index.handlebars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</a>
5656

5757
<h4><a href="https://blog.adoptopenjdk.net/2021/03/transition-to-eclipse-an-update/">AdoptOpenJDK has moved</a>, the blue download button will take you to the new location.</h4>
58-
<p>You can stil get AdoptOpenJDK binaries by clicking one of the buttons below:</p>
58+
<p>You can still get AdoptOpenJDK binaries by clicking one of the buttons below:</p>
5959

6060
<a href="./releases.html" class="dl-button dl-thin-button a-button fadeIn invisible" id="dl-other">
6161
<div>

src/handlebars/partials/header.handlebars

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
<meta name="twitter:site" content="@adoptium" />
1010
<meta name="twitter:title" content="{{title}}AdoptOpenJDK">
1111
<meta name="twitter:description" content="{{> meta-description}}">
12-
<meta name="twitter:image" content="https://adoptopenjdk.net/dist/assets/social-image.png">
13-
<meta property="og:image" content="https://adoptopenjdk.net/dist/assets/social-image.png"/>
12+
<meta name="twitter:image" content="https://adoptopenjdk.net/assets/social-image.png">
13+
<meta property="og:image" content="https://adoptopenjdk.net/assets/social-image.png"/>
1414
<meta property="og:title" content="{{title}}AdoptOpenJDK"/>
1515
<meta property="og:description" content="{{> meta-description}}"/>
1616
<meta name="description" content="{{> meta-description}}"/>
1717
<title>{{title}}AdoptOpenJDK - Open source, prebuilt OpenJDK binaries</title>
18-
<link rel="shortcut icon" href="dist/assets/favicon.ico" type="image/x-icon">
19-
<link rel="icon" href="dist/assets/favicon.ico" type="image/x-icon">
18+
<link rel="shortcut icon" href="/assets/favicon.ico" type="image/x-icon">
19+
<link rel="icon" href="/assets/favicon.ico" type="image/x-icon">
2020
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
21-
<!-- inject:css -->
22-
<!-- endinject -->
21+
<link rel="stylesheet" href="/assets/app.css">
2322
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
2423
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.5.2/animate.min.css">
2524
{{{style1}}}
2625
{{{style2}}}
26+
<script type="module" src="/assets/js/app.js" defer></script>
2727
</head>
2828

2929
<script type="application/ld+json">
@@ -60,8 +60,8 @@
6060
<label id="menu-button" for="menu-checkbox">
6161
<i class="fa fa-bars" aria-hidden="true"></i>
6262
</label>
63-
<a id="logo" href="./index.html" class="a-button">
64-
<img src='dist/assets/adopt_logo_white.svg' alt="AdoptOpenJDK">
63+
<a id="logo" href="/index.html" class="a-button">
64+
<img src='/assets/adopt_logo_white.svg' alt="AdoptOpenJDK">
6565
</a>
6666

6767
<div id="header-social-bar">{{> social-bar }}</div>

src/handlebars/partials/menu.handlebars

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@
77
</div>
88
<div id="menu-content">
99
<ul>
10-
<li><a href="./index.html">Home</a></li>
11-
<li><a href="./releases.html">Latest release</a></li>
12-
<li><a href="./archive.html">Build archive</a></li>
10+
<li><a href="/index.html">Home</a></li>
11+
<li><a href="/releases.html">Latest release</a></li>
12+
<li><a href="/archive.html">Build archive</a></li>
1313
<li><a target="_blank" href="https://adoptium.net/temurin/nightly">Nightly builds</a></li>
1414
<li><a target="_blank" href="https://adoptium.net/installation">Installation</a></li>
1515
<li class="submenu"><a>Projects</a>
1616
<ul>
17-
<li><a href="./icedtea-web.html">IcedTea-Web</a></li>
17+
<li><a href="/icedtea-web.html">IcedTea-Web</a></li>
1818
<li><a target="_blank" href="https://adoptium.net/jmc">JDK Mission Control</a></li>
1919
</ul>
2020
</li>
2121
<li><a target="_blank" href="https://adoptium.net/docs/migration">Migration Guide</a></li>
22-
<li><a href="https://adoptium.net/support">Support</a></li>
23-
<li><a href="https://adoptium.net/docs/first-timer-support">Get involved!</a></li>
22+
<li><a target="_blank" href="https://adoptium.net/support">Support</a></li>
23+
<li><a target="_blank" href="https://adoptium.net/docs/first-timer-support">Get involved!</a></li>
2424
<li class="submenu"><a>Further information</a>
2525
<ul>
26-
<li><a href="https://adoptium.net/about">About</a></li>
27-
<li><a href="./sponsors.html">Sponsors</a></li>
26+
<li><a target="_blank" href="https://adoptium.net/about">About</a></li>
27+
<li><a href="/sponsors.html">Sponsors</a></li>
2828
<li><a target="_blank" href="https://api.adoptium.net">API</a></li>
2929
<li><a target="_blank" href="https://blog.adoptopenjdk.net/">Blog</a></li>
3030
<li><a target="_blank" href="https://status.adoptopenjdk.net/">Status</a></li>
31-
<li><a href="./quality.html">Quality</a></li>
32-
<li><a href="https://adoptium.net/supported-platforms">Supported Platforms</a></li>
33-
<li><a href="./logos.html">Brand Resources</a></li>
31+
<li><a href="/quality.html">Quality</a></li>
32+
<li><a target="_blank" href="https://adoptium.net/supported-platforms">Supported Platforms</a></li>
33+
<li><a href="/logos.html">Brand Resources</a></li>
3434
</ul>
3535
</li>
3636
</ul>

src/javascript.svg

Lines changed: 1 addition & 0 deletions
Loading

src/js/archive.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
const {findPlatform, detectEA, getOfficialName, getPlatformOrder,
2-
loadAssetInfo, setRadioSelectors} = require('./common');
3-
const {jvmVariant, variant} = require('./common');
1+
import { findPlatform, detectEA, getOfficialName, getPlatformOrder, loadAssetInfo, setRadioSelectors, jvmVariant, variant } from './common';
2+
import moment from 'moment';
3+
import Handlebars from 'handlebars';
4+
import $ from 'jquery';
45

56
const loading = document.getElementById('loading');
67
const errorContainer = document.getElementById('error-container');
78

89
// When archive page loads, run:
9-
module.exports.load = () => {
10+
export function load() {
1011
setRadioSelectors();
1112

1213
loadAssetInfo(variant, jvmVariant, 'ga', undefined, undefined, undefined, 'adoptopenjdk', buildArchiveHTML, () => {

0 commit comments

Comments
 (0)