Skip to content

Commit

Permalink
Revert #4076 (#4079)
Browse files Browse the repository at this point in the history
This reverts commit e4469d7.

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!
  • Loading branch information
kfranqueiro authored Sep 20, 2024
1 parent e679a18 commit 4213bf6
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 86 deletions.
3 changes: 1 addition & 2 deletions .eleventyignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
*.md
*.*
11ty/
acknowledgements.html
acknowledgements/
conformance-challenges/
guidelines/
Expand Down
2 changes: 0 additions & 2 deletions 11ty/CustomLiquid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
8 changes: 0 additions & 8 deletions eleventy.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import compact from "lodash-es/compact";
import { rimraf } from "rimraf";

import { copyFile } from "fs/promises";

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions index.html

This file was deleted.

100 changes: 41 additions & 59 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 4213bf6

Please sign in to comment.