⬆️ [#974] updated node dependencies

.babelrc

@@ -1,5 +1,10 @@
 {
     "presets": [
         "@babel/preset-env",
-    ]
+    ],
+    "env": {
+        "test": {
+        "plugins": [ "istanbul" ]
+        }
+    }
 }

karma.conf.js

@@ -4,19 +4,6 @@ const webpackConfig = require('./webpack.config.js');
 // Prevent testing infrastructure from crashing (MIGHT REQUIRE --production --sourcemap NOT TO BE SET!
 webpackConfig.output.library = undefined;
 
-// Add istanbul-instrumenter to webpack configuration
-webpackConfig.module.rules.push({
-    test: /\.js$/,
-    include: __dirname + '/' + paths.jsSrcDir,
-    loader: 'istanbul-instrumenter-loader',
-    enforce: 'post',
-
-    options: {
-        esModules: true
-    }
-});
-
-
 // The preprocessor config
 const preprocessors = {};
 preprocessors[paths.jsSpecEntry] = [

package.json

@@ -34,6 +34,10 @@
         "text-diff": "^1.0.1",
         "tippy.js": "^6.3.7"
     },
+    "nyc": {
+        "sourceMap": false,
+        "instrument": false
+      },
     "devDependencies": {
         "@babel/core": "latest",
         "@babel/polyfill": "latest",
@@ -50,20 +54,20 @@
         "@ckeditor/ckeditor5-heading": "^34.0.0",
         "@ckeditor/ckeditor5-link": "^34.0.0",
         "@ckeditor/ckeditor5-list": "^34.0.1",
-        "@ckeditor/ckeditor5-markdown-gfm": "^34.0.0",
+        "@ckeditor/ckeditor5-markdown-gfm": "^41.0.0",
         "@ckeditor/ckeditor5-paragraph": "^34.0.0",
         "@ckeditor/ckeditor5-table": "^34.0.0",
         "@ckeditor/ckeditor5-theme-lark": "^34.0.0",
         "arrayify": "^1.0.0",
         "autoprefixer": "^10.4.5",
         "babel-loader": "latest",
+        "babel-plugin-istanbul": "^6.1.1",
         "bem.js": "^1.0.10",
         "chai": "latest",
         "css-loader": "latest",
         "cssnano": "^5.1.7",
         "engine.io": ">=6.2.0",
         "follow-redirects": ">=1.14.9",
-        "istanbul-instrumenter-loader": "^2.0.0",
         "karma": "latest",
         "karma-chrome-launcher": "latest",
         "karma-coverage": "latest",

src/openapi.yaml

@@ -206,7 +206,11 @@ paths:
           enum:
           - eu-bedrijf
           - eu-burger
-        description: Toont producten die overeenkomen met de opgegeven doelgroepen.
+        description: |-
+          Toont producten die overeenkomen met de opgegeven doelgroepen.
+
+          * `eu-burger` - EU Burger
+          * `eu-bedrijf` - EU Bedrijf
       - name: page
         required: false
         in: query
@@ -220,7 +224,11 @@ paths:
           enum:
           - en
           - nl
-        description: Toont producten die overeenkomen met de opgegeven taal.
+        description: |-
+          Toont producten die overeenkomen met de opgegeven taal.
+
+          * `nl` - Nederlands
+          * `en` - Engels
       - in: query
         name: upnLabel
         schema:
@@ -753,6 +761,9 @@ components:
       - eu-burger
       - eu-bedrijf
       type: string
+      description: |-
+        * `eu-burger` - EU Burger
+        * `eu-bedrijf` - EU Bedrijf
     GeneriekProduct:
       type: object
       properties:
@@ -780,8 +791,11 @@ components:
         taal:
           allOf:
           - $ref: '#/components/schemas/TaalEnum'
-          description: De taal waarin de betreffende tekst is geschreven.ISO 639-1
-            (https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+          description: |-
+            De taal waarin de betreffende tekst is geschreven.ISO 639-1 (https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
+
+            * `nl` - Nederlands
+            * `en` - Engels
         titel:
           type: string
           description: Titel van het product
@@ -882,7 +896,11 @@ components:
         taal:
           allOf:
           - $ref: '#/components/schemas/TaalEnum'
-          description: De taal van de onderstaande gegevens volgens formaat [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
+          description: |-
+            De taal van de onderstaande gegevens volgens formaat [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes).
+
+            * `nl` - Nederlands
+            * `en` - Engels
         titel:
           type: string
           description: De titel van het product. Als deze afwijkt van de generieke
@@ -1454,7 +1472,7 @@ components:
           format: uri
           description: De URL waar de burger of ondernemer het product bij de organisatie
             kan aanvragen.
-          maxLength: 200
+          maxLength: 1000
     Product:
       type: object
       description: Serializer for a product, including UPN, availability, locations
@@ -1526,7 +1544,11 @@ components:
         doelgroep:
           allOf:
           - $ref: '#/components/schemas/DoelgroepEnum'
-          description: De doelgroep van dit product.
+          description: |-
+            De doelgroep van dit product.
+
+            * `eu-burger` - EU Burger
+            * `eu-bedrijf` - EU Bedrijf
         vertalingen:
           type: array
           items:
@@ -1745,6 +1767,9 @@ components:
       - nl
       - en
       type: string
+      description: |-
+        * `nl` - Nederlands
+        * `en` - Engels
   securitySchemes:
     tokenAuth:
       type: apiKey

src/sdg/scss/_settings.scss

@@ -52,7 +52,7 @@ $grid-container-size: $breakpoint-desktop - 2 * $grid-container-margin !default;
 $grid-container-size-small: 800px !default;
 $grid-container-size-big: 1400px !default;
 $grid-margin-0: 5px !default;
-$grid-margin-1: 12px;
+$grid-margin-1: 12px !default;
 $grid-margin-2: 20px !default;
 $grid-margin-3: 30px !default;
 $grid-margin-4: 40px !default;

src/sdg/scss/components/_colors.scss

@@ -12,7 +12,7 @@ $color_primary_lightest: #D5E2EA;
 $color_primary_lighter: #549bc4;
 $color_primary_light: #3b82ab;
 $color_primary: #396a88;
-$color_primary_dark: #2a576f;
+$color_primary_dark: #2a576f !default;
 $color_primary_darker: #23485C;
 
 $color_secondary_lightest: #eceff3;

src/sdg/scss/views/organisaties/_constants.scss

@@ -13,7 +13,7 @@ $shades: (
 
 $color-background: $color_grey_light;
 $color-info: $color_primary_lightest;
-$input-color-placeholder: $color_grey_darker;
+// $input-color-placeholder: $color_grey_darker;
 $typography-color-link: $color_primary;
 $typography-color-link-hover: $color_primary_dark;
 $typography-color-text: $color_grey_darkest;

src/sdg/scss/views/organisaties/_organisaties-productenlijst-list.scss

@@ -23,22 +23,22 @@ $base_with: (
 .view--organisaties-productenlijst-list {
   @include meta.load-css('rijkshuisstijl/sass/components/datagrid/datagrid', $with: map.merge($base_with, (
     'datagrid-spacing-row-h': $grid-margin-1,
-    'input-color-placeholder': $color_grey_darker,
+    // 'input-color-placeholder': $color_grey_darker,
     'toolbar-color-background': #f2f2f2,
     'typography-color-link-hover': $color_primary_dark,
   )));
   @include meta.load-css('rijkshuisstijl/sass/components/icon/icon', $with: map.merge($base_with, (
   )));
   @include meta.load-css('rijkshuisstijl/sass/components/form/form', $with: map.merge($base_with, (
-    'input-color-placeholder': $color_grey_darker,
+    // 'input-color-placeholder': $color_grey_darker,
     'typography-color-link-hover': $color_primary_dark,
   )));
   @include meta.load-css('rijkshuisstijl/sass/components/form/input', $with: map.merge($base_with, (
-    'input-color-placeholder': $color_grey_darker,
+    // 'input-color-placeholder': $color_grey_darker,
     'typography-color-link-hover': $color_primary_dark,
   )));
   @include meta.load-css('rijkshuisstijl/sass/components/form/select', $with: map.merge($base_with, (
-    'input-color-placeholder': $color_grey_darker,
+    // 'input-color-placeholder': $color_grey_darker,
     'typography-color-link-hover': $color_primary_dark,
   )));
   @include meta.load-css('rijkshuisstijl/sass/components/toolbar/toolbar', $with: map.merge($base_with, (