@gouvfr/dsfr-roller 1.0.45 → 1.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gouvfr/dsfr-roller",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "description": "Le module `dsfr-roller` permet de publier le site de documentation du Système de Design de l’État - DSFR",
   "keywords": [
     "Système de Design de l'État",
@@ -56,7 +56,7 @@
   ],
   "main": "./index.js",
   "dependencies": {
-    "@gouvfr/dsfr-forge": "=1.0.45",
+    "@gouvfr/dsfr-forge": "=1.0.47",
     "@gouvfr/dsfr-publisher": "npm:@gouvfr/dsfr@1.14.0",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",

package/src/page/body/edit.js

@@ -1,6 +1,5 @@
 class Edit {
   constructor(data) {
-    console.debug('Edit', data);
     this._node = {
       type: 'htmlContainer',
       tagName: 'div',

package/src/page/head/share.js

@@ -4,9 +4,9 @@ class Share extends Renderable {
   constructor(data) {
     super(data, 'share');
     this._resource = data.resource || {};
-    this._title = `${data.title} - ${this._resource?.meta?.title}`;
+    this._title = data.pageTitle || this._resource?.meta?.title;
     this._description = data.description || this._resource?.meta?.description;
-    this._cover = data.cover || '/static/img/cover.png';
+    this._cover = data.cover || this._resource?.meta?.cover;
     this._url = this._resource?.meta?.baseUrl + data.url;
     this._locale = `${data.lang}_${data.lang.toUpperCase()}`;
   }
@@ -18,6 +18,7 @@ class Share extends Renderable {
       <meta property="og:title" content="${this._title}">
       <meta property="og:description" content="${this._description}">
       <meta property="og:image" content="${this._cover}">
+      <meta property="og:image:alt" content="${this._title}">
       <meta property="og:type" content="website">
       <meta property="og:url" content="${this._url}">
       <meta property="og:locale" content="${this._locale}">
@@ -27,6 +28,7 @@ class Share extends Renderable {
       <meta name="twitter:description" content="${this._description}">
       <meta name="twitter:site" content="@gouvernementFR">
       <meta name="twitter:image" content="${this._cover}">
+      <meta name="twitter:image:alt" content="${this._title}">
     `;
   }
 }

package/src/page/head/title.js

@@ -2,7 +2,7 @@ import { Renderable } from '../../core/renderable.js';
 
 class Title extends Renderable {
   async render () {
-    return `<title>${this.data.title} - ${this.data.resource.meta.title}</title>`;
+    return `<title>${this.data.pageTitle}</title>`;
   }
 }
 

package/src/page/scripts/analytics-config.js

@@ -1,5 +1,6 @@
 import { Renderable } from '../../core/renderable.js';
-import ENV from '../../../env/prod/env.json' with { type: "json" };
+
+const PRODUCTION_ENV = 'prod';
 
 class AnalyticsConfig extends Renderable {
   constructor (data) {
@@ -20,7 +21,7 @@ class AnalyticsConfig extends Renderable {
         const env = JSON.parse(xhr.responseText);
         const analytics = ${JSON.stringify(this._analytics).replace('"$(1)"', 'env.domain').replace('"$(2)"', 'env.env')};
         const dsfr = { analytics };
-        if (env.env === ENV.env) {
+        if (env.env === PRODUCTION_ENV) {
           dsfr.production = true;
         }
         window.dsfr = dsfr;

package/src/script/main/core/get-query.js

@@ -1,8 +1,9 @@
 const paramsString = window.location.search;
 const searchParams = new URLSearchParams(paramsString);
+import { normalizeTerm } from '@gouvfr/dsfr-forge/src/html/normalize.js';
 
 const getQuery = () => {
-    return searchParams.get('query');
+    return normalizeTerm(searchParams.get('query'));
 };
 
 const getCurrentPagination = () => {

package/src/script/main/elements/search-bar/index.js

@@ -1,12 +1,13 @@
 import { Element } from '../../core/element.js';
 import { ResultsDropdown } from './results/results-dropdown.js';
+import { normalizeTerm } from '@gouvfr/dsfr-forge/src/html/normalize.js';
 
 class SearchBar extends Element {
   constructor (element) {
     super(element, 'searchBar');
     this._searchInput = this.element.querySelector('#search-input');
     this._searchButton = this.element.querySelector('#search-button');
-    this._query = this._searchInput.value;
+    this._query = normalizeTerm(this._searchInput.value);
     this._url = this._searchButton.getAttribute('data-href');
   }
 
@@ -62,7 +63,7 @@ class SearchBar extends Element {
     } else if (event.key === 'Escape') {
       this._resultsDropdown.reset();
     } else {
-      this.update(event.target.value);
+      this.update(normalizeTerm(event.target.value));
     }
   }
 

package/src/script/main/minisearch/index.js

@@ -1,4 +1,5 @@
 import MiniSearch from 'minisearch';
+import { normalizeTerm } from '@gouvfr/dsfr-forge/src/html/normalize.js';
 
 const LOAD_OPTIONS = {
   fields: ['title', 'keywords', 'summary', 'excerpt', 'text'],
@@ -6,18 +7,24 @@ const LOAD_OPTIONS = {
 };
 
 const SEARCH_OPTIONS = {
-  prefix: true,
   boost: { title: 2.5, keywords: 2, summary: 1.5, text: 1 },
   boostDocument: (documentId, query, storedFields) =>
     storedFields?.boost ?? 1,
 }
 
 const getOptions = (type) => {
+  const options = {
+    prefix: true,
+    fuzzy: 0.2,
+    processTerm: (term) => normalizeTerm(term.toLowerCase())
+  };
+
   switch (type) {
     case 'search':
-      return SEARCH_OPTIONS;
+      return { ...options, ...SEARCH_OPTIONS };
+
     default:
-      return LOAD_OPTIONS;
+      return { ...options, ...LOAD_OPTIONS };
   }
 }
 

package/src/style/home/_hero.scss

@@ -4,6 +4,7 @@
 
   &::before {
     content: '';
+    z-index: -1;
     position: absolute;
     opacity: 0.7;
     top: -20px;