release version 0.8.0

.eslintrc.json

@@ -14,9 +14,6 @@
   "plugins": [
     "ava"
   ],
-  "ignorePatterns": [
-    "gulpfile.js"
-  ],
   "rules": {
     "indent": [
       "error",

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: 'CodeQL'
 
 on:
   push:
@@ -53,8 +53,8 @@ jobs:
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      #- name: Autobuild
+      #  uses: github/codeql-action/autobuild@v1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -63,9 +63,9 @@ jobs:
       #    and modify them (or add more) to build your code if your project
       #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      - run: |
+          npm install
+          npm run build-prod
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v1

.github/workflows/test.yml

@@ -11,7 +11,6 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -25,5 +24,5 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
-    - run: npm ci
+      - run: npm ci --omit=dev --ignore-scripts
       - run: npm run build-prod

.gulp.json

@@ -0,0 +1,5 @@
+{
+  "flags": {
+    "gulpfile": "gulpfile.cjs"
+  }
+}

.husky/pre-commit

@@ -0,0 +1,5 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm test
+npx lint-staged

.prettierignore

@@ -0,0 +1,8 @@
+.idea
+build
+coverage
+node_modules
+vendor
+.eslintrc.json
+composer.lock
+LICENSE.md

.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "semi": false,
+  "singleQuote": true
+}

README.md

@@ -4,34 +4,42 @@ Connector for Mobilizon allows you to display the upcoming events of [Mobilizon]
 
 More details can be found in the [WordPress Plugin Directory](https://wordpress.org/plugins/connector-mobilizon/).
 
+The current changelog can be under [source/changelog.txt](source/changelog.txt).
+
 ## Development
 
 ### Setup
+
 1. Make sure `npm` and `composer` are installed.
 2. Run: `npm install`
-3. Run: `php composer.phar install`
+3. Run: `composer install`
 
 ### Development build
+
 1. Build: `npm run build-dev`
 2. Make sure to keep `changelog.txt` up-to-date.
 
 ### Release procedure
+
 1. Make sure `changelog.txt` is up-to-date. Use a new version number and copy over the new section into `readme.txt`.
 2. Update `package.json` with the same version number.
 3. Update the `package-lock.json`: `npm i --package-lock-only`
 4. Build: `npm run build-prod`
-5. Determine minimum PHP version for code and update package.json if needed: `./vendor/bin/phpcompatinfo analyser:run ./source`
-6. Make sure screenshots are up-to-date.
-7. Copy the built plugin into `/trunk` of SVN.
-8. Create a new tag of the new version: `svn cp trunk tags/<version>`
-9. Check the version number occurrences in both folders.
-10. Commit everything together to the release SVN: `svn ci -m "release version <version>"`
-11. Commit the new version in git with the same message.
-12. Tag the new version: `git tag v<version>`
-13. Push the new tag to the repository: `git push --tags`
+5. Make sure screenshots are up-to-date.
+6. Copy the built plugin into `/trunk` of SVN.
+7. Create a new tag of the new version: `svn cp trunk tags/<version>`
+8. Check the version number occurrences in both folders.
+9. Commit everything together to the release SVN: `svn ci -m "release version <version>"`
+10. Commit the new version in git with the same message.
+11. Tag the new version: `git tag v<version>`
+12. Push the new tag to the repository: `git push --tags`
 
 ### Other commands
+
 - Run ESLint: `npm run eslint`
 - Run JavaScript code coverage with tests: `npm run coverage`
 - Run tests: `npm test`
-- Delete build folder: `gulp clean`
+- Delete build folder: `npm run clean`
+- Update PHP dependencies: `composer update`
+- Check for direct PHP dependency updates: `composer outdated --direct`
+- Format code with prettier: `npm run format`

composer.json

@@ -1,5 +1 @@
-{
-    "require": {
-        "bartlett/php-compatinfo": "^5.4"
-    }
-}
+{}

gulpfile.cjs

@@ -0,0 +1,49 @@
+/* eslint-disable no-undef */
+const { dest, src } = require('gulp')
+
+const replace = require('gulp-replace')
+
+const PACKAGE = require('./package.json')
+
+const FOLDER_BUILD = './build'
+
+function injectMetadata() {
+  return src(
+    [
+      FOLDER_BUILD + '/front/events-loader.js',
+      FOLDER_BUILD + '/' + PACKAGE.name + '.php',
+      FOLDER_BUILD + '/includes/constants.php',
+      FOLDER_BUILD + '/readme.txt',
+    ],
+    { base: './' }
+  )
+    .pipe(replace('<wordpress-author-name>', PACKAGE.author.name))
+    .pipe(replace('<wordpress-author-url>', PACKAGE.author.url))
+    .pipe(replace('<wordpress-description>', PACKAGE.description))
+    .pipe(replace('<wordpress-donation-link>', PACKAGE.funding.url))
+    .pipe(replace('<wordpress-license>', PACKAGE.license))
+    .pipe(
+      replace(
+        '<wordpress-minimum-version>',
+        PACKAGE.additionalDetails.wordpressMinimumVersion
+      )
+    )
+    .pipe(replace('<wordpress-name>', PACKAGE.name))
+    .pipe(replace('<wordpress-nice-name>', PACKAGE.additionalDetails.niceName))
+    .pipe(
+      replace(
+        '<wordpress-php-minimum-version>',
+        PACKAGE.additionalDetails.phpMinimumVersion
+      )
+    )
+    .pipe(
+      replace(
+        '<wordpress-tested-up-to-version>',
+        PACKAGE.additionalDetails.wordpressTestedUpToVersion
+      )
+    )
+    .pipe(replace('<wordpress-version>', PACKAGE.version))
+    .pipe(dest('.'))
+}
+
+exports.inject = injectMetadata

gulpfile.js

@@ -1,80 +0,0 @@
-const { dest, series, src } = require('gulp');
-
-const del = require('del');
-const replace = require('gulp-replace');
-const webpack = require('webpack-stream');
-
-const PACKAGE = require('./package.json');
-
-const FOLDER_SOURCE = './source'
-const FOLDER_BUILD = './build';
-
-let mode = 'development';
-
-
-function clean(cb) {
-  del(FOLDER_BUILD);
-  cb();
-}
-
-const eventsLoaderOutputPath = PACKAGE.name + '/front/events-loader';
-const eventsLoaderInputPath = FOLDER_SOURCE + '/' + PACKAGE.name + '/front/events-loader.js';
-
-function bundleFrontend() {
-  return src(FOLDER_SOURCE + '/' + PACKAGE.name + '/front/events-loader.js')
-    .pipe(webpack({
-      mode,
-      entry: {
-        [eventsLoaderOutputPath]: eventsLoaderInputPath,
-      },
-      output: {
-        filename: '[name].js',
-      },
-    }))
-    .pipe(dest(FOLDER_BUILD));
-}
-
-function copyBackend() {
-  return src([
-    FOLDER_SOURCE + '/**/*.php',
-    FOLDER_SOURCE + '/**/*.txt'
-  ])
-    .pipe(dest(FOLDER_BUILD));
-}
-
-function injectMetadata() {
-  return src([
-    FOLDER_BUILD + '/' + eventsLoaderOutputPath + '.js',
-    FOLDER_BUILD + '/' + PACKAGE.name + '/' + PACKAGE.name + '.php',
-    FOLDER_BUILD + '/' + PACKAGE.name + '/includes/constants.php',
-    FOLDER_BUILD + '/' + PACKAGE.name + '/readme.txt'
-  ], { base: './' })
-    .pipe(replace('<wordpress-author-name>', PACKAGE.author.name))
-    .pipe(replace('<wordpress-author-url>', PACKAGE.author.url))
-    .pipe(replace('<wordpress-description>', PACKAGE.description))
-    .pipe(replace('<wordpress-donation-link>', PACKAGE.funding.url))
-    .pipe(replace('<wordpress-license>', PACKAGE.license))
-    .pipe(replace('<wordpress-minimum-version>', PACKAGE.additionalDetails.wordpressMinimumVersion))
-    .pipe(replace('<wordpress-name>', PACKAGE.name))
-    .pipe(replace('<wordpress-nice-name>', PACKAGE.additionalDetails.niceName))
-    .pipe(replace('<wordpress-php-minimum-version>', PACKAGE.additionalDetails.phpMinimumVersion))
-    .pipe(replace('<wordpress-tested-up-to-version>', PACKAGE.additionalDetails.wordpressTestedUpToVersion))
-    .pipe(replace('<wordpress-version>', PACKAGE.version))
-    .pipe(dest('.'));
-}
-
-exports.front = bundleFrontend;
-exports.copy = copyBackend;
-exports.inject = injectMetadata;
-
-const build = series(clean, bundleFrontend, copyBackend, injectMetadata);
-
-const buildDev = series((cb) => { mode = 'development'; cb(); }, build);
-
-const buildProd = series((cb) => { mode = 'production'; cb(); }, build);
-
-
-exports.clean = clean;
-exports.dev = buildDev;
-exports.default = buildDev;
-exports.prod = buildProd;

package.json

@@ -1,13 +1,17 @@
 {
   "name": "connector-mobilizon",
-  "version": "0.6.2",
+  "version": "0.8.0",
   "description": "Display Mobilizon events in WordPress.",
   "private": true,
+  "type": "module",
   "scripts": {
-    "build-dev": "gulp dev",
-    "build-prod": "ava && gulp prod",
+    "build-dev": "webpack --mode=development && gulp inject",
+    "build-prod": "ava && webpack --mode=production && gulp inject",
+    "clean": "rimraf -- build",
     "coverage": "c8 --all --reporter=html --reporter=text --include=source/**/*.js ava",
     "eslint": "npx eslint source/**/*.js",
+    "format": "npx prettier --write .",
+    "prepare": "husky install",
     "test": "ava"
   },
   "author": {
@@ -20,37 +24,44 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "graphql": "^15.5.1",
-    "graphql-request": "^3.5.0",
-    "luxon": "^2.0.2",
+    "graphql": "^16.2.0",
+    "graphql-request": "^3.7.0",
+    "luxon": "^2.3.0",
     "object-hash": "^2.2.0"
   },
   "devDependencies": {
-    "ava": "^3.15.0",
-    "c8": "^7.8.0",
-    "del": "^6.0.0",
-    "eslint": "^7.32.0",
-    "eslint-plugin-ava": "^12.0.0",
+    "@babel/core": "^7.16.7",
+    "@babel/preset-env": "^7.16.7",
+    "ava": "^4.0.1",
+    "babel-loader": "^8.2.3",
+    "c8": "^7.11.0",
+    "copy-webpack-plugin": "^10.2.0",
+    "eslint": "^8.6.0",
+    "eslint-plugin-ava": "^13.2.0",
     "esm": "^3.2.25",
     "gulp": "^4.0.2",
     "gulp-replace": "^1.1.3",
-    "jsdom": "^17.0.0",
-    "webpack": "^5.51.1",
-    "webpack-cli": "^4.8.0",
-    "webpack-stream": "^6.1.2"
+    "husky": "^7.0.4",
+    "jsdom": "^19.0.0",
+    "lint-staged": "^12.1.7",
+    "prettier": "2.5.1",
+    "rimraf": "^3.0.2",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1"
   },
   "ava": {
     "files": [
       "./source/**/*test.js"
-    ],
-    "require": [
-      "esm"
     ]
   },
   "additionalDetails": {
     "niceName": "Connector for Mobilizon",
-    "phpMinimumVersion": 5.4,
+    "phpMinimumVersion": 7.4,
     "wordpressMinimumVersion": 5.6,
-    "wordpressTestedUpToVersion": 5.8
+    "wordpressTestedUpToVersion": 5.9
+  },
+  "lint-staged": {
+    "source/**/*.js": "eslint",
+    "**/*": "prettier --write --ignore-unknown"
   }
 }

source/changelog.txt

@@ -6,6 +6,28 @@
 #### Fixed
 #### Security
 
+### [0.8.0] - 2022-01-09
+#### Added
+- Add support for older browsers using babel
+#### Changed
+- Confirm compatibility with WordPress 5.9
+- Update dependencies
+#### Fixed
+- Use ES modules correctly
+- Trim events' location
+
+### [0.7.0] - 2021-12-23
+#### Added
+- Add specific error message for the case the group is not found
+- Add code formatter prettier
+#### Changed
+- Update dependencies
+- Simplify build process
+#### Fixed
+- Fix Invalid DateTime on event end time being null
+#### Security
+- Set minimum PHP version to oldest stable 7.4
+
 ### [0.6.2] - 2021-08-24
 #### Changed
 - Update dependencies

source/connector-mobilizon.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Plugin Name:       <wordpress-nice-name>
+ * Author:            <wordpress-author-name>
+ * Author URI:        <wordpress-author-url>
+ * Description:       <wordpress-description>
+ * Version:           <wordpress-version>
+ * Requires at least: <wordpress-minimum-version>
+ * Requires PHP:      <wordpress-php-minimum-version>
+ * License:           <wordpress-license>
+ */
+
+require_once __DIR__ . '/includes/constants.php';
+require_once __DIR__ . '/includes/settings.php';
+require_once __DIR__ . '/includes/events-list-shortcut.php';
+require_once __DIR__ . '/includes/events-list-widget.php';
+
+// Exit if this file is called directly.
+if (!defined('ABSPATH')) {
+  exit;
+}
+
+final class Mobilizon_Connector {
+
+  private function __construct() {
+    add_action('init', [$this, 'register_settings']);
+    add_action('init', [$this, 'register_shortcut']);
+    add_action('widgets_init', [$this, 'register_widget']);
+    add_action('wp_enqueue_scripts', [$this, 'register_scripts']);
+    register_activation_hook(__FILE__, [$this, 'enable_activation']);
+  }
+
+  public static function init() {
+    // Create singleton instance.
+    static $instance = false;
+    if(!$instance) {
+        $instance = new self();
+    }
+    return $instance;
+  }
+
+  public function enable_activation() {
+    MobilizonConnector\Settings::setDefaultOptions();
+  }
+
+  public function register_settings() {
+    MobilizonConnector\Settings::init();
+  }
+
+  public function register_scripts() {
+    wp_enqueue_script(MobilizonConnector\NAME . '-js', plugins_url('front/events-loader.js', __FILE__ ));
+  }
+
+  public function register_shortcut() {
+    MobilizonConnector\EventsListShortcut::init();
+  }
+
+  public function register_widget() {
+    register_widget('MobilizonConnector\EventsListWidget');
+  }
+}
+
+function mobilizon_connector_run_plugin() {
+  return Mobilizon_Connector::init();
+}
+
+mobilizon_connector_run_plugin();

source/connector-mobilizon/connector-mobilizon.php

@@ -1,42 +0,0 @@
-<?php
-/**
- * Plugin Name:       <wordpress-nice-name>
- * Author:            <wordpress-author-name>
- * Author URI:        <wordpress-author-url>
- * Description:       <wordpress-description>
- * Version:           <wordpress-version>
- * Requires at least: <wordpress-minimum-version>
- * Requires PHP:      <wordpress-php-minimum-version>
- * License:           <wordpress-license>
- */
-
-require_once __DIR__ . '/includes/constants.php';
-require_once __DIR__ . '/includes/settings.php';
-require_once __DIR__ . '/includes/events-list-shortcut.php';
-require_once __DIR__ . '/includes/events-list-widget.php';
-
-// Exit if this file is called directly.
-if (!defined('ABSPATH')) {
-  exit;
-}
-
-function mobilizon_connector_activate() {
-	MobilizonConnector\Settings::setDefaultOptions();
-}
-register_activation_hook(__FILE__, 'mobilizon_connector_activate');
-
-function mobilizon_connector_initialize() {
-  MobilizonConnector\Settings::init();
-  MobilizonConnector\EventsListShortcut::init();
-}
-add_action('init', 'mobilizon_connector_initialize');
-
-function mobilizon_connector_load_scripts() {
-  wp_enqueue_script(MobilizonConnector\NAME . '-js', plugins_url('front/events-loader.js', __FILE__ ));
-}
-add_action('wp_enqueue_scripts', 'mobilizon_connector_load_scripts');
-
-function mobilizon_connector_register_events_list_widget() {
-  register_widget('MobilizonConnector\EventsListWidget');
-}
-add_action('widgets_init', 'mobilizon_connector_register_events_list_widget');

source/connector-mobilizon/front/events-displayer-test.js

@@ -1,61 +0,0 @@
-import test from 'ava'
-import { JSDOM } from 'jsdom'
-
-import { displayEvents, displayErrorMessage } from './events-displayer'
-
-let document
-
-test.before(() => {
-  document = new JSDOM().window.document
-})
-
-test.beforeEach(t => {
-  t.context.list = document.createElement('ul')
-  t.context.list.setAttribute('data-locale', 'en-GB')
-  t.context.list.setAttribute('data-maximum', '2')
-  t.context.list.setAttribute('data-time-zone', 'utc')
-  const listElement = document.createElement('li')
-  listElement.setAttribute('style', 'display: none;')
-  t.context.list.appendChild(listElement)
-})
-
-test('#displayEvents one event', t => {
-  const list = t.context.list
-  const data = {
-    events: {
-      elements: [
-        {
-          title: 'a',
-          url: 'b',
-          beginsOn: '2021-04-15T10:30:00Z',
-          endsOn: '2021-04-15T15:30:00Z',
-          physicalAddress: {
-            description: 'c',
-            locality: 'd'
-          }
-        }
-      ]
-    }
-  }
-  displayEvents({ data, document, list })
-  t.is(list.children.length, 2)
-  t.is(list.children[1].childNodes[0].tagName, 'A')
-  t.is(list.children[1].childNodes[0].getAttribute('href'), 'b')
-  t.is(list.children[1].childNodes[0].childNodes[0].nodeValue, 'a')
-  t.is(list.children[1].childNodes[1].tagName, 'BR')
-  t.is(list.children[1].childNodes[2].nodeValue, '15/04/2021 10:30 - 15:30')
-  t.is(list.children[1].childNodes[3].tagName, 'BR')
-  t.is(list.children[1].childNodes[4].nodeValue, 'c, d')
-})
-
-test('#displayErrorMessage no children added', t => {
-  const list = t.context.list
-  displayErrorMessage({ data: '', list })
-  t.is(list.children.length, 1)
-})
-
-test('#displayErrorMessage error message display', t => {
-  const list = t.context.list
-  displayErrorMessage({ data: '', list })
-  t.is(list.children[0].style.display, 'block')
-})

source/connector-mobilizon/front/formatter-test.js

@@ -1,37 +0,0 @@
-import test from 'ava'
-import Formatter from './formatter'
-
-test('#formatDate one date', t => {
-  const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-15T15:30:00Z' })
-  t.is(date, '15/04/2021 10:30 - 15:30')
-})
-
-test('#formatDate one date with short offset name', t => {
-  const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-15T15:30:00Z', isShortOffsetNameShown: true })
-  t.is(date, '15/04/2021 10:30 - 15:30 (UTC)')
-})
-
-test('#formatDate two dates', t => {
-  const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-16T15:30:00Z' })
-  t.is(date, '15/04/2021 10:30 - 16/04/2021 15:30')
-})
-
-test('#formatDate two dates with short offset name', t => {
-  const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-16T15:30:00Z', isShortOffsetNameShown: true })
-  t.is(date, '15/04/2021 10:30 (UTC) - 16/04/2021 15:30 (UTC)')
-})
-
-test('#formatLocation both parameters', t => {
-  const date = Formatter.formatLocation({ description: 'a', locality: 'b' })
-  t.is(date, 'a, b')
-})
-
-test('#formatLocation description only', t => {
-  const date = Formatter.formatLocation({ description: 'a' })
-  t.is(date, 'a')
-})
-
-test('#formatLocation locality only', t => {
-  const date = Formatter.formatLocation({ locality: 'a' })
-  t.is(date, 'a')
-})

source/connector-mobilizon/front/formatter.js

@@ -1,39 +0,0 @@
-import DateTimeWrapper from './date-time-wrapper'
-
-export default class Formatter {
-  
-  static formatDate({ locale, timeZone, start, end, isShortOffsetNameShown }) {
-    const startDateTime = new DateTimeWrapper({ locale, text: start, timeZone })
-    const endDateTime = new DateTimeWrapper({ locale, text: end, timeZone })
-    let dateText = startDateTime.getShortDate()
-    dateText += ' ' + startDateTime.get24Time()
-    if (!startDateTime.equalsDate(endDateTime)) {
-      if (isShortOffsetNameShown) {
-        dateText += ' (' + startDateTime.getShortOffsetName() + ')'
-      }
-      dateText += ' - '
-      dateText += endDateTime.getShortDate() + ' '
-    } else {
-      dateText += ' - '
-    }
-    dateText += endDateTime.get24Time()
-    if (isShortOffsetNameShown) {
-      dateText += ' (' + endDateTime.getShortOffsetName() + ')'
-    }
-    return dateText
-  }
-
-  static formatLocation({ description, locality }) {
-    let location = ''
-    if (description) {
-      location += description
-    }
-    if (location && locality) {
-      location += ', '
-    }
-    if (locality) {
-      location += locality
-    }
-    return location
-  }
-}

source/connector-mobilizon/front/object-hash-wrapper-test.js

@@ -1,6 +0,0 @@
-import test from 'ava'
-import hash from './object-hash-wrapper'
-
-test('#hash object', t => {
-  t.is(hash({foo: 'bar'}), 'a75c05bdca7d704bdfcd761913e5a4e4636e956b')
-})

source/front/date-time-wrapper-test.js

@@ -1,67 +1,76 @@
 import test from 'ava'
-import DateTimeWrapper from './date-time-wrapper'
+import DateTimeWrapper from './date-time-wrapper.js'
 
-test('#getShortDate usual date', t => {
+test('#getShortDate usual date', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   t.is(d.getShortDate(), '24/12/2020')
 })
 
-test('#getShortDate usual date with timezone string', t => {
-  const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: 'Europe/Rome' })
+test('#getShortDate usual date with timezone string', (t) => {
+  const d = new DateTimeWrapper({
+    text: '2020-12-24T16:45:00Z',
+    timeZone: 'Europe/Rome',
+  })
   t.is(d.getShortDate(), '24/12/2020')
 })
 
-test('#getShortDate usual date with fixed offset', t => {
-  const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: 'UTC+02:00' })
+test('#getShortDate usual date with fixed offset', (t) => {
+  const d = new DateTimeWrapper({
+    text: '2020-12-24T16:45:00Z',
+    timeZone: 'UTC+02:00',
+  })
   t.is(d.getShortDate(), '24/12/2020')
 })
 
-test('#getShortDate usual date with fixed offset without UTC prefix', t => {
-  const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: '+02:00' })
+test('#getShortDate usual date with fixed offset without UTC prefix', (t) => {
+  const d = new DateTimeWrapper({
+    text: '2020-12-24T16:45:00Z',
+    timeZone: '+02:00',
+  })
   t.is(d.getShortDate(), '24/12/2020')
 })
 
-test('#getShortDate usual date with empty time zone', t => {
+test('#getShortDate usual date with empty time zone', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: '' })
   t.is(d.getShortDate(), '24/12/2020')
 })
 
-test('#get24Time usual time', t => {
+test('#get24Time usual time', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   t.is(d.get24Time(), '16:45')
 })
 
-test('#equalsDate same date, different time', t => {
+test('#equalsDate same date, different time', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   const e = new DateTimeWrapper({ text: '2020-12-24T17:46:01Z' })
   t.true(d.equalsDate(e))
 })
 
-test('#equalsDate different date, different time', t => {
+test('#equalsDate different date, different time', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   const e = new DateTimeWrapper({ text: '2021-11-25T17:46:01Z' })
   t.false(d.equalsDate(e))
 })
 
-test('#equalsDate different day, different time', t => {
+test('#equalsDate different day, different time', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   const e = new DateTimeWrapper({ text: '2020-12-25T17:46:01Z' })
   t.false(d.equalsDate(e))
 })
 
-test('#equalsDate different month, different time', t => {
+test('#equalsDate different month, different time', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   const e = new DateTimeWrapper({ text: '2020-11-24T17:46:01Z' })
   t.false(d.equalsDate(e))
 })
 
-test('#equalsDate different year, different time', t => {
+test('#equalsDate different year, different time', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   const e = new DateTimeWrapper({ text: '2021-12-24T17:46:01Z' })
   t.false(d.equalsDate(e))
 })
 
-test('#getCurrentDatetimeAsString correct format', t => {
+test('#getCurrentDatetimeAsString correct format', (t) => {
   const d = DateTimeWrapper.getCurrentDatetimeAsString()
   t.is(d[4], '-')
   t.is(d[7], '-')
@@ -72,7 +81,7 @@ test('#getCurrentDatetimeAsString correct format', t => {
   t.is(d[d.length - 3], ':')
 })
 
-test('#getShortOffsetName usual time', t => {
+test('#getShortOffsetName usual time', (t) => {
   const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
   t.is(d.getShortOffsetName(), 'UTC')
 })

source/front/date-time-wrapper.js

@@ -1,12 +1,14 @@
 import { DateTime } from 'luxon'
 
 export default class DateTimeWrapper {
-
   constructor({ locale = 'en-GB', text, timeZone = 'utc' } = {}) {
     if (!timeZone) {
       timeZone = 'utc'
     }
-    if (timeZone.includes(':') && timeZone.substring(0, 3).toUpperCase() !== 'UTC') {
+    if (
+      timeZone.includes(':') &&
+      timeZone.substring(0, 3).toUpperCase() !== 'UTC'
+    ) {
       timeZone = 'UTC' + timeZone
     }
     this.dateTime = DateTime.fromISO(text, { locale, zone: timeZone })
@@ -25,11 +27,13 @@ export default class DateTimeWrapper {
   }
 
   equalsDate(other) {
-    return this.dateTime &&
+    return (
+      this.dateTime &&
       other.dateTime &&
       this.dateTime.day === other.dateTime.day &&
       this.dateTime.month === other.dateTime.month &&
       this.dateTime.year === other.dateTime.year
+    )
   }
 
   static getCurrentDatetimeAsString() {

source/front/events-displayer-test.js

@@ -0,0 +1,81 @@
+import test from 'ava'
+import { JSDOM } from 'jsdom'
+
+import { displayEvents, displayErrorMessage } from './events-displayer.js'
+
+let document
+
+test.before(() => {
+  document = new JSDOM().window.document
+})
+
+test.beforeEach((t) => {
+  t.context.list = document.createElement('ul')
+  t.context.list.setAttribute('data-locale', 'en-GB')
+  t.context.list.setAttribute('data-maximum', '2')
+  t.context.list.setAttribute('data-time-zone', 'utc')
+  const listElement = document.createElement('li')
+  listElement.setAttribute('style', 'display: none;')
+  t.context.list.appendChild(listElement)
+  const listElement2 = document.createElement('li')
+  listElement2.setAttribute('style', 'display: none;')
+  t.context.list.appendChild(listElement2)
+})
+
+test('#displayEvents one event', (t) => {
+  const list = t.context.list
+  const data = {
+    events: {
+      elements: [
+        {
+          title: 'a',
+          url: 'b',
+          beginsOn: '2021-04-15T10:30:00Z',
+          endsOn: '2021-04-15T15:30:00Z',
+          physicalAddress: {
+            description: 'c',
+            locality: 'd',
+          },
+        },
+      ],
+    },
+  }
+  displayEvents({ data, document, list })
+  t.is(list.children.length, 3)
+  t.is(list.children[2].childNodes[0].tagName, 'A')
+  t.is(list.children[2].childNodes[0].getAttribute('href'), 'b')
+  t.is(list.children[2].childNodes[0].childNodes[0].nodeValue, 'a')
+  t.is(list.children[2].childNodes[1].tagName, 'BR')
+  t.is(list.children[2].childNodes[2].nodeValue, '15/04/2021 10:30 - 15:30')
+  t.is(list.children[2].childNodes[3].tagName, 'BR')
+  t.is(list.children[2].childNodes[4].nodeValue, 'c, d')
+})
+
+test('#displayErrorMessage no children added', (t) => {
+  const list = t.context.list
+  displayErrorMessage({ data: '', list })
+  t.is(list.children.length, 2)
+})
+
+test('#displayErrorMessage error message display', (t) => {
+  const list = t.context.list
+  displayErrorMessage({ data: '', list })
+  t.is(list.children[0].style.display, 'block')
+  t.is(list.children[1].style.display, 'none')
+})
+
+test('#displayErrorMessage group not found error message display', (t) => {
+  const list = t.context.list
+  const data = {
+    response: {
+      errors: [
+        {
+          code: 'group_not_found',
+        },
+      ],
+    },
+  }
+  displayErrorMessage({ data, list })
+  t.is(list.children[0].style.display, 'none')
+  t.is(list.children[1].style.display, 'block')
+})

source/front/events-displayer.js

@@ -1,17 +1,25 @@
-import Formatter from './formatter'
-import { createAnchorElement } from './html-creator'
+import Formatter from './formatter.js'
+import { createAnchorElement } from './html-creator.js'
 
 export function displayEvents({ data, document, list }) {
   const locale = list.getAttribute('data-locale')
   const maxEventsCount = list.getAttribute('data-maximum')
   const timeZone = list.getAttribute('data-time-zone')
-  const isShortOffsetNameShown = list.hasAttribute('data-is-short-offset-name-shown')
-  const events = data.events ? data.events.elements : data.group.organizedEvents.elements
+  const isShortOffsetNameShown = list.hasAttribute(
+    'data-is-short-offset-name-shown'
+  )
+  const events = data.events
+    ? data.events.elements
+    : data.group.organizedEvents.elements
   const eventsCount = Math.min(maxEventsCount, events.length)
   for (let i = 0; i < eventsCount; i++) {
     const li = document.createElement('li')
 
-    const a = createAnchorElement({ document, text: events[i].title, url: events[i].url })
+    const a = createAnchorElement({
+      document,
+      text: events[i].title,
+      url: events[i].url,
+    })
     li.appendChild(a)
 
     const br = document.createElement('br')
@@ -30,7 +38,7 @@ export function displayEvents({ data, document, list }) {
     if (events[i].physicalAddress) {
       const location = Formatter.formatLocation({
         description: events[i].physicalAddress.description,
-        locality: events[i].physicalAddress.locality
+        locality: events[i].physicalAddress.locality,
       })
       if (location) {
         const brBeforeLocation = document.createElement('br')
@@ -47,5 +55,15 @@ export function displayEvents({ data, document, list }) {
 
 export function displayErrorMessage({ data, list }) {
   console.error(data)
+  if (
+    Object.prototype.hasOwnProperty.call(data, 'response') &&
+    Object.prototype.hasOwnProperty.call(data.response, 'errors') &&
+    data.response.errors.length > 0 &&
+    Object.prototype.hasOwnProperty.call(data.response.errors[0], 'code') &&
+    data.response.errors[0].code === 'group_not_found'
+  ) {
+    list.children[1].style.display = 'block'
+  } else {
     list.children[0].style.display = 'block'
   }
+}

source/front/events-loader.js

@@ -1,11 +1,11 @@
-import { displayEvents, displayErrorMessage } from './events-displayer'
-import * as GraphqlWrapper from './graphql-wrapper'
+import { displayEvents, displayErrorMessage } from './events-displayer.js'
+import * as GraphqlWrapper from './graphql-wrapper.js'
 
 const NAME = '<wordpress-name>'
 
 document.addEventListener('DOMContentLoaded', () => {
   const eventLists = document.getElementsByClassName(NAME + '_events-list')
-  for (let list of eventLists) {
+  for (const list of eventLists) {
     const url = list.getAttribute('data-url') + '/api'
     const limit = parseInt(list.getAttribute('data-maximum'))
     const groupName = list.getAttribute('data-group-name')

source/front/formatter-test.js

@@ -0,0 +1,73 @@
+import test from 'ava'
+import Formatter from './formatter.js'
+
+test('#formatDate one date', (t) => {
+  const date = Formatter.formatDate({
+    start: '2021-04-15T10:30:00Z',
+    end: '2021-04-15T15:30:00Z',
+  })
+  t.is(date, '15/04/2021 10:30 - 15:30')
+})
+
+test('#formatDate one date with short offset name', (t) => {
+  const date = Formatter.formatDate({
+    start: '2021-04-15T10:30:00Z',
+    end: '2021-04-15T15:30:00Z',
+    isShortOffsetNameShown: true,
+  })
+  t.is(date, '15/04/2021 10:30 - 15:30 (UTC)')
+})
+
+test('#formatDate two dates', (t) => {
+  const date = Formatter.formatDate({
+    start: '2021-04-15T10:30:00Z',
+    end: '2021-04-16T15:30:00Z',
+  })
+  t.is(date, '15/04/2021 10:30 - 16/04/2021 15:30')
+})
+
+test('#formatDate two dates with short offset name', (t) => {
+  const date = Formatter.formatDate({
+    start: '2021-04-15T10:30:00Z',
+    end: '2021-04-16T15:30:00Z',
+    isShortOffsetNameShown: true,
+  })
+  t.is(date, '15/04/2021 10:30 - 16/04/2021 15:30 (UTC)')
+})
+
+test('#formatDate second date is null', (t) => {
+  const date = Formatter.formatDate({
+    start: '2021-04-15T10:30:00Z',
+    end: null,
+  })
+  t.is(date, '15/04/2021 10:30')
+})
+
+test('#formatDate second date is null with short offset name', (t) => {
+  const date = Formatter.formatDate({
+    start: '2021-04-15T10:30:00Z',
+    end: null,
+    isShortOffsetNameShown: true,
+  })
+  t.is(date, '15/04/2021 10:30 (UTC)')
+})
+
+test('#formatLocation both parameters', (t) => {
+  const location = Formatter.formatLocation({ description: 'a', locality: 'b' })
+  t.is(location, 'a, b')
+})
+
+test('#formatLocation description only', (t) => {
+  const location = Formatter.formatLocation({ description: 'a' })
+  t.is(location, 'a')
+})
+
+test('#formatLocation description with space only', (t) => {
+  const location = Formatter.formatLocation({ description: ' ' })
+  t.is(location, '')
+})
+
+test('#formatLocation locality only', (t) => {
+  const location = Formatter.formatLocation({ locality: 'a' })
+  t.is(location, 'a')
+})

source/front/formatter.js

@@ -0,0 +1,45 @@
+import DateTimeWrapper from './date-time-wrapper.js'
+
+export default class Formatter {
+  static formatDate({ locale, timeZone, start, end, isShortOffsetNameShown }) {
+    const startDateTime = new DateTimeWrapper({
+      locale,
+      text: start,
+      timeZone,
+    })
+    let dateText = startDateTime.getShortDate()
+    dateText += ' ' + startDateTime.get24Time()
+    if (!end && isShortOffsetNameShown) {
+      dateText += ' (' + startDateTime.getShortOffsetName() + ')'
+    }
+
+    if (end) {
+      const endDateTime = new DateTimeWrapper({ locale, text: end, timeZone })
+      if (!startDateTime.equalsDate(endDateTime)) {
+        dateText += ' - '
+        dateText += endDateTime.getShortDate() + ' '
+      } else {
+        dateText += ' - '
+      }
+      dateText += endDateTime.get24Time()
+      if (isShortOffsetNameShown) {
+        dateText += ' (' + endDateTime.getShortOffsetName() + ')'
+      }
+    }
+    return dateText
+  }
+
+  static formatLocation({ description, locality }) {
+    let location = ''
+    if (description && description.trim()) {
+      location += description.trim()
+    }
+    if (location && locality) {
+      location += ', '
+    }
+    if (locality) {
+      location += locality
+    }
+    return location
+  }
+}

source/front/graphql-wrapper.js

@@ -1,6 +1,6 @@
-import SessionCache from './session-cache'
+import SessionCache from './session-cache.js'
 import { request } from 'graphql-request'
-import DateTimeWrapper from './date-time-wrapper'
+import DateTimeWrapper from './date-time-wrapper.js'
 
 export function getUpcomingEvents({ url, limit }) {
   const query = `
@@ -21,11 +21,15 @@ export function getUpcomingEvents({ url, limit }) {
       }
     }
   `
-  const dataInCache = SessionCache.get(sessionStorage, { url, query, variables: { limit }})
-  if (dataInCache !== null)
+  const dataInCache = SessionCache.get(sessionStorage, {
+    url,
+    query,
+    variables: { limit },
+  })
+  if (dataInCache !== null) {
     return Promise.resolve(dataInCache)
-  return request(url, query, { limit })
-    .then((data) => {
+  }
+  return request(url, query, { limit }).then((data) => {
     SessionCache.add(sessionStorage, { url, query, variables: { limit } }, data)
     return Promise.resolve(data)
   })
@@ -53,12 +57,22 @@ export function getUpcomingEventsByGroupName({ url, limit, groupName }) {
     }
   `
   const afterDatetime = DateTimeWrapper.getCurrentDatetimeAsString()
-  const dataInCache = SessionCache.get(sessionStorage, { url, query, variables: { afterDatetime, groupName, limit }})
-  if (dataInCache !== null)
-    return Promise.resolve(dataInCache)
-  return request(url, query, { afterDatetime, groupName, limit })
-    .then((data) => {
-      SessionCache.add(sessionStorage, { url, query, variables: { afterDatetime, groupName, limit }}, data)
-      return Promise.resolve(data)
+  const dataInCache = SessionCache.get(sessionStorage, {
+    url,
+    query,
+    variables: { afterDatetime, groupName, limit },
   })
+  if (dataInCache !== null) {
+    return Promise.resolve(dataInCache)
+  }
+  return request(url, query, { afterDatetime, groupName, limit }).then(
+    (data) => {
+      SessionCache.add(
+        sessionStorage,
+        { url, query, variables: { afterDatetime, groupName, limit } },
+        data
+      )
+      return Promise.resolve(data)
+    }
+  )
 }

source/front/html-creator-test.js

@@ -1,7 +1,7 @@
 import test from 'ava'
 import { JSDOM } from 'jsdom'
 
-import { createAnchorElement } from './html-creator'
+import { createAnchorElement } from './html-creator.js'
 
 let document
 
@@ -9,7 +9,7 @@ test.beforeEach(() => {
   document = new JSDOM().window.document
 })
 
-test('#createAnchorElement usual parameters', t => {
+test('#createAnchorElement usual parameters', (t) => {
   const a = createAnchorElement({ document, text: 'a', url: 'b' })
   t.is(a.tagName, 'A')
   t.is(a.innerHTML, 'a')

source/front/object-hash-wrapper-test.js

@@ -0,0 +1,6 @@
+import test from 'ava'
+import hash from './object-hash-wrapper.js'
+
+test('#hash object', (t) => {
+  t.is(hash({ foo: 'bar' }), 'a75c05bdca7d704bdfcd761913e5a4e4636e956b')
+})

source/front/session-cache-test.js

@@ -1,8 +1,7 @@
 import test from 'ava'
-import SessionCache from './session-cache'
+import SessionCache from './session-cache.js'
 
 const fakeStorage = {
-
   elements: {},
 
   clear() {
@@ -17,18 +16,18 @@ const fakeStorage = {
 
   setItem(key, value) {
     this.elements[key] = value
-  }
+  },
 }
 
 test.afterEach(() => {
   fakeStorage.clear()
 })
 
-test('#add & #get', t => {
+test('#add & #get', (t) => {
   SessionCache.add(fakeStorage, { a: 'b' }, { c: 'd' })
   t.deepEqual(SessionCache.get(fakeStorage, { a: 'b' }), { c: 'd' })
 })
 
-test('#get no entry', t => {
+test('#get no entry', (t) => {
   t.is(SessionCache.get(fakeStorage, { a: 'bb' }), null)
 })

source/front/session-cache.js

@@ -1,9 +1,8 @@
-import hash from './object-hash-wrapper'
+import hash from './object-hash-wrapper.js'
 
 const MAX_AGE_IN_MS = 120000
 
 export default class SessionCache {
-
   static add(storage, parameters, data) {
     const key = hash(parameters)
     const timestamp = Date.now()
@@ -17,7 +16,11 @@ export default class SessionCache {
   static get(storage, parameters) {
     const key = hash(parameters)
     const value = JSON.parse(storage.getItem(key))
-    if (value && value.timestamp && value.timestamp > Date.now() - MAX_AGE_IN_MS)
+    if (
+      value &&
+      value.timestamp &&
+      value.timestamp > Date.now() - MAX_AGE_IN_MS
+    )
       return value.data
     return null
   }

source/readme.txt

@@ -36,6 +36,28 @@ The source code is available on [Github](https://github.com/dwaxweiler/connector
 
 ## Changelog
 
+### [0.8.0] - 2022-01-09
+#### Added
+- Add support for older browsers using babel
+#### Changed
+- Confirm compatibility with WordPress 5.9
+- Update dependencies
+#### Fixed
+- Use ES modules correctly
+- Trim events' location
+
+### [0.7.0] - 2021-12-23
+#### Added
+- Add specific error message for the case the group is not found
+- Add code formatter prettier
+#### Changed
+- Update dependencies
+- Simplify build process
+#### Fixed
+- Fix Invalid DateTime on event end time being null
+#### Security
+- Set minimum PHP version to oldest stable 7.4
+
 ### [0.6.2] - 2021-08-24
 #### Changed
 - Update dependencies

source/view/events-list.php

@@ -12,4 +12,5 @@ if (!defined('ABSPATH')) {
   data-time-zone="<?php echo esc_attr($timeZone); ?>"
   <?php echo $isShortOffsetNameShown ? 'data-is-short-offset-name-shown' : ''; ?>>
   <li style="display: none;"><?php esc_html_e('The events could not be loaded!', 'connector-mobilizon'); ?></li>
+  <li style="display: none;"><?php esc_html_e('The group could not be found!', 'connector-mobilizon'); ?></li>
 </ul>

webpack.config.cjs

@@ -0,0 +1,44 @@
+/* eslint-disable no-undef */
+const path = require('path')
+
+const CopyPlugin = require('copy-webpack-plugin')
+
+const FOLDER_SOURCE = './source'
+
+module.exports = {
+  entry: FOLDER_SOURCE + '/front/events-loader.js',
+  output: {
+    filename: 'events-loader.js',
+    path: path.resolve(__dirname, 'build/' + '/front'),
+  },
+  module: {
+    rules: [
+      {
+        test: /\.m?js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: [['@babel/preset-env', { targets: 'defaults' }]],
+          },
+        },
+      },
+    ],
+  },
+  plugins: [
+    new CopyPlugin({
+      patterns: [
+        {
+          context: FOLDER_SOURCE,
+          from: '**/*.php',
+          to: '../',
+        },
+        {
+          context: FOLDER_SOURCE,
+          from: '**/*.txt',
+          to: '../',
+        },
+      ],
+    }),
+  ],
+}