[gjs: 4/4] Merge branch 'better-version-check' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 782afd8f35bfb5de9e63e343a82679a7d58613f7
Merge: 469b38f3 1d53bb83
Author: Philip Chimento <philip chimento gmail com>
Date:   Thu Aug 5 03:59:08 2021 +0000

    Merge branch 'better-version-check' into 'master'
    
    esm/gi: Improve check for version conflicts
    
    See merge request GNOME/gjs!650

 gi/ns.cpp                           |  8 ++++++++
 installed-tests/js/testESModules.js |  4 ++++
 modules/esm/gi.js                   | 15 ++++++++-------
 modules/internal/loader.js          | 17 +----------------
 4 files changed, 21 insertions(+), 23 deletions(-)
---