From 4213bf62b9f536769a84917988dbf64dc30dc64d Mon Sep 17 00:00:00 2001 From: "Kenneth G. Franqueiro" Date: Fri, 20 Sep 2024 14:47:25 +0000 Subject: [PATCH] Revert #4076 (#4079) This reverts commit e4469d7b3f25792b16238a2c8c6c45a6a12e6eda. There was an unforeseen issue affecting the GH Pages deploy script, which I will need to dig into and test separately. Reverting first so we can get those deploys working for now. Sorry for the noise! --- .eleventyignore | 3 +- 11ty/CustomLiquid.ts | 2 - eleventy.config.ts | 8 ---- index.html | 14 ------ package-lock.json | 100 ++++++++++++++++++------------------------- package.json | 1 - 6 files changed, 42 insertions(+), 86 deletions(-) delete mode 100644 index.html diff --git a/.eleventyignore b/.eleventyignore index 752acaedf1..59386af4f7 100644 --- a/.eleventyignore +++ b/.eleventyignore @@ -1,6 +1,5 @@ -*.md +*.* 11ty/ -acknowledgements.html acknowledgements/ conformance-challenges/ guidelines/ diff --git a/11ty/CustomLiquid.ts b/11ty/CustomLiquid.ts index 7e5de46859..f395f6e470 100644 --- a/11ty/CustomLiquid.ts +++ b/11ty/CustomLiquid.ts @@ -89,8 +89,6 @@ export class CustomLiquid extends Liquid { const isIndex = indexPattern.test(filepath); const isTechniques = techniquesPattern.test(filepath); const isUnderstanding = understandingPattern.test(filepath); - - if (!isTechniques && !isUnderstanding) return super.parse(html); const $ = flattenDom(html, filepath); diff --git a/eleventy.config.ts b/eleventy.config.ts index 37dd71bdc9..e146eb728f 100644 --- a/eleventy.config.ts +++ b/eleventy.config.ts @@ -1,5 +1,4 @@ import compact from "lodash-es/compact"; -import { rimraf } from "rimraf"; import { copyFile } from "fs/promises"; @@ -125,7 +124,6 @@ export default function (eleventyConfig: any) { eleventyConfig.addGlobalData("eleventyComputed", { // permalink determines output structure; see https://www.11ty.dev/docs/permalinks/ permalink: ({ page, isUnderstanding }: GlobalData) => { - if (page.inputPath === "./index.html" && process.env.WCAG_MODE) return false; if (isUnderstanding) { // understanding-metadata.html exists in 2 places; top-level wins in XSLT process if (/\/20\/understanding-metadata/.test(page.inputPath)) return false; @@ -175,12 +173,6 @@ export default function (eleventyConfig: any) { eleventyConfig.addPassthroughCopy("working-examples/**"); - eleventyConfig.on("eleventy.before", async ({ runMode }: EleventyEvent) => { - // Clear the _site folder before publishes to GH Pages or W3C site, - // to avoid inheriting dev-only files from previous runs - if (runMode === "build" && process.env.WCAG_MODE) await rimraf("_site"); - }); - eleventyConfig.on("eleventy.after", async ({ dir }: EleventyEvent) => { // addPassthroughCopy can only map each file once, // but base.css needs to be copied to a 2nd destination diff --git a/index.html b/index.html deleted file mode 100644 index 9fcfa92eb7..0000000000 --- a/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Web Content Accessibility Guidelines {{ versionDecimal }} - - -

Web Content Accessibility Guidelines {{ versionDecimal }}

- - - diff --git a/package-lock.json b/package-lock.json index c237f220d2..54bc11eff8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "liquidjs": "^10.14.0", "lodash-es": "^4.17.21", "mkdirp": "^3.0.1", - "rimraf": "^5.0.10", "tsx": "^4.11.0" }, "devDependencies": { @@ -1742,7 +1741,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -2480,46 +2478,6 @@ "slash": "^1.0.0" } }, - "node_modules/recursive-copy/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/recursive-copy/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/recursive-copy/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/recursive-copy/node_modules/mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", @@ -2531,18 +2489,6 @@ "mkdirp": "bin/cmd.js" } }, - "node_modules/recursive-copy/node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/resolve-pkg-maps": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", @@ -2561,19 +2507,55 @@ } }, "node_modules/rimraf": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", - "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dependencies": { - "glob": "^10.3.7" + "glob": "^7.1.3" }, "bin": { - "rimraf": "dist/esm/bin.mjs" + "rimraf": "bin.js" + } + }, + "node_modules/rimraf/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rimraf/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", diff --git a/package.json b/package.json index d99692156a..24492fb7e3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "liquidjs": "^10.14.0", "lodash-es": "^4.17.21", "mkdirp": "^3.0.1", - "rimraf": "^5.0.10", "tsx": "^4.11.0" }, "devDependencies": {