From 2fd70f7f52ca7ef131b9988f8d060f87e32785b3 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Sun, 5 May 2024 15:57:28 +0300 Subject: [PATCH 01/31] Add author to GHA generated PR commits (#560) Signed-off-by: Jarno Elovirta --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9a21ecb0..53da661f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -103,6 +103,7 @@ jobs: * dita-ot/org.dita-ot.html (${{ env.WEBSITE_PLUGIN_BRANCH }}) commit-message: 'Update ‘${{ env.RELEASE }}’ docs for ${{ env.RELEASE_VERSION }}' committer: 'DITA-OT Bot ' + author: 'DITA-OT Bot ' signoff: true token: ${{ secrets.DOCS_RELEASE_TOKEN }} path: website @@ -139,6 +140,7 @@ jobs: Update docs GitHub Actions for ${{ env.RELEASE_VERSION }}. commit-message: 'Update GitHub Actions for ${{ env.RELEASE_VERSION }}' committer: 'DITA-OT Bot ' + author: 'DITA-OT Bot ' signoff: true token: ${{ secrets.DOCS_RELEASE_TOKEN }} labels: | From 17ee8a24b133ed302dc4366987101dfb5ca05918 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta Date: Sun, 5 May 2024 16:34:06 +0300 Subject: [PATCH 02/31] Update GitHub Actions for 4.2.3 (#559) Signed-off-by: DITA-OT Bot --- .github/actions/render/action.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/render/action.yml b/.github/actions/render/action.yml index 31e1de30..4405a5dd 100644 --- a/.github/actions/render/action.yml +++ b/.github/actions/render/action.yml @@ -6,7 +6,7 @@ inputs: default: 'master' DITA_OT_VERSION: description: 'DITA-OT version used for rendering' - default: '4.2.2' + default: '4.2.3' runs: using: 'composite' steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53da661f..d94fecd2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest env: WEBSITE_PLUGIN_BRANCH: 'master' - DITA_OT_VERSION: '4.2.2' + DITA_OT_VERSION: '4.2.3' steps: - name: Parse arguments run: | From 01b63ace5cc568b0b87e854b56871289c410f123 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 15:22:22 +0200 Subject: [PATCH 03/31] Bump lint-staged from 15.2.2 to 15.2.5 (#561) Bumps [lint-staged](https://github.com/okonet/lint-staged) from 15.2.2 to 15.2.5. - [Release notes](https://github.com/okonet/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](https://github.com/okonet/lint-staged/compare/v15.2.2...v15.2.5) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 198 +++++++++++++++++++++------------------------- package.json | 2 +- 2 files changed, 90 insertions(+), 110 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4c9c8a70..736c5d82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "devDependencies": { "@prettier/plugin-xml": "3.4.1", "husky": "^9.0.11", - "lint-staged": "15.2.2", + "lint-staged": "15.2.5", "prettier": "3.2.5", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", @@ -284,24 +284,9 @@ } }, "node_modules/ansi-escapes": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", - "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", - "dev": true, - "dependencies": { - "type-fest": "^3.0.0" - }, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", - "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", + "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", "dev": true, "engines": { "node": ">=14.16" @@ -390,12 +375,12 @@ "dev": true }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -573,12 +558,12 @@ "dev": true }, "node_modules/commander": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", - "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", "dev": true, "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/concat-map": { @@ -840,9 +825,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -1316,12 +1301,15 @@ "dev": true }, "node_modules/lilconfig": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", - "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz", + "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==", "dev": true, "engines": { "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antonk52" } }, "node_modules/lines-and-columns": { @@ -1331,21 +1319,21 @@ "dev": true }, "node_modules/lint-staged": { - "version": "15.2.2", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.2.tgz", - "integrity": "sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==", + "version": "15.2.5", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.5.tgz", + "integrity": "sha512-j+DfX7W9YUvdzEZl3Rk47FhDF6xwDBV5wwsCPw6BwWZVPYJemusQmvb9bRsW23Sqsaa+vRloAWogbK4BUuU2zA==", "dev": true, "dependencies": { - "chalk": "5.3.0", - "commander": "11.1.0", - "debug": "4.3.4", - "execa": "8.0.1", - "lilconfig": "3.0.0", - "listr2": "8.0.1", - "micromatch": "4.0.5", - "pidtree": "0.6.0", - "string-argv": "0.3.2", - "yaml": "2.3.4" + "chalk": "~5.3.0", + "commander": "~12.1.0", + "debug": "~4.3.4", + "execa": "~8.0.1", + "lilconfig": "~3.1.1", + "listr2": "~8.2.1", + "micromatch": "~4.0.7", + "pidtree": "~0.6.0", + "string-argv": "~0.3.2", + "yaml": "~2.4.2" }, "bin": { "lint-staged": "bin/lint-staged.js" @@ -1358,16 +1346,16 @@ } }, "node_modules/listr2": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.1.tgz", - "integrity": "sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==", + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.1.tgz", + "integrity": "sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g==", "dev": true, "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", "log-update": "^6.0.0", - "rfdc": "^1.3.0", + "rfdc": "^1.3.1", "wrap-ansi": "^9.0.0" }, "engines": { @@ -1566,12 +1554,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "dev": true, "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -2753,10 +2741,13 @@ "dev": true }, "node_modules/yaml": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", - "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", + "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", "dev": true, + "bin": { + "yaml": "bin.mjs" + }, "engines": { "node": ">= 14" } @@ -2958,21 +2949,10 @@ } }, "ansi-escapes": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", - "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", - "dev": true, - "requires": { - "type-fest": "^3.0.0" - }, - "dependencies": { - "type-fest": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", - "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", - "dev": true - } - } + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", + "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", + "dev": true }, "ansi-regex": { "version": "5.0.1", @@ -3038,12 +3018,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "callsites": { @@ -3166,9 +3146,9 @@ "dev": true }, "commander": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", - "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", "dev": true }, "concat-map": { @@ -3364,9 +3344,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" @@ -3716,9 +3696,9 @@ "dev": true }, "lilconfig": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", - "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz", + "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==", "dev": true }, "lines-and-columns": { @@ -3728,34 +3708,34 @@ "dev": true }, "lint-staged": { - "version": "15.2.2", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.2.tgz", - "integrity": "sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==", + "version": "15.2.5", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.5.tgz", + "integrity": "sha512-j+DfX7W9YUvdzEZl3Rk47FhDF6xwDBV5wwsCPw6BwWZVPYJemusQmvb9bRsW23Sqsaa+vRloAWogbK4BUuU2zA==", "dev": true, "requires": { - "chalk": "5.3.0", - "commander": "11.1.0", - "debug": "4.3.4", - "execa": "8.0.1", - "lilconfig": "3.0.0", - "listr2": "8.0.1", - "micromatch": "4.0.5", - "pidtree": "0.6.0", - "string-argv": "0.3.2", - "yaml": "2.3.4" + "chalk": "~5.3.0", + "commander": "~12.1.0", + "debug": "~4.3.4", + "execa": "~8.0.1", + "lilconfig": "~3.1.1", + "listr2": "~8.2.1", + "micromatch": "~4.0.7", + "pidtree": "~0.6.0", + "string-argv": "~0.3.2", + "yaml": "~2.4.2" } }, "listr2": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.1.tgz", - "integrity": "sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==", + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.1.tgz", + "integrity": "sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g==", "dev": true, "requires": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", "log-update": "^6.0.0", - "rfdc": "^1.3.0", + "rfdc": "^1.3.1", "wrap-ansi": "^9.0.0" } }, @@ -3889,12 +3869,12 @@ "dev": true }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", "dev": true, "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, @@ -4686,9 +4666,9 @@ "dev": true }, "yaml": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", - "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", + "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", "dev": true }, "yargs-parser": { diff --git a/package.json b/package.json index 60dae2da..c30e2f41 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@prettier/plugin-xml": "3.4.1", "husky": "^9.0.11", - "lint-staged": "15.2.2", + "lint-staged": "15.2.5", "prettier": "3.2.5", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", From e8d6a727be9048db3e2c97778c9ed76247a6f000 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 23 Jun 2024 19:53:03 +0200 Subject: [PATCH 04/31] Clarify that logs are empty if no errors occur Signed-off-by: Roger Sheen --- parameters/dita-command-arguments.dita | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/parameters/dita-command-arguments.dita b/parameters/dita-command-arguments.dita index 36df7941..7eb2f1ac 100644 --- a/parameters/dita-command-arguments.dita +++ b/parameters/dita-command-arguments.dita @@ -327,14 +327,18 @@ Print a list of available arguments, options, and subcommands. - + --logfile=file -l file - Write logging messages to a file. + Write logging messages to a file. + If processing is successful, nothing is written to the log, so the file will be empty if there are no + errors or warnings. To include informational messages in the log, add the + --verbose option (or -v). + From 936a115caaaa9120de31dc08fbc88a3bc8b146fd Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 23 Jun 2024 22:40:15 +0200 Subject: [PATCH 05/31] Remove double-hyphen syntax from subcommand list Deprecated since 3.5 Signed-off-by: Roger Sheen --- parameters/dita-command-arguments.dita | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/parameters/dita-command-arguments.dita b/parameters/dita-command-arguments.dita index 7eb2f1ac..725d1ff4 100644 --- a/parameters/dita-command-arguments.dita +++ b/parameters/dita-command-arguments.dita @@ -107,9 +107,6 @@ - Prior to DITA-OT 3.5, subcommands were specified with the double-hyphen option syntax, - which is still supported for backwards compatibility. (For example, dita - --install will still work.)
@@ -194,8 +191,6 @@ install { ID | URL | file } - - --install={ ID | URL | file } Install a single plug-in ID from the registry at (or a local registry), from a remote URL, or a local ZIP file. @@ -215,9 +210,6 @@ install - - --install - @@ -225,9 +217,6 @@ uninstall ID - - --uninstall=ID - Remove the plug-in with the specified ID. For a list of the currently installed plug-in IDs, use dita plugins. @@ -238,18 +227,12 @@ plugins - - --plugins - Show a list of the currently installed plug-ins. transtypes - - --transtypes - Show a list of the available output formats (transformation types). The entries in this list may be passed as values to the --format argument. @@ -257,9 +240,6 @@ version - - --version - Print version information and exit. From 941677709e1f4fc4c515d116108c04a14001446e Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 23 Jun 2024 23:10:41 +0200 Subject: [PATCH 06/31] Fix duplicate key definitions Signed-off-by: Roger Sheen --- resources/external-links.ditamap | 9 +++++++-- topics/markdown-input.dita | 4 +++- topics/project-files-yaml.dita | 4 +++- topics/sample-pdf-theme.dita | 2 +- topics/using-project-files.dita | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/resources/external-links.ditamap b/resources/external-links.ditamap index 1134928f..35c1eef2 100644 --- a/resources/external-links.ditamap +++ b/resources/external-links.ditamap @@ -742,7 +742,12 @@ RFC 5147 - + YAML @@ -980,7 +985,7 @@ Markdown input - is a lightweight markup language that allows you to write using an easy-to-read plain text + is a lightweight markup language that allows you to write using an easy-to-read plain text format and convert to structurally valid markup as necessary. diff --git a/topics/project-files-yaml.dita b/topics/project-files-yaml.dita index 1cfe6bc5..7be40d01 100644 --- a/topics/project-files-yaml.dita +++ b/topics/project-files-yaml.dita @@ -7,7 +7,9 @@ YAML project files DITA-OT includes sample project files in - format that can be used to define a publication project. Like the XML project samples, the + format that can be used to define a publication project. Like the XML project samples, the sample YAML files illustrate how deliverables can be described for use in publication projects. The YAML samples are functionally equivalent to their XML and JSON counterparts, with minor adaptations to YAML file syntax. diff --git a/topics/sample-pdf-theme.dita b/topics/sample-pdf-theme.dita index 277756ca..e32c4fa4 100644 --- a/topics/sample-pdf-theme.dita +++ b/topics/sample-pdf-theme.dita @@ -5,7 +5,7 @@ Sample theme file Theme files can be written in either or - format. The docsrc/samples/themes folder in the DITA-OT installation + format. The docsrc/samples/themes folder in the DITA-OT installation directory provides several examples. The examples provided here are all in YAML format, which is generally more compact and readable than diff --git a/topics/using-project-files.dita b/topics/using-project-files.dita index 96c68eb9..3108be07 100644 --- a/topics/using-project-files.dita +++ b/topics/using-project-files.dita @@ -25,7 +25,7 @@ About project files

Project files may be defined in one of three formats: XML, , or - . The XML format can be validated with a RELAX NG schema provided in the + . The XML format can be validated with a RELAX NG schema provided in the resources folder of the DITA-OT installation (project.rnc).

The XML project file format is the normative version provided for interoperability with existing XML-based toolchains. The JSON and YAML versions are alternative compact formats that are easier to read and write, but From 4f35bcf106b6365cafd1d2027ef19704febbc1c6 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 23 Jun 2024 23:23:07 +0200 Subject: [PATCH 07/31] Remove unresolved keyref to 2024 DITA-OT Day talk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Combined with “How far can you go” talk in a single video Signed-off-by: Roger Sheen --- topics/dita-ot-day-2024.ditamap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topics/dita-ot-day-2024.ditamap b/topics/dita-ot-day-2024.ditamap index 4df73b61..d3420247 100644 --- a/topics/dita-ot-day-2024.ditamap +++ b/topics/dita-ot-day-2024.ditamap @@ -15,7 +15,7 @@ - + From b732b56d61a50f724c35931151aa87ee21a1431a Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Thu, 11 Jul 2024 00:30:00 +0200 Subject: [PATCH 08/31] Remove more double-hyphen subcommand syntax refs Deprecated since 3.5 Amends 936a115. Signed-off-by: Roger Sheen --- resources/conref-task.dita | 6 ------ topics/plugins-installing.dita | 3 --- topics/plugins-removing.dita | 3 --- 3 files changed, 12 deletions(-) diff --git a/resources/conref-task.dita b/resources/conref-task.dita index 108cdb30..d24a0e27 100644 --- a/resources/conref-task.dita +++ b/resources/conref-task.dita @@ -53,12 +53,6 @@
  • The uninstall subcommand also removes the corresponding plug-in directory from the plugins folder. uninstalling
    • -
  • - In earlier versions of DITA-OT (2.4–3.4), use the double-hyphen option - syntax dita - --uninstall. In DITA-OT 2.0–2.3, use the - single-hyphen form: dita -
    • diff --git a/topics/plugins-installing.dita b/topics/plugins-installing.dita index 30f43e8b..e2fbe8dd 100644 --- a/topics/plugins-installing.dita +++ b/topics/plugins-installing.dita @@ -28,9 +28,6 @@
    - - --install. - -install. diff --git a/topics/plugins-removing.dita b/topics/plugins-removing.dita index 68835970..d6d23424 100644 --- a/topics/plugins-removing.dita +++ b/topics/plugins-removing.dita @@ -25,9 +25,6 @@
    - - --uninstall. - -uninstall. From 5c7f5c3f4c09c7c9d06b1092fdb84c90d6e83bac Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 23 Aug 2024 17:00:07 +0200 Subject: [PATCH 09/31] Fix typo in `` Fixes #570. Signed-off-by: Roger Sheen --- topics/plugin-rewrite-rules.dita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topics/plugin-rewrite-rules.dita b/topics/plugin-rewrite-rules.dita index 6bcaf88c..69e1e6a1 100644 --- a/topics/plugin-rewrite-rules.dita +++ b/topics/plugin-rewrite-rules.dita @@ -43,7 +43,7 @@ outputclass="language-xml normalize-space show-line-numbers show-whitespace" ><xsl:template match="node() | @*"> <xsl:copy> - <xsl:apply-template select="node() | @*"/> + <xsl:apply-templates select="node() | @*"/> </xsl:copy> </xsl:template> From 97b8cc32bb2ddea4f1d3a939478bd364ab120204 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:20:25 +0200 Subject: [PATCH 10/31] Bump prettier from 3.2.5 to 3.3.3 (#569) Bumps [prettier](https://github.com/prettier/prettier) from 3.2.5 to 3.3.3. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.2.5...3.3.3) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 736c5d82..96d28b50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "@prettier/plugin-xml": "3.4.1", "husky": "^9.0.11", "lint-staged": "15.2.5", - "prettier": "3.2.5", + "prettier": "3.3.3", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-sass-guidelines": "^10.0.0" @@ -1920,9 +1920,9 @@ "dev": true }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -4103,9 +4103,9 @@ "dev": true }, "prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true }, "punycode": { diff --git a/package.json b/package.json index c30e2f41..dee0d979 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@prettier/plugin-xml": "3.4.1", "husky": "^9.0.11", "lint-staged": "15.2.5", - "prettier": "3.2.5", + "prettier": "3.3.3", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-sass-guidelines": "^10.0.0" From e198a597a0881f0621c7876282085953515485c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:25:16 +0200 Subject: [PATCH 11/31] Bump husky from 9.0.11 to 9.1.6 (#573) Bumps [husky](https://github.com/typicode/husky) from 9.0.11 to 9.1.6. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.0.11...v9.1.6) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 96d28b50..fdddf9b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "license": "Apache-2.0", "devDependencies": { "@prettier/plugin-xml": "3.4.1", - "husky": "^9.0.11", + "husky": "^9.1.6", "lint-staged": "15.2.5", "prettier": "3.3.3", "stylelint": "^15.11.0", @@ -1068,12 +1068,12 @@ } }, "node_modules/husky": { - "version": "9.0.11", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", - "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", + "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", "dev": true, "bin": { - "husky": "bin.mjs" + "husky": "bin.js" }, "engines": { "node": ">=18" @@ -3520,9 +3520,9 @@ "dev": true }, "husky": { - "version": "9.0.11", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", - "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", + "version": "9.1.6", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", + "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", "dev": true }, "ignore": { diff --git a/package.json b/package.json index dee0d979..3e5cfe64 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@prettier/plugin-xml": "3.4.1", - "husky": "^9.0.11", + "husky": "^9.1.6", "lint-staged": "15.2.5", "prettier": "3.3.3", "stylelint": "^15.11.0", From e1edd9c9c93dd52f19131a0de1d23fd642e63c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 00:27:35 +0200 Subject: [PATCH 12/31] Bump lint-staged from 15.2.5 to 15.2.10 (#574) Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 15.2.5 to 15.2.10. - [Release notes](https://github.com/lint-staged/lint-staged/releases) - [Changelog](https://github.com/lint-staged/lint-staged/blob/master/CHANGELOG.md) - [Commits](https://github.com/lint-staged/lint-staged/compare/v15.2.5...v15.2.10) --- updated-dependencies: - dependency-name: lint-staged dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 381 ++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 199 insertions(+), 184 deletions(-) diff --git a/package-lock.json b/package-lock.json index fdddf9b3..2746dc7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "devDependencies": { "@prettier/plugin-xml": "3.4.1", "husky": "^9.1.6", - "lint-staged": "15.2.5", + "lint-staged": "15.2.10", "prettier": "3.3.3", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", @@ -284,12 +284,15 @@ } }, "node_modules/ansi-escapes": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", - "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", + "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", "dev": true, + "dependencies": { + "environment": "^1.0.0" + }, "engines": { - "node": ">=14.16" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -447,15 +450,15 @@ } }, "node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", "dev": true, "dependencies": { - "restore-cursor": "^4.0.0" + "restore-cursor": "^5.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -478,9 +481,9 @@ } }, "node_modules/cli-truncate/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, "engines": { "node": ">=12" @@ -490,15 +493,15 @@ } }, "node_modules/cli-truncate/node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "dev": true }, "node_modules/cli-truncate/node_modules/string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "dev": true, "dependencies": { "emoji-regex": "^10.3.0", @@ -639,12 +642,12 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -725,6 +728,18 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "node_modules/environment": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", + "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -1301,9 +1316,9 @@ "dev": true }, "node_modules/lilconfig": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz", - "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", + "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", "dev": true, "engines": { "node": ">=14" @@ -1319,21 +1334,21 @@ "dev": true }, "node_modules/lint-staged": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.5.tgz", - "integrity": "sha512-j+DfX7W9YUvdzEZl3Rk47FhDF6xwDBV5wwsCPw6BwWZVPYJemusQmvb9bRsW23Sqsaa+vRloAWogbK4BUuU2zA==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz", + "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==", "dev": true, "dependencies": { "chalk": "~5.3.0", "commander": "~12.1.0", - "debug": "~4.3.4", + "debug": "~4.3.6", "execa": "~8.0.1", - "lilconfig": "~3.1.1", - "listr2": "~8.2.1", - "micromatch": "~4.0.7", + "lilconfig": "~3.1.2", + "listr2": "~8.2.4", + "micromatch": "~4.0.8", "pidtree": "~0.6.0", "string-argv": "~0.3.2", - "yaml": "~2.4.2" + "yaml": "~2.5.0" }, "bin": { "lint-staged": "bin/lint-staged.js" @@ -1346,16 +1361,16 @@ } }, "node_modules/listr2": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.1.tgz", - "integrity": "sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g==", + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz", + "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==", "dev": true, "dependencies": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", - "log-update": "^6.0.0", - "rfdc": "^1.3.1", + "log-update": "^6.1.0", + "rfdc": "^1.4.1", "wrap-ansi": "^9.0.0" }, "engines": { @@ -1384,14 +1399,14 @@ "dev": true }, "node_modules/log-update": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", - "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", + "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", "dev": true, "dependencies": { - "ansi-escapes": "^6.2.0", - "cli-cursor": "^4.0.0", - "slice-ansi": "^7.0.0", + "ansi-escapes": "^7.0.0", + "cli-cursor": "^5.0.0", + "slice-ansi": "^7.1.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" }, @@ -1403,9 +1418,9 @@ } }, "node_modules/log-update/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, "engines": { "node": ">=12" @@ -1554,9 +1569,9 @@ } }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { "braces": "^3.0.3", @@ -1578,6 +1593,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -1614,9 +1641,9 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "node_modules/nanoid": { @@ -2063,51 +2090,36 @@ } }, "node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "dev": true, "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/restore-cursor/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/restore-cursor/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", "dev": true, "dependencies": { - "mimic-fn": "^2.1.0" + "mimic-function": "^5.0.0" }, "engines": { - "node": ">=6" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/restore-cursor/node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -2119,9 +2131,9 @@ } }, "node_modules/rfdc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", - "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", "dev": true }, "node_modules/rimraf": { @@ -2654,9 +2666,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, "engines": { "node": ">=12" @@ -2678,15 +2690,15 @@ } }, "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "dev": true }, "node_modules/wrap-ansi/node_modules/string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "dev": true, "dependencies": { "emoji-regex": "^10.3.0", @@ -2741,9 +2753,9 @@ "dev": true }, "node_modules/yaml": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", - "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", + "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", "dev": true, "bin": { "yaml": "bin.mjs" @@ -2949,10 +2961,13 @@ } }, "ansi-escapes": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz", - "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==", - "dev": true + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", + "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", + "dev": true, + "requires": { + "environment": "^1.0.0" + } }, "ansi-regex": { "version": "5.0.1", @@ -3066,12 +3081,12 @@ } }, "cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", "dev": true, "requires": { - "restore-cursor": "^4.0.0" + "restore-cursor": "^5.0.0" } }, "cli-truncate": { @@ -3085,21 +3100,21 @@ }, "dependencies": { "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true }, "emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "dev": true }, "string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "dev": true, "requires": { "emoji-regex": "^10.3.0", @@ -3203,12 +3218,12 @@ "dev": true }, "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.3" } }, "decamelize": { @@ -3262,6 +3277,12 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "environment": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", + "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", + "dev": true + }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -3696,9 +3717,9 @@ "dev": true }, "lilconfig": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.1.tgz", - "integrity": "sha512-O18pf7nyvHTckunPWCV1XUNXU1piu01y2b7ATJ0ppkUkk8ocqVWBrYjJBCwHDjD/ZWcfyrA0P4gKhzWGi5EINQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz", + "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==", "dev": true }, "lines-and-columns": { @@ -3708,34 +3729,34 @@ "dev": true }, "lint-staged": { - "version": "15.2.5", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.5.tgz", - "integrity": "sha512-j+DfX7W9YUvdzEZl3Rk47FhDF6xwDBV5wwsCPw6BwWZVPYJemusQmvb9bRsW23Sqsaa+vRloAWogbK4BUuU2zA==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz", + "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==", "dev": true, "requires": { "chalk": "~5.3.0", "commander": "~12.1.0", - "debug": "~4.3.4", + "debug": "~4.3.6", "execa": "~8.0.1", - "lilconfig": "~3.1.1", - "listr2": "~8.2.1", - "micromatch": "~4.0.7", + "lilconfig": "~3.1.2", + "listr2": "~8.2.4", + "micromatch": "~4.0.8", "pidtree": "~0.6.0", "string-argv": "~0.3.2", - "yaml": "~2.4.2" + "yaml": "~2.5.0" } }, "listr2": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.1.tgz", - "integrity": "sha512-irTfvpib/rNiD637xeevjO2l3Z5loZmuaRi0L0YE5LfijwVY96oyVn0DFD3o/teAok7nfobMG1THvvcHh/BP6g==", + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz", + "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==", "dev": true, "requires": { "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", - "log-update": "^6.0.0", - "rfdc": "^1.3.1", + "log-update": "^6.1.0", + "rfdc": "^1.4.1", "wrap-ansi": "^9.0.0" } }, @@ -3755,22 +3776,22 @@ "dev": true }, "log-update": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", - "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", + "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", "dev": true, "requires": { - "ansi-escapes": "^6.2.0", - "cli-cursor": "^4.0.0", - "slice-ansi": "^7.0.0", + "ansi-escapes": "^7.0.0", + "cli-cursor": "^5.0.0", + "slice-ansi": "^7.1.0", "strip-ansi": "^7.1.0", "wrap-ansi": "^9.0.0" }, "dependencies": { "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true }, "ansi-styles": { @@ -3869,9 +3890,9 @@ "dev": true }, "micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { "braces": "^3.0.3", @@ -3884,6 +3905,12 @@ "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true }, + "mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true + }, "min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -3911,9 +3938,9 @@ } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "nanoid": { @@ -4186,35 +4213,23 @@ "dev": true }, "restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "dev": true, "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" }, "dependencies": { - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", "dev": true, "requires": { - "mimic-fn": "^2.1.0" + "mimic-function": "^5.0.0" } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true } } }, @@ -4225,9 +4240,9 @@ "dev": true }, "rfdc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", - "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", "dev": true }, "rimraf": { @@ -4604,9 +4619,9 @@ }, "dependencies": { "ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true }, "ansi-styles": { @@ -4616,15 +4631,15 @@ "dev": true }, "emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "dev": true }, "string-width": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", - "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "dev": true, "requires": { "emoji-regex": "^10.3.0", @@ -4666,9 +4681,9 @@ "dev": true }, "yaml": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", - "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", + "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", "dev": true }, "yargs-parser": { diff --git a/package.json b/package.json index 3e5cfe64..cd4ab6dc 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "devDependencies": { "@prettier/plugin-xml": "3.4.1", "husky": "^9.1.6", - "lint-staged": "15.2.5", + "lint-staged": "15.2.10", "prettier": "3.3.3", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", From bd118bfab56394600b3fbeff37718846e3440bb8 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 6 Oct 2024 22:00:30 +0200 Subject: [PATCH 13/31] Add details on custom colors to sample theme file Signed-off-by: Roger Sheen --- topics/sample-pdf-theme.dita | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/topics/sample-pdf-theme.dita b/topics/sample-pdf-theme.dita index e32c4fa4..4d2b0576 100644 --- a/topics/sample-pdf-theme.dita +++ b/topics/sample-pdf-theme.dita @@ -34,6 +34,10 @@ href="../samples/themes/dita-ot-docs-theme.yaml#token=add-brand-colors,end-brand-colors" />

    +

    The primary and secondary brand colors defined above are used in the examples below under + and + . The theme sample also defines custom brand colors for links, note backgrounds, and + XML domain markup.

    Defining custom font stacks From 0c611f77764497a46f19f786ff715c01ec81c9a9 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 25 Oct 2024 22:42:43 +0200 Subject: [PATCH 14/31] Use proper typographic apostrophe Signed-off-by: Roger Sheen --- release-notes/index.dita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-notes/index.dita b/release-notes/index.dita index 562389f1..94b74dd6 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -325,7 +325,7 @@ recommends upgrading all stylesheets to XSLT 3.0. #4338 -
  • The CLI no longer uses colors when it's connected to a pipe or output is redirected to a file. +
  • The CLI no longer uses colors when it’s connected to a pipe or output is redirected to a file. #4393
  • From 5e1f3db463f036e1573498882cfe6cf3c8bdbc23 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 26 Oct 2024 00:05:32 +0200 Subject: [PATCH 15/31] Mark DITA-OT Users as archive & reorder Resources See https://github.com/dita-ot/website/pull/850 Signed-off-by: Roger Sheen --- resources/common-toc.ditamap | 3 ++- topics/dita-ot-day-videos.dita | 2 +- topics/dita-resources.ditamap | 38 ++++++++++++++------------------- topics/web-based-resources.dita | 33 +++++++++++++++------------- 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/resources/common-toc.ditamap b/resources/common-toc.ditamap index dd72ea09..0309a3f0 100644 --- a/resources/common-toc.ditamap +++ b/resources/common-toc.ditamap @@ -42,8 +42,9 @@ - + + diff --git a/topics/dita-ot-day-videos.dita b/topics/dita-ot-day-videos.dita index 6286bf1c..c0339bc3 100644 --- a/topics/dita-ot-day-videos.dita +++ b/topics/dita-ot-day-videos.dita @@ -6,7 +6,7 @@ DITA-OT Day Videos - All video recordings from each DITA-OT Day conference from 2014 onward. + Video recordings from each DITA-OT Day conference from 2014 onward.

    diff --git a/topics/dita-resources.ditamap b/topics/dita-resources.ditamap index 9ff12466..760ced50 100644 --- a/topics/dita-resources.ditamap +++ b/topics/dita-resources.ditamap @@ -4,11 +4,12 @@ DITA and DITA-OT resources - + - DITA-OT project website: dita-ot.org - The DITA-OT project website at dita-ot.org provides information about the latest toolkit releases, - including download links, release notes, and documentation for recent DITA-OT versions. + DITA Users group + The original dita-users group was founded in 2004 as a Yahoo! Group and moved to Groups.io in November + 2019. The mailing list addresses the needs of DITA users at all levels of experience, from beginners to experts, + and serves as a vital resource for the DITA community. @@ -19,25 +20,13 @@ as answered. - - - DITA Users group - The original dita-users group was founded in 2004 as a Yahoo! Group and moved to Groups.io in November - 2019. The mailing list addresses the needs of DITA users at all levels of experience, from beginners to experts, - and serves as a vital resource for the DITA community. - - - DITA-OT Users group - General interest DITA-OT mailing list, for questions on any aspect of the toolkit — from installation - and getting started to specific overrides, plug-ins, and customizations. - - - - - Home page for the DITA Technical Committee - The OASIS DITA Technical Committee develops the DITA standard. + DITA-OT Users group archive + From 2013 to 2024, the DITA-OT Users group served as a general interest DITA-OT mailing list, for + questions ranging from installation and getting started to specific overrides, plug-ins, and + customizations. (Archived in favor of the DITA-OT Discussions forum.) + @@ -47,5 +36,10 @@ release notes for legacy versions. - + + + DITA Technical Committee + The OASIS DITA Technical Committee develops the DITA standard. + + diff --git a/topics/web-based-resources.dita b/topics/web-based-resources.dita index 704d80b8..0b8ad219 100644 --- a/topics/web-based-resources.dita +++ b/topics/web-based-resources.dita @@ -10,10 +10,9 @@

    - DITA-OT project website: - dita-ot.org
    -
    The DITA-OT project website at dita-ot.org provides information about the latest toolkit releases, - including download links, release notes, and documentation for recent DITA-OT versions. + dita-ot.org +
    The DITA-OT project website provides information about the latest toolkit releases, including download + links, release notes, and documentation for recent DITA-OT versions. dita-ot.org project website dita-ot.org
    @@ -44,22 +43,15 @@
    DITA-OT Users - group + group archive
    -
    General interest DITA-OT mailing list, for questions on any aspect of the toolkit — from installation and - getting started to specific overrides, plug-ins, and customizations. +
    From 2013 to 2024, the DITA-OT Users group served as a general interest DITA-OT mailing list, for + questions ranging from installation and getting started to specific overrides, plug-ins, and + customizations. (Archived in favor of the DITA-OT Discussions forum.) DITA-OT Users group Google Group DITA-OT Users group
     - -
    - Home page for the - DITA Technical Committee
    -
    The OASIS DITA Technical Committee develops the DITA standard. - OASIS - DITA Technical Committee
    -
    DITA-OT @@ -67,6 +59,17 @@
    The DITA-OT project archive at dita-archive.xml.org provides news about earlier toolkit releases, and release notes for legacy versions.
     + +
    + DITA Technical Committee
    +
    The OASIS DITA Technical Committee develops the DITA standard. + OASIS + DITA Technical Committee
    +
    • From f0c749cd33bae0d227b17f611579bf206722d192 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Nov 2024 23:04:25 +0100 Subject: [PATCH 16/31] Bump peter-evans/create-pull-request from 6 to 7 (#575) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v6...v7) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d94fecd2..6cbc5665 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -90,7 +90,7 @@ jobs: DITA_HOME: ${{ github.workspace }}/dita-ot-${{ env.DITA_OT_VERSION }} RELEASE_DITA_OT: ${{ github.workspace }}/src-dita-ot/dita-ot-${{ env.RELEASE_VERSION }} - name: Create release PR - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: branch: release/${{ env.RELEASE_VERSION }} title: 'Update site for ${{ env.RELEASE_VERSION }}' @@ -132,7 +132,7 @@ jobs: with: cmd: yq -i '.inputs.DITA_OT_VERSION.default = "${{ env.RELEASE_VERSION }}"' '.github/actions/render/action.yml' - name: Create release PR - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: branch: feature/update-github-actions-${{ env.RELEASE_VERSION }} title: 'Update docs GitHub Actions for ${{ env.RELEASE_VERSION }}' From 90b532d0c7e94ae8b8ca94b953276b5cc7038c11 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 16 Nov 2024 22:31:55 +0100 Subject: [PATCH 17/31] =?UTF-8?q?Bump=20'maintenance-version'=20key=20to?= =?UTF-8?q?=20=E2=80=9C4.2.4=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- resources/key-definitions.ditamap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/key-definitions.ditamap b/resources/key-definitions.ditamap index aaa7736e..baa298d2 100644 --- a/resources/key-definitions.ditamap +++ b/resources/key-definitions.ditamap @@ -26,7 +26,7 @@ - 4.2.3 + 4.2.4 From c688b098071fc995f31910990b38c1824d69b987 Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 16 Nov 2024 22:32:25 +0100 Subject: [PATCH 18/31] =?UTF-8?q?Bump=20Docker=20image=20version=20to=20?= =?UTF-8?q?=E2=80=9D4.2.4=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roger Sheen --- samples/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/docker/Dockerfile b/samples/docker/Dockerfile index ae54da57..307af80f 100644 --- a/samples/docker/Dockerfile +++ b/samples/docker/Dockerfile @@ -1,5 +1,5 @@ # Use the latest DITA-OT image ↓ as parent: -FROM ghcr.io/dita-ot/dita-ot:4.2.3 +FROM ghcr.io/dita-ot/dita-ot:4.2.4 # Install a custom plug-in from a remote location: RUN dita --install https://github.com/infotexture/dita-bootstrap/archive/master.zip From 6612790b195cfb0ace9ae1b581207fb1b285ce4d Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 16 Nov 2024 23:40:48 +0100 Subject: [PATCH 19/31] Draft 4.2.4 Release Notes stub Signed-off-by: Roger Sheen --- release-notes/index.dita | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/release-notes/index.dita b/release-notes/index.dita index 94b74dd6..a23b056b 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -26,14 +26,45 @@ - + DITA-OT <keyword keyref="maintenance-version"/> - <ph outputclass="small text-muted">released May 5, 2024</ph> + <!--<ph outputclass="small text-muted">released mmmm D, yyyy</ph>-->

    DITA Open Toolkit is a maintenance release that includes the following bug fixes.

    + +
      +
    • The bundled Apache Commons IO library has + been upgraded to version 2.14.0, which includes security updates to mitigate the vulnerability described in + CVE-2024-47554, a possible denial of service attack on untrusted input to + XmlStreamReader. + #4526 +
      • +
    • In previous releases, the HTML5 transformation did not provide a mechanism for creating HTML5 + metadata from data, data-about, and + resourceid elements. In this release, no metadata is created for these elements + by default, but placeholders have been added to the getMeta processing mode to allow custom + plug-ins to override the placeholders and generate metadata for these elements as needed. + #4532, + #4533 +
      • +
    +
    +     +     + + + DITA-OT 4.2.3 <ph outputclass="small text-muted">released May 5, 2024</ph> + + +
    +

    DITA Open Toolkit 4.2.3 is a maintenance release that includes the following bug fixes.

    • DITA-OT 4.2.2 included a regression bug that caused the map-first pre-processing routine to fail @@ -46,7 +77,7 @@
    - + DITA-OT 4.2.2 <ph outputclass="small text-muted">released March 24, 2024</ph> From 1dc5e020a64b6d317ac41647013f1de79a8153df Mon Sep 17 00:00:00 2001 From: Jarno Elovirta <jarno@elovirta.com> Date: Tue, 19 Nov 2024 19:13:32 +0200 Subject: [PATCH 20/31] Add stub for #4543 in the release notes Signed-off-by: Jarno Elovirta <jarno@elovirta.com> --- release-notes/index.dita | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/release-notes/index.dita b/release-notes/index.dita index a23b056b..de8ad063 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -54,6 +54,15 @@ <xref href="https://github.com/dita-ot/dita-ot/issues/4532" format="html" scope="external">#4532</xref>, <xref href="https://github.com/dita-ot/dita-ot/issues/4533" format="html" scope="external">#4533</xref> </li> + <li id="4543"> + <draft-comment author="jelovirt">DITA-OT had a bug that made it incorrectly process keyreffing elements + that has only whitespace, when per DITA spec it should have skipped those elements. This bug has been + fixed, but the fix has not been enabled. The existing broken behaviour is retained in order to not + break exising user content that rely on this buggy behaviour. The new + <codeph>compatibility.keyref.treat-blank-as-empty</codeph> property is can be used to switch off the + incorrect behaviour. The fix will be enabled by default in the next minor or major version.</draft-comment> + <xref href="https://github.com/dita-ot/dita-ot/issues/4543" format="html" scope="external">#4543</xref> + </li> </ul> </section> </refbody> From ca5cec972875e8a96a0164cfd4882a3eac1d4947 Mon Sep 17 00:00:00 2001 From: Jarno Elovirta <jarno@elovirta.com> Date: Tue, 19 Nov 2024 19:19:27 +0200 Subject: [PATCH 21/31] Add stub for treat-blank-as-empty config Signed-off-by: Jarno Elovirta <jarno@elovirta.com> --- parameters/configuration-properties-file.dita | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/parameters/configuration-properties-file.dita b/parameters/configuration-properties-file.dita index d7a03bb7..cdd6ef9c 100644 --- a/parameters/configuration-properties-file.dita +++ b/parameters/configuration-properties-file.dita @@ -73,6 +73,14 @@ configuration in the <codeph>dost-configuration.jar</codeph> file when the plug-in integration process runs. The following properties are typically set in this file:</p> <parml> + <plentry id="compatibility-keyref-treat-blank-as-empty"> + <pt><parmname>compatibility.keyref.treat-blank-as-empty</parmname></pt> + <pd> + <p>Enables compatibility mode that incorrectly processes key references that have only whitespace + content.</p> + <note type="warning">This property can only be set in + <filepath>configuration.properties</filepath>.</note></pd> + </plentry> <plentry id="default-cascade"> <pt><parmname>default.cascade</parmname></pt> <pd> From 9057a3d99218bc47ddeedac04cc66faf48ed095a Mon Sep 17 00:00:00 2001 From: Roger Sheen <roger@infotexture.net> Date: Thu, 5 Dec 2024 00:51:23 +0100 Subject: [PATCH 22/31] Add details on recently resolved issues Signed-off-by: Roger Sheen <roger@infotexture.net> --- release-notes/index.dita | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/release-notes/index.dita b/release-notes/index.dita index de8ad063..1e1283fd 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -36,6 +36,13 @@ following bug fixes.</p> <!-- https://github.com/dita-ot/dita-ot/issues?q=milestone%3A4.2.4+is%3Aclosed+label%3Abug+sort%3Acreated-asc --> <ul> + <li id="4525">On Windows, earlier versions of the <cmdname>dita.bat</cmdname> command failed when options were + specified with straight quotation marks (<codeph>" "</codeph>). The batch script syntax has been updated to + enable delayed expansion, which ensures that quotation marks are parsed correctly. The order of commands has + also been adjusted to allow <codeph>ANT_OPTS</codeph> to override CLI parameters. + <xref href="https://github.com/dita-ot/dita-ot/issues/4525" format="html" scope="external">#4525</xref>, + <xref href="https://github.com/dita-ot/dita-ot/issues/4545" format="html" scope="external">#4545</xref> + </li> <li id="4526">The bundled <tm trademark="Apache Commons IO" tmtype="tm">Apache Commons IO</tm> library has been upgraded to version 2.14.0, which includes security updates to mitigate the vulnerability described in <xref @@ -54,6 +61,12 @@ <xref href="https://github.com/dita-ot/dita-ot/issues/4532" format="html" scope="external">#4532</xref>, <xref href="https://github.com/dita-ot/dita-ot/issues/4533" format="html" scope="external">#4533</xref> </li> + <li id="4540">Earlier versions did not generate links in HTML output when software elements such as + <xmlelement>cmdname</xmlelement> and <xmlelement>msgnum</xmlelement> were used in key references. + These elements are now processed as keywords to ensure that links are created as expected. + <xref href="https://github.com/dita-ot/dita-ot/issues/4540" format="html" scope="external">#4540</xref>, + <xref href="https://github.com/dita-ot/dita-ot/issues/4547" format="html" scope="external">#4547</xref> + </li> <li id="4543"> <draft-comment author="jelovirt">DITA-OT had a bug that made it incorrectly process keyreffing elements that has only whitespace, when per DITA spec it should have skipped those elements. This bug has been From d7dd4f590d55ba0e530c7d6ab14040f38d68fe52 Mon Sep 17 00:00:00 2001 From: Roger Sheen <roger@infotexture.net> Date: Thu, 5 Dec 2024 01:15:02 +0100 Subject: [PATCH 23/31] Edit description for 4543 Signed-off-by: Roger Sheen <roger@infotexture.net> --- release-notes/index.dita | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/release-notes/index.dita b/release-notes/index.dita index 1e1283fd..30f2c889 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -67,14 +67,14 @@ <xref href="https://github.com/dita-ot/dita-ot/issues/4540" format="html" scope="external">#4540</xref>, <xref href="https://github.com/dita-ot/dita-ot/issues/4547" format="html" scope="external">#4547</xref> </li> - <li id="4543"> - <draft-comment author="jelovirt">DITA-OT had a bug that made it incorrectly process keyreffing elements - that has only whitespace, when per DITA spec it should have skipped those elements. This bug has been - fixed, but the fix has not been enabled. The existing broken behaviour is retained in order to not - break exising user content that rely on this buggy behaviour. The new - <codeph>compatibility.keyref.treat-blank-as-empty</codeph> property is can be used to switch off the - incorrect behaviour. The fix will be enabled by default in the next minor or major version.</draft-comment> - <xref href="https://github.com/dita-ot/dita-ot/issues/4543" format="html" scope="external">#4543</xref> + <li id="4543">Previous versions of DITA-OT incorrectly processed keyreffing elements that contain only + whitespace characters, where the DITA specification requires them to be skipped. This bug has been fixed, + but the fix is not yet enabled. The incorrect behavior is retained for backwards compatibility to ensure + that existing content that relies on this behavior will be processed in the same way. + A new <codeph>compatibility.keyref.treat-blank-as-empty</codeph> property can be used to switch off the + incorrect behavior. The fix will be enabled by default in the next minor or major version. + <xref href="https://github.com/dita-ot/dita-ot/issues/4543" format="html" scope="external">#4543</xref>, + <xref href="https://github.com/dita-ot/dita-ot/issues/4544" format="html" scope="external">#4544</xref> </li> </ul> </section> From fa8618f99be8a56b4b65e19a578ead769fd9ad98 Mon Sep 17 00:00:00 2001 From: Roger Sheen <roger@infotexture.net> Date: Thu, 5 Dec 2024 01:35:46 +0100 Subject: [PATCH 24/31] Edit configuration.properties for blank keyrefs Signed-off-by: Roger Sheen <roger@infotexture.net> --- parameters/configuration-properties-file.dita | 8 ++++++-- release-notes/index.dita | 13 +++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/parameters/configuration-properties-file.dita b/parameters/configuration-properties-file.dita index cdd6ef9c..d984b97f 100644 --- a/parameters/configuration-properties-file.dita +++ b/parameters/configuration-properties-file.dita @@ -76,8 +76,12 @@ <plentry id="compatibility-keyref-treat-blank-as-empty"> <pt><parmname>compatibility.keyref.treat-blank-as-empty</parmname></pt> <pd> - <p>Enables compatibility mode that incorrectly processes key references that have only whitespace - content.</p> + <p>When set to <codeph>true</codeph>, this property enables a compatibility mode that processes key + references that contain only whitespace characters like earlier versions of DITA-OT (prior to version + 4.2.4). This behavior is not correct according to the DITA specification, but this setting ensures that + existing content that relies on this behavior will be processed in the same way as in earlier versions. + Set this property to <codeph>false</codeph> to skip these references as intended in the DITA + specification.</p> <note type="warning">This property can only be set in <filepath>configuration.properties</filepath>.</note></pd> </plentry> diff --git a/release-notes/index.dita b/release-notes/index.dita index 30f2c889..43e23358 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -67,12 +67,13 @@ <xref href="https://github.com/dita-ot/dita-ot/issues/4540" format="html" scope="external">#4540</xref>, <xref href="https://github.com/dita-ot/dita-ot/issues/4547" format="html" scope="external">#4547</xref> </li> - <li id="4543">Previous versions of DITA-OT incorrectly processed keyreffing elements that contain only - whitespace characters, where the DITA specification requires them to be skipped. This bug has been fixed, - but the fix is not yet enabled. The incorrect behavior is retained for backwards compatibility to ensure - that existing content that relies on this behavior will be processed in the same way. - A new <codeph>compatibility.keyref.treat-blank-as-empty</codeph> property can be used to switch off the - incorrect behavior. The fix will be enabled by default in the next minor or major version. + <li id="4543">Previous versions of DITA-OT incorrectly processed key references that contain only whitespace + characters, where the DITA specification requires them to be skipped. This bug has been fixed, but the fix + is not yet enabled. The incorrect behavior is retained for backwards compatibility to ensure that existing + content that relies on this behavior will be processed in the same way as in earlier versions. + A new <codeph>compatibility.keyref.treat-blank-as-empty</codeph> property can be set in + <xref keyref="configuration-properties-file">configuration.properties</xref> to switch off the incorrect + behavior. The fix will be enabled by default in the next minor or major version. <xref href="https://github.com/dita-ot/dita-ot/issues/4543" format="html" scope="external">#4543</xref>, <xref href="https://github.com/dita-ot/dita-ot/issues/4544" format="html" scope="external">#4544</xref> </li> From 1b5e8969a4ce2159ddacf84b4885cc629f8f4c30 Mon Sep 17 00:00:00 2001 From: Roger Sheen <roger@infotexture.net> Date: Fri, 6 Dec 2024 19:00:06 +0100 Subject: [PATCH 25/31] Add details on 4551 Signed-off-by: Roger Sheen <roger@infotexture.net> --- release-notes/index.dita | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/release-notes/index.dita b/release-notes/index.dita index 43e23358..98b75c72 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -38,8 +38,7 @@ <ul> <li id="4525">On Windows, earlier versions of the <cmdname>dita.bat</cmdname> command failed when options were specified with straight quotation marks (<codeph>" "</codeph>). The batch script syntax has been updated to - enable delayed expansion, which ensures that quotation marks are parsed correctly. The order of commands has - also been adjusted to allow <codeph>ANT_OPTS</codeph> to override CLI parameters. + enable delayed expansion, which ensures that quotation marks are parsed correctly. <xref href="https://github.com/dita-ot/dita-ot/issues/4525" format="html" scope="external">#4525</xref>, <xref href="https://github.com/dita-ot/dita-ot/issues/4545" format="html" scope="external">#4545</xref> </li> @@ -77,6 +76,11 @@ <xref href="https://github.com/dita-ot/dita-ot/issues/4543" format="html" scope="external">#4543</xref>, <xref href="https://github.com/dita-ot/dita-ot/issues/4544" format="html" scope="external">#4544</xref> </li> + <li id="4551">The order of arguments in the <cmdname>dita</cmdname> command scripts has been adjusted to allow + the content of the <codeph>ANT_OPTS</codeph> environment variable to override CLI parameters. + <xref href="https://github.com/dita-ot/dita-ot/issues/4545" format="html" scope="external">#4545</xref>, + <xref href="https://github.com/dita-ot/dita-ot/issues/4551" format="html" scope="external">#4551</xref> + </li> </ul> </section> </refbody> From 3eb0f640d3dbc9a8f33b3016e81e7e223de906ac Mon Sep 17 00:00:00 2001 From: Roger Sheen <roger@infotexture.net> Date: Fri, 6 Dec 2024 22:20:10 +0100 Subject: [PATCH 26/31] Add topic on runtime configuration file: .ditaotrc Signed-off-by: Roger Sheen <roger@infotexture.net> --- parameters/configuration-properties.dita | 4 ++- parameters/dot-ditaotrc-file.dita | 41 ++++++++++++++++++++++++ parameters/local-properties-file.dita | 3 ++ parameters/parameters.ditamap | 1 + release-notes/index.dita | 9 ++++-- resources/source-files.ditamap | 1 + 6 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 parameters/dot-ditaotrc-file.dita diff --git a/parameters/configuration-properties.dita b/parameters/configuration-properties.dita index f29096fb..db5a12ce 100644 --- a/parameters/configuration-properties.dita +++ b/parameters/configuration-properties.dita @@ -35,6 +35,8 @@ <li>Any property passed to Ant from the command line with <parmname>-Dproperty</parmname> or <parmname>--property</parmname>=<option>value</option></li> <li>A custom property file passed with <parmname>--propertyfile</parmname></li> + <li>A <filepath>.ditaotrc</filepath> configuration file in the current directory or any ancestor directory, in + the user’s home directory, or in the root directory of the DITA-OT installation</li> <li>A <filepath>local.properties</filepath> file in the root directory of the DITA-OT installation</li> <li>The <filepath>lib/org.dita.dost.platform/plugin.properties</filepath> file</li> <li>The <filepath>configuration.properties</filepath> file</li> @@ -43,7 +45,7 @@ property are ignored.</p> <p>You can use this mechanism to override DITA-OT default settings for your environment by passing parameters to the <cmdname>dita</cmdname> command with <parmname>--property</parmname>=<option>value</option>, or using - entries in <filepath>.properties</filepath> files.</p> + entries in runtime configurations or <filepath>.properties</filepath> files.</p> </section> </refbody> </reference> diff --git a/parameters/dot-ditaotrc-file.dita b/parameters/dot-ditaotrc-file.dita new file mode 100644 index 00000000..437d47b0 --- /dev/null +++ b/parameters/dot-ditaotrc-file.dita @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd"> +<!-- This file is part of the DITA Open Toolkit project. See the accompanying LICENSE file for applicable license. --> +<reference id="ditaotrc"> + <title>The <filepath>.ditaotrc</filepath> configuration file + + .ditaotrc + + As of DITA-OT 4.2, new files can be used to store DITA-OT runtime configurations in multiple places to + support fine-grained configuration layers. + + + + files + .ditaotrc + .ditaotrc file + + + + +
    +

    DITA-OT now looks for .ditaotrc configuration files in the current directory or any + ancestor directory first, then in the user’s home directory, and finally in the root directory of the DITA-OT + installation. These files are read in order and combined with the contents of the + local.properties file in the toolkit directory.

    +

    The first occurrence of a property takes precedence. This approach can be used to define multiple layers of + configuration, so personal defaults that apply to multiple projects can be stored in the home folder, with local + overrides in project folders.

    +
    + For example, if the current directory includes a .ditaotrc file that sets + pdf.formatter=fop and the user’s home directory has a + .ditaotrc file with the following content, + pdf.formatter=xep +args.grammar.cache=no DITA-OT will be run as if the following options were set on the command line: + --pdf.formatter=fop --args.grammar.cache=no + As of DITA-OT 4.2, any configurations in + local.properties files should be migrated to + .ditaotrc files. + +     +     diff --git a/parameters/local-properties-file.dita b/parameters/local-properties-file.dita index 61fb33ef..ae329696 100644 --- a/parameters/local-properties-file.dita +++ b/parameters/local-properties-file.dita @@ -58,6 +58,9 @@ axf.cmd=C:\\Program Files\\Antenna House\\AHFormatterV62
    This file can only be used to set Ant property values that can be passed as argument parameters to the command line. The DITA-OT Java code does not read this file. + The local.properties file is still supported for backwards + compatibility, but as of DITA-OT 4.2, any local configurations should be migrated to + .ditaotrc configuration files.
    diff --git a/parameters/parameters.ditamap b/parameters/parameters.ditamap index 8d97ba43..01c9c9ab 100644 --- a/parameters/parameters.ditamap +++ b/parameters/parameters.ditamap @@ -20,6 +20,7 @@ + diff --git a/release-notes/index.dita b/release-notes/index.dita index 98b75c72..5d842ed0 100644 --- a/release-notes/index.dita +++ b/release-notes/index.dita @@ -229,9 +229,10 @@
    - New configuration file -

    A new .ditaotrc configuration file can be used to store DITA-OT runtime configurations - in multiple places.

    + New runtime configurations +

    New + .ditaotrc configuration files can be used to + store DITA-OT runtime configurations in multiple places.

    DITA-OT now looks for this file in the current directory or any ancestor directory first, then in the user’s home directory, and finally in the root directory of the DITA-OT installation. These files are read in order and combined with the contents of the local.properties file in the toolkit directory. The @@ -545,6 +546,8 @@

    • +
  • +

    • For additional information on documentation issues resolved in DITA Open Toolkit Release + From 86456c6d965012c91168891f410bbc36b03952ab Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Fri, 6 Dec 2024 22:55:07 +0100 Subject: [PATCH 27/31] Link from args.rellinks to include.rellinks (#567) Fixes #567 Signed-off-by: Roger Sheen --- parameters/ant-parameters-details.dita | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/parameters/ant-parameters-details.dita b/parameters/ant-parameters-details.dita index 6d40e4c7..3e4f682c 100644 --- a/parameters/ant-parameters-details.dita +++ b/parameters/ant-parameters-details.dita @@ -121,6 +121,16 @@ args.rellinks + Specifies which related + links to include in the output. The following values are supported: +

      +
    • – No links are included.
      • +
    • – All links are included.
      • +
    • – Ancestor and parent links are not included.
      • +
    • – Parent, ancestor, child, descendant, sibling, next, previous, and cousin + links are not included.
      • +
    +

    For PDF output, the default value is . Other formats include all link roles @@ -132,7 +142,11 @@ HTML5 related links args.rellinks -

    +

    + For more precise control over related links output, set the internal Ant property + + include.rellinks and specify which link roles to include. +     args.resources From 4c57a2fc50df2310bcc0b10516394bdbb54c6cdc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 23:24:17 +0100 Subject: [PATCH 28/31] Bump husky from 9.1.6 to 9.1.7 (#580) Bumps [husky](https://github.com/typicode/husky) from 9.1.6 to 9.1.7. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.6...v9.1.7) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2746dc7b..9dfd75f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "license": "Apache-2.0", "devDependencies": { "@prettier/plugin-xml": "3.4.1", - "husky": "^9.1.6", + "husky": "^9.1.7", "lint-staged": "15.2.10", "prettier": "3.3.3", "stylelint": "^15.11.0", @@ -1083,9 +1083,9 @@ } }, "node_modules/husky": { - "version": "9.1.6", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", - "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "bin": { "husky": "bin.js" @@ -3541,9 +3541,9 @@ "dev": true }, "husky": { - "version": "9.1.6", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.6.tgz", - "integrity": "sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==", + "version": "9.1.7", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", + "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true }, "ignore": { diff --git a/package.json b/package.json index cd4ab6dc..3e236b8a 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@prettier/plugin-xml": "3.4.1", - "husky": "^9.1.6", + "husky": "^9.1.7", "lint-staged": "15.2.10", "prettier": "3.3.3", "stylelint": "^15.11.0", From b1b0962778db7737d572876265de624d628188b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 23:30:09 +0100 Subject: [PATCH 29/31] Bump prettier from 3.3.3 to 3.4.2 (#582) Bumps [prettier](https://github.com/prettier/prettier) from 3.3.3 to 3.4.2. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/3.3.3...3.4.2) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9dfd75f1..0d29c702 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "@prettier/plugin-xml": "3.4.1", "husky": "^9.1.7", "lint-staged": "15.2.10", - "prettier": "3.3.3", + "prettier": "3.4.2", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-sass-guidelines": "^10.0.0" @@ -1947,9 +1947,9 @@ "dev": true }, "node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -4130,9 +4130,9 @@ "dev": true }, "prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true }, "punycode": { diff --git a/package.json b/package.json index 3e236b8a..9e63977f 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@prettier/plugin-xml": "3.4.1", "husky": "^9.1.7", "lint-staged": "15.2.10", - "prettier": "3.3.3", + "prettier": "3.4.2", "stylelint": "^15.11.0", "stylelint-config-recommended": "^13.0.0", "stylelint-config-sass-guidelines": "^10.0.0" From dac4ab2beaa1b902154c9c719991759f82ecaf3c Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sat, 7 Dec 2024 19:25:41 +0100 Subject: [PATCH 30/31] Implement feedback on .ditaotrc Signed-off-by: Roger Sheen --- parameters/dot-ditaotrc-file.dita | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parameters/dot-ditaotrc-file.dita b/parameters/dot-ditaotrc-file.dita index 437d47b0..51d320c3 100644 --- a/parameters/dot-ditaotrc-file.dita +++ b/parameters/dot-ditaotrc-file.dita @@ -19,8 +19,8 @@
    -

    DITA-OT now looks for .ditaotrc configuration files in the current directory or any - ancestor directory first, then in the user’s home directory, and finally in the root directory of the DITA-OT +

    DITA-OT looks for .ditaotrc configuration files in the current directory or any ancestor + directory first, then in the user’s home directory, and finally in the root directory of the DITA-OT installation. These files are read in order and combined with the contents of the local.properties file in the toolkit directory.

    The first occurrence of a property takes precedence. This approach can be used to define multiple layers of From 991df8c0bdac032d653d68ca2565b2dcd9de7a6b Mon Sep 17 00:00:00 2001 From: Roger Sheen Date: Sun, 8 Dec 2024 11:31:56 +0100 Subject: [PATCH 31/31] Promote .ditaotrc note in local.properties topic Signed-off-by: Roger Sheen --- parameters/local-properties-file.dita | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/parameters/local-properties-file.dita b/parameters/local-properties-file.dita index ae329696..e81a4fc9 100644 --- a/parameters/local-properties-file.dita +++ b/parameters/local-properties-file.dita @@ -34,9 +34,12 @@ -

    For example, if you always use the same rendering engine to produce PDF output for all of your projects, you - could create a local.properties file in the root directory of your DITA-OT installation to - set the pdf.formatter parameter and additional options for the XSL processor:

    + The local.properties file is still supported for backwards + compatibility, but as of DITA-OT 4.2, any local configurations should be migrated to + .ditaotrc configuration files. +

    If you always use the same rendering engine to produce PDF output for all of your projects, you could create a + local.properties file in the root directory of your DITA-OT installation to set the + pdf.formatter parameter and additional options for the XSL processor:

    # Use RenderX XEP Engine for PDF output @@ -58,9 +61,6 @@ axf.cmd=C:\\Program Files\\Antenna House\\AHFormatterV62
    This file can only be used to set Ant property values that can be passed as argument parameters to the command line. The DITA-OT Java code does not read this file. - The local.properties file is still supported for backwards - compatibility, but as of DITA-OT 4.2, any local configurations should be migrated to - .ditaotrc configuration files.