From a3cc0fbcc08b522fa0c4724692508609706adcea Mon Sep 17 00:00:00 2001 From: Martijn Verburg Date: Tue, 13 May 2025 16:57:21 +1200 Subject: [PATCH 01/15] Intial cut of vite implementation --- .eslintignore | 1 - .eslintrc.yml | 13 - .gitignore | 29 +- package.json | 65 ++--- src/counter.js | 10 + src/handlebars/index.handlebars | 2 +- src/handlebars/partials/header.handlebars | 16 +- src/handlebars/partials/menu.handlebars | 22 +- src/javascript.svg | 1 + src/js/archive.js | 9 +- src/js/common.js | 289 ++++++++++++-------- src/js/index.js | 43 +-- src/js/releases.js | 304 ++++++--------------- src/js/upstream.js | 313 ++++++--------------- src/main.js | 30 ++ src/scss/main.scss | 11 + src/style.css | 96 +++++++ vite.config.js | 318 ++++++++++++++++++++++ 18 files changed, 872 insertions(+), 700 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc.yml create mode 100644 src/counter.js create mode 100644 src/javascript.svg create mode 100644 src/main.js create mode 100644 src/scss/main.scss create mode 100644 src/style.css create mode 100644 vite.config.js diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index bcbd3b8e9..000000000 --- a/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -dist/js/*.js diff --git a/.eslintrc.yml b/.eslintrc.yml deleted file mode 100644 index 18d078a16..000000000 --- a/.eslintrc.yml +++ /dev/null @@ -1,13 +0,0 @@ -env: - browser: true - node: true - es6: true - jquery: true -rules: - no-console: 0 - no-inner-declarations: 0 - quotes: [2, single] -globals: - Handlebars: true - moment: true -extends: eslint:recommended diff --git a/.gitignore b/.gitignore index 59cff085c..68ad03f54 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,26 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* +lerna-debug.log* + node_modules -npm-debug.log -.idea dist -*.html +dist-ssr +*.local + +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea +.DS_Store +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + sitemap.xml -.DS_Store* -.java-version -.vscode/ diff --git a/package.json b/package.json index 20617d711..fcb0dbdf5 100644 --- a/package.json +++ b/package.json @@ -3,56 +3,27 @@ "repository": "https://github.com/AdoptOpenJDK/openjdk-website", "version": "1.0.0", "license": "Apache-2.0", + "type": "module", + "author": "Joe Brady", "scripts": { - "start": "gulp", - "json-validate": "gulp json-validate", - "assemble": "bash assemble.sh", - "lint": "eslint src/**/*.js", - "lint-fix": "npm run lint --- --fix", - "test": "npm run lint && npm run json-validate" + "dev": "vite", + "build": "vite build", + "preview": "vite preview" }, - "author": "Joe Brady", "devDependencies": { - "@babel/core": "^7.26.10", - "@babel/preset-env": "^7.26.9", - "ajv": "^8.17.1", - "ajv-formats": "^3.0.1", - "babelify": "^10.0.0", - "base64-img": "^1.0.4", - "browser-sync": "^3.0.3", - "browser-sync-client": "^3.0.3", - "browserify": "^17.0.1", - "chai": "^5.2.0", - "core-js": "^3.41.0", - "eslint": "^8.57.0", - "fancy-log": "^2.0.0", - "gulp": "^5.0.0", - "gulp-autoprefixer": "^9.0.0", - "gulp-clean": "^0.4.0", - "gulp-clean-css": "^4.3.0", - "gulp-cli": "^3.0.0", - "gulp-compile-handlebars": "^0.6.1", - "gulp-concat": "^2.6.1", - "gulp-eslint": "^6.0.0", - "gulp-hash": "^4.2.2", - "gulp-imagemin": "^9.1.0", - "gulp-inject": "^5.0.5", - "gulp-rename": "^2.0.0", - "gulp-sass": "^5.1.0", - "gulp-sitemap": "^8.0.0", - "gulp-uglify-es": "^3.0.0", - "mocha": "^11.1.0", - "node-sass": "^9.0.0", - "open": "^10.1.0", - "plugin-error": "^2.0.1", - "run-sequence": "^2.2.1", - "sass": "^1.86.0", - "util": "^0.12.5", - "vinyl-buffer": "^1.0.1", - "vinyl-source-stream": "^2.0.0" + "eslint": "^9.24.0", + "glob": "^11.0.1", + "handlebars": "^4.7.8", + "vite": "^6.2.0", + "vite-plugin-eslint": "^1.8.1", + "vite-plugin-handlebars": "^2.0.0", + "vite-plugin-imagemin": "^0.6.1", + "vite-plugin-sass-dts": "^1.3.31" }, "dependencies": { - "@babel/polyfill": "^7.12.1" - }, - "type": "module" + "core-js": "^3.23.3", + "jquery": "^3.7.1", + "moment": "^2.30.1", + "regenerator-runtime": "^0.13.11" + } } diff --git a/src/counter.js b/src/counter.js new file mode 100644 index 000000000..200d9aaf7 --- /dev/null +++ b/src/counter.js @@ -0,0 +1,10 @@ +// Migrate counter.js +export function setupCounter(element) { + let counter = 0 + const setCounter = (count) => { + counter = count + element.innerHTML = `count is ${counter}` + } + element.addEventListener('click', () => setCounter(counter + 1)) + setCounter(0) +} diff --git a/src/handlebars/index.handlebars b/src/handlebars/index.handlebars index 38e538647..16e2a73b8 100644 --- a/src/handlebars/index.handlebars +++ b/src/handlebars/index.handlebars @@ -55,7 +55,7 @@

AdoptOpenJDK has moved, the blue download button will take you to the new location.

-

You can stil get AdoptOpenJDK binaries by clicking one of the buttons below:

+

You can still get AdoptOpenJDK binaries by clicking one of the buttons below: