Merge pull request #267 from ConductionNL/feature/WOO-56/WCAG-siteimp…

…rove feature/WOO-56/WCAG-siteimprove
ConductionNL · Feb 13, 2024 · 0e2736e · 0e2736e
2 parents b1869b5 + 92fb2d8
commit 0e2736e
Show file tree

Hide file tree

Showing 7 changed files with 1,688 additions and 3,756 deletions.
diff --git a/pwa/gatsby-node.js b/pwa/gatsby-node.js
@@ -8,7 +8,7 @@ exports.onCreateBabelConfig = ({ actions }) => {
 };
 
 exports.onCreateWebpackConfig = ({ stage, actions, getConfig }) => {
-  if (stage === "develop") {
+  if (stage === "develop" || stage === "build-javascript") {
     const config = getConfig();
     const miniCssExtractPlugin = config.plugins.find(
       (plugin) => plugin.constructor.name === "MiniCssExtractPlugin",

diff --git a/pwa/gatsby-ssr.js b/pwa/gatsby-ssr.js
@@ -36,7 +36,7 @@ export const onRenderBody = ({ setHeadComponents, setPostBodyComponents }) => {
         src={window.sessionStorage.getItem("ANALYTICS_URL")}
       />
     ) : (
-      <script key={0} id="analytics" async />
+      <script key={0} id="analytics" />
     ),
   ];
   setHeadComponents(HeadComponents);

diff --git a/pwa/package-lock.json b/pwa/package-lock.json
diff --git a/pwa/package.json b/pwa/package.json
@@ -25,7 +25,7 @@
     "prepare": "cd .. && husky install"
   },
   "dependencies": {
-    "@conduction/components": "2.2.46",
+    "@conduction/components": "2.2.47",
     "@conduction/theme": "1.1.21",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-brands-svg-icons": "6.5.1",

diff --git a/pwa/src/hooks/htmlParser/anchor/getAnchor.tsx b/pwa/src/hooks/htmlParser/anchor/getAnchor.tsx
@@ -3,13 +3,13 @@ import _ from "lodash";
 import { Link } from "@utrecht/component-library-react/dist/css-module";
 import { navigate } from "gatsby";
 import { domToReact } from "html-react-parser";
-import { TGitHubDirectory } from "../../useGitHubDirectories";
+import { TMarkdownDirectory } from "../../useMarkdownDirectories";
 
 export const getAnchor = (
   props: any,
   children: any,
   options: any,
-  directories: TGitHubDirectory[],
+  directories: TMarkdownDirectory[],
   location: string,
 ) => {
   const conditions = ["://", "tel:", "mailto:"];
@@ -55,7 +55,7 @@ export const getAnchor = (
   return <Link {...attributes}>{domToReact(children, options)}</Link>;
 };
 
-const handleInternalLinks = (props: any, targetFile: string, location: string, directories: TGitHubDirectory[]) => {
+const handleInternalLinks = (props: any, targetFile: string, location: string, directories: TMarkdownDirectory[]) => {
   // Internal Links: same directory
   if (!props.href.includes("/")) {
     const targetDirectory = _.upperFirst(location.split("/").reverse()[1]);

diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css
@@ -38,7 +38,7 @@
 @import "../../node_modules/@nl-design-system-unstable/leidschendam-voorburg-design-tokens/dist/index.css";
 @import "../../node_modules/@nl-design-system-unstable/nijmegen-design-tokens/dist/index.css";
 @import "../../node_modules/@nl-design-system-unstable/noordoostpolder-design-tokens/dist/index.css";
-@import "../../node_modules/@nl-design-system-unstable/provincie-zuid-holland-design-tokens/dist/index.css";
+/* @import "../../node_modules/@nl-design-system-unstable/provincie-zuid-holland-design-tokens/dist/index.css"; */
 /* @import "../../node_modules/@nl-design-system-unstable/riddeliemers-design-tokens/dist/index.css"; */ /* Import errors */
 @import "../../node_modules/@nl-design-system-unstable/rotterdam-design-tokens/dist/index.css";
 @import "../../node_modules/@nl-design-system-unstable/stedebroec-design-tokens/dist/index.css";

diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css
@@ -71,7 +71,7 @@
 }
 
 .categoryAndMunicipality {
-  text-wrap: nowrap;
+  white-space: nowrap;
 }
 
 .description {