fix: merged final changes for v8.1.0 from main branch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,10 +23,10 @@ Actual results: ...
 
 **Environment**
 
-- OS: [e.g. Ubuntu 22.04.1, Windows 11 Pro, Mac OS X]
-- JDK: [e.g. Adoptium Temurin JDK 17 64 bits]
-- Gradle: [e.g. Gradle 8.2.1]
-- Frontend Gradle plugin: [e.g. 8.1.0 JDK 17]
+- OS: [e.g. Ubuntu 22.04.4, Windows 11 Pro, Mac OS X]
+- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
+- Gradle: [e.g. Gradle 8.8]
+- Frontend Gradle plugin: [e.g. 8.1.0 JDK 21]
 
 Settings in `build.gradle[.kts]` file:
 ```groovy

.github/ISSUE_TEMPLATE/feature_request.md

@@ -20,10 +20,11 @@ Hi,
 Explain what you would like the plugin do: ...
 
 **Target environment**
-
-- OS: [e.g. Ubuntu 18.04.1, Windows 10 Pro, Mac OS X]
-- JDK: [e.g. Oracle JDK 11 64 bits]
-- Gradle: [e.g. Gradle 6.3]
+
+- OS: [e.g. Ubuntu 22.04.4, Windows 11 Pro, Mac OS X]
+- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
+- Gradle: [e.g. Gradle 8.8]
+- Frontend Gradle plugin: [e.g. 8.1.0 JDK 21]
 
 Settings in `build.gradle[.kts]` file:
 ```groovy

.github/workflows/build.yml

@@ -97,4 +97,4 @@ jobs:
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- run: ./gradlew :plugin:sonar --console=plain -Dorg.gradle.jvmargs=-Xmx512m
+ run: ./gradlew :plugin:sonar --console=plain -Dorg.gradle.jvmargs=-Xmx512m -i

site/package.json

@@ -11,7 +11,7 @@
  "scripts": {
  "build": "nuxt build",
  "clean": "rimraf -fr dist",
- "deploy": "rimraf -fr ../docs && cpx \"dist/**\" ../docs",
+ "deploy": "rimraf -fr ../docs && cpx \"dist/**/{.*,*}\" ../docs",
  "dev": "nuxt dev",
  "format": "prettier . --write",
  "generate": "nuxt generate",

site/src/components/property/property.vue

@@ -70,7 +70,7 @@ const jdkHref = computed(() => {
  if (props.type) {
  const matches = QUALIFIED_JDK_CLASS_NAME_REGEXP.exec(props.type);
  if (matches && matches.groups?.fqcn) {
- return `https://docs.oracle.com/en/java/javase/17/docs/api/java.base/${matches.groups.fqcn.replace(/\./g, '/')}.html`;
+ return `https://docs.oracle.com/en/java/javase/21/docs/api/java.base/${matches.groups.fqcn.replace(/\./g, '/')}.html`;
  }
  }
  return null;

site/src/components/task/install-corepack-task.vue

@@ -31,8 +31,8 @@
  <p>
  As the task touches the <FgpNodejsLink /> install directory, please pay attention when using a shared
  <FgpNodejsLink /> distribution (<FgpPropertyLink name="nodeDistributionProvided" /> is <FgpCode
- >true</FgpCode>), because this task will impact other projects using <FgpCorepackLink />. This may be an
- expected behavior, or lead to an undesirable side-effect.
+ >true</FgpCode>), because this task will impact other projects using <FgpCorepackLink />. This may be
+ desirable or not depending on your situation.
  </p>
  <p>
  The task takes advantage of <fgp-gradle-guides-link path="/performance/#incremental_build"

site/src/components/v7/task/dependency-tree-v7.vue

@@ -0,0 +1,203 @@
+<template>
+ <svg viewBox="0 0 640 440" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <g id="gradleTask">
+ <rect width="120" height="30" fill="chartreuse" stroke="black" rx="3" ry="3" />
+ </g>
+ <g id="frontendTask">
+ <rect width="120" height="30" fill="cyan" stroke="black" rx="3" ry="3" />
+ </g>
+ <g id="frontendTaskType">
+ <rect width="100" height="30" fill="gainsboro" stroke="black" rx="3" ry="3" />
+ </g>
+
+ <g id="cleanTask">
+ <use xlink:href="#gradleTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">clean</text>
+ </g>
+ <g id="checkTask">
+ <use xlink:href="#gradleTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">check</text>
+ </g>
+ <g id="assembleTask">
+ <use xlink:href="#gradleTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">assemble</text>
+ </g>
+ <g id="publishTask">
+ <use xlink:href="#gradleTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">publish</text>
+ </g>
+ <g id="installNodeTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ installNode
+ </text>
+ </g>
+ <g id="resolvePackageManagerTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ resolvePackageManager
+ </text>
+ </g>
+ <g id="installPackageManagerTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ installPackageManager
+ </text>
+ </g>
+ <g id="installFrontendTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ installFrontend
+ </text>
+ </g>
+ <g id="cleanFrontendTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ cleanFrontend
+ </text>
+ </g>
+ <g id="checkFrontendTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ checkFrontend
+ </text>
+ </g>
+ <g id="assembleFrontendTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ assembleFrontend
+ </text>
+ </g>
+ <g id="publishFrontendTask">
+ <use xlink:href="#frontendTask" />
+ <text x="60" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ publishFrontend
+ </text>
+ </g>
+
+ <g id="RunNodeTaskType">
+ <use xlink:href="#frontendTaskType" />
+ <text x="50" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">RunNode</text>
+ </g>
+ <g id="RunCorepackTaskType">
+ <use xlink:href="#frontendTaskType" />
+ <text x="50" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">
+ RunCorepack
+ </text>
+ </g>
+ <g id="RunNpmTaskType">
+ <use xlink:href="#frontendTaskType" />
+ <text x="50" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">RunNpm</text>
+ </g>
+ <g id="RunPnpmTaskType">
+ <use xlink:href="#frontendTaskType" />
+ <text x="50" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">RunPnpm</text>
+ </g>
+ <g id="RunYarnTaskType">
+ <use xlink:href="#frontendTaskType" />
+ <text x="50" y="16" dominant-baseline="middle" text-anchor="middle" font-size="0.6rem">RunYarn</text>
+ </g>
+
+ <marker
+ id="arrow"
+ viewBox="0 0 10 10"
+ refX="5"
+ refY="5"
+ markerWidth="6"
+ markerHeight="6"
+ orient="auto-start-reverse"
+ fill="violet"
+ >
+ <path d="M 0 0 L 10 5 L 0 10 z" />
+ </marker>
+
+ <g id="gradleBasePlugin">
+ <rect x="0" y="0" width="460" height="70" fill="none" stroke="grey" />
+ <text x="20" y="18" font-size="0.5rem" fill="grey">Gradle Base plugin</text>
+ <FgpGradleDocsLink path="/current/userguide/base_plugin.html#sec:base_tasks">
+ <use x="20" y="30" xlink:href="#cleanTask" />
+ </FgpGradleDocsLink>
+ <FgpGradleDocsLink path="/current/userguide/base_plugin.html#sec:base_tasks">
+ <use x="170" y="30" xlink:href="#checkTask" />
+ </FgpGradleDocsLink>
+ <FgpGradleDocsLink path="/current/userguide/base_plugin.html#sec:base_tasks">
+ <use x="320" y="30" xlink:href="#assembleTask" />
+ </FgpGradleDocsLink>
+ </g>
+
+ <g id="gradlePublishingPlugin">
+ <rect x="480" y="0" width="160" height="70" fill="none" stroke="grey" />
+ <text text-anchor="end" x="620" y="18" font-size="0.5rem" fill="grey">Gradle Publishing plugin</text>
+ <use x="500" y="30" xlink:href="#publishTask" />
+ </g>
+
+ <g id="frontendGradlePlugin">
+ <rect x="0" y="80" width="640" height="360" fill="none" stroke="grey" />
+ <text text-anchor="end" x="620" y="238" font-size="0.5rem" fill="grey">Frontend Gradle plugin</text>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#cleanFrontend`">
+ <use x="20" y="90" xlink:href="#cleanFrontendTask" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#checkFrontend`">
+ <use x="170" y="90" xlink:href="#checkFrontendTask" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#assembleFrontend`">
+ <use x="320" y="90" xlink:href="#assembleFrontendTask" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#publishFrontend`">
+ <use x="500" y="90" xlink:href="#publishFrontendTask" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#installFrontend`">
+ <use x="170" y="150" xlink:href="#installFrontendTask" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#installPackageManager`">
+ <use x="170" y="210" xlink:href="#installPackageManagerTask" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#resolvePackageManager`">
+ <use x="170" y="270" xlink:href="#resolvePackageManagerTask" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#installNode`">
+ <use x="170" y="330" xlink:href="#installNodeTask" />
+ </FgpSiteLink>
+
+ <line x1="0" y1="370" x2="640" y2="370" stroke="gainsboro" stroke-dasharray="4 2" />
+ <text text-anchor="middle" x="320" y="388" font-size="0.5rem" fill="darkgrey">
+ Additional task types
+ </text>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#RunNode`">
+ <use x="10" y="400" xlink:href="#RunNodeTaskType" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#RunCorepack`">
+ <use x="140" y="400" xlink:href="#RunCorepackTaskType" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#RunNpm`">
+ <use x="270" y="400" xlink:href="#RunNpmTaskType" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#RunPnpm`">
+ <use x="400" y="400" xlink:href="#RunPnpmTaskType" />
+ </FgpSiteLink>
+ <FgpSiteLink :path="`${$config.public.paths.tasks}#RunYarn`">
+ <use x="530" y="400" xlink:href="#RunYarnTaskType" />
+ </FgpSiteLink>
+ </g>
+ </defs>
+
+ <use xlink:href="#gradleBasePlugin" />
+ <use xlink:href="#gradlePublishingPlugin" />
+ <use xlink:href="#frontendGradlePlugin" />
+
+ <line x1="80" y1="60" x2="80" y2="87" stroke="violet" marker-end="url(#arrow)" />
+ <line x1="230" y1="60" x2="230" y2="87" stroke="violet" marker-end="url(#arrow)" />
+ <line x1="380" y1="60" x2="380" y2="87" stroke="violet" marker-end="url(#arrow)" />
+ <line x1="560" y1="60" x2="560" y2="87" stroke="violet" marker-end="url(#arrow)" />
+
+ <path d="M 80 120 Q 80 133, 140 133 T 200 147" stroke="violet" fill="transparent" marker-end="url(#arrow)" />
+ <line x1="230" y1="120" x2="230" y2="147" stroke="violet" marker-end="url(#arrow)" />
+ <path d="M 380 120 Q 380 133, 320 133 T 260 147" stroke="violet" fill="transparent" marker-end="url(#arrow)" />
+ <line x1="500" y1="105" x2="443" y2="105" stroke="violet" marker-end="url(#arrow)" />
+
+ <line x1="230" y1="180" x2="230" y2="207" stroke="violet" marker-end="url(#arrow)" />
+ <line x1="230" y1="240" x2="230" y2="267" stroke="violet" marker-end="url(#arrow)" />
+ <line x1="230" y1="300" x2="230" y2="327" stroke="violet" marker-end="url(#arrow)" />
+ </svg>
+</template>

site/src/pages/7/node-corepack-npm-pnpm-yarn-tasks.vue

@@ -18,7 +18,7 @@
  <FgpSubTitle>Dependency tree</FgpSubTitle>
 
  <p class="text-center">
- <FgpDependencyTree class="w-100" />
+ <FgpDependencyTreeV7 class="w-100" />
  </p>
 
  <FgpSubTitle>Reference</FgpSubTitle>

site/src/pages/getting-started.vue

@@ -5,6 +5,10 @@
  <FgpSubTitle>Requirements</FgpSubTitle>
  <p>The following tools must be installed to use the plugin:</p>
  <ul>
+ <li>
+ <FgpGradlePluginsLink path="/plugin/org.siouan.frontend-jdk21">JDK 21 build</FgpGradlePluginsLink>:
+ <FgpGradleLink /> 8.5+
+ </li>
  <li>
  <FgpGradlePluginsLink path="/plugin/org.siouan.frontend-jdk17">JDK 17 build</FgpGradlePluginsLink>:
  <FgpGradleLink /> 8.5+
@@ -42,6 +46,8 @@
  <FgpGradleScripts id="install-gradle-dsl">
  <template #groovy>
  <pre><FgpCode>plugins {
+ <FgpCodeComment>// For JDK 21+</FgpCodeComment>
+ id 'org.siouan.frontend-jdk21' version '8.1.0'
  <FgpCodeComment>// For JDK 17+</FgpCodeComment>
  id 'org.siouan.frontend-jdk17' version '8.1.0'
  <FgpCodeComment>// For JDK 11+</FgpCodeComment>
@@ -50,6 +56,8 @@
  </template>
  <template #kotlin>
  <pre><FgpCode>plugins {
+ <FgpCodeComment>// For JDK 21+</FgpCodeComment>
+ id("org.siouan.frontend-jdk21") version "8.1.0"
  <FgpCodeComment>// For JDK 17+</FgpCodeComment>
  id("org.siouan.frontend-jdk17") version "8.1.0"
  <FgpCodeComment>// For JDK 11+</FgpCodeComment>
@@ -73,13 +81,17 @@
  url 'https://plugins.gradle.org/m2/'
  }
  dependencies {
+ <FgpCodeComment>// For JDK 21+</FgpCodeComment>
+ classpath 'org.siouan:frontend-gradle-plugin-jdk21:8.1.0'
  <FgpCodeComment>// For JDK 17+</FgpCodeComment>
  classpath 'org.siouan:frontend-gradle-plugin-jdk17:8.1.0'
  <FgpCodeComment>// For JDK 11+</FgpCodeComment>
  classpath 'org.siouan:frontend-gradle-plugin-jdk11:8.1.0'
  }
 }
 
+<FgpCodeComment>// For JDK 21+</FgpCodeComment>
+apply plugin: 'org.siouan.frontend-jdk21'
 <FgpCodeComment>// For JDK 17+</FgpCodeComment>
 apply plugin: 'org.siouan.frontend-jdk17'
 <FgpCodeComment>// For JDK 11+</FgpCodeComment>
@@ -91,13 +103,17 @@ apply plugin: 'org.siouan.frontend-jdk11'</FgpCode></pre>
  url = uri("https://plugins.gradle.org/m2/")
  }
  dependencies {
+ <FgpCodeComment>// For JDK 21+</FgpCodeComment>
+ classpath("org.siouan:frontend-gradle-plugin-jdk21:8.1.0")
  <FgpCodeComment>// For JDK 17+</FgpCodeComment>
  classpath("org.siouan:frontend-gradle-plugin-jdk17:8.1.0")
  <FgpCodeComment>// For JDK 11+</FgpCodeComment>
  classpath("org.siouan:frontend-gradle-plugin-jdk11:8.1.0")
  }
 }
 
+<FgpCodeComment>// For JDK 21+</FgpCodeComment>
+apply(plugin = "org.siouan.frontend-jdk21")
 <FgpCodeComment>// For JDK 17+</FgpCodeComment>
 apply(plugin = "org.siouan.frontend-jdk17")
 <FgpCodeComment>// For JDK 11+</FgpCodeComment>