Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge queue: embarking main (ba60789) and [#464 + #291] together #469

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/gradle-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ inputs:
runs:
using: 'composite'
steps:
- uses: actions/setup-node@v4
with:
node-version: 20
check-latest: true
cache: "yarn"
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
Expand All @@ -26,7 +31,7 @@ runs:
- name: Set up Gradle
uses: gradle/actions/setup-gradle@v4
with:
generate-job-summary: false
add-job-summary: on-failure
cache-disabled: ${{ inputs.gradle-cache-disabled }}
cache-read-only: ${{ inputs.gradle-cache-read-only }}
cache-write-only: ${{ inputs.gradle-cache-write-only }}
3 changes: 2 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Enable Corepack
run: corepack enable
# Setup project required versions of Gradle and Java
- name: Set up Gradle and Java
uses: ./.github/gradle-action
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ jobs:
with:
fetch-depth: 0
- run: corepack enable
- uses: actions/setup-node@v4
with:
node-version: "lts/*" # latest lts
check-latest: true
cache: "yarn"
- uses: ./.github/gradle-action
- run: ./gradlew classes
- run: yarn install
Expand Down
4 changes: 2 additions & 2 deletions assets-pipeline.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import path from "path";
import {sassPlugin} from "esbuild-sass-plugin";
import autoprefixer from "autoprefixer";
import postcss from "postcss";
import purgecss from "@fullhuman/postcss-purgecss";
import { purgeCSSPlugin } from "@fullhuman/postcss-purgecss";

const assetsFolder = "src/main/resources/public";
const assetsBuildFolder = "build/resources/main/public";
Expand Down Expand Up @@ -77,7 +77,7 @@ await esbuild.build({
async transform(source) {
const {css} = await postcss([
autoprefixer,
purgecss({
purgeCSSPlugin({
content: ["./src/**/*.kte", `${assetsFolder}/**/*.js`],
safelist: {
deep: [/footnotes$/]
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"build": "node assets-pipeline.mjs"
},
"devDependencies": {
"@fullhuman/postcss-purgecss": "6.0.0",
"@fullhuman/postcss-purgecss": "7.0.2",
"@lhci/cli": "0.14.0",
"@stylistic/eslint-plugin-js": "^2.1.0",
"autoprefixer": "10.4.20",
"esbuild": "0.24.0",
"esbuild-sass-plugin": "^3.0.0",
"eslint": "^9.0.0",
"fast-glob": "3.3.2",
"gzipper": "^7.2.0",
"gzipper": "^8.0.0",
"postcss": "8.4.49",
"purgecss": "7.0.2",
"sass-embedded": "^1.71.1",
Expand Down
Loading
Loading