Move to and support ESM

.eslintrc.yml

@@ -223,12 +223,13 @@ globals:
   ARGV: readonly
   Debugger: readonly
   GIRepositoryGType: readonly
+  globalThis: readonly
   imports: readonly
   Intl: readonly
   log: readonly
   logError: readonly
   print: readonly
   printerr: readonly
-  window: readonly
 parserOptions:
   ecmaVersion: 2020
+  sourceType: module

bin/jasmine-runner.in

@@ -1,8 +1,8 @@
-#!/usr/bin/env gjs
+#!/usr/bin/env -S gjs -m
 
 /* global jasmineImporter */
 
-const {GLib} = imports.gi;
+import GLib from 'gi://GLib';
 
 // Create a separate GJS importer object for Jasmine modules, so that Jasmine's
 // modules are not exposed to test code (e.g. client code might have its own
@@ -13,30 +13,29 @@ const {GLib} = imports.gi;
 // registers a GType, and we cannot register two GTypes with the same name in
 // the same process.
 
+let base;
 if (GLib.getenv('JASMINE_UNINSTALLED')) {
     // Trick to use the uninstalled copy of Jasmine when running "make check".
     const srcdir = GLib.getenv('SRCDIR');
-    window.jasmineImporter = imports['.'];
+    globalThis.jasmineImporter = imports['.'];
     jasmineImporter.searchPath = [
-        GLib.build_filenamev([srcdir, 'src']),
         GLib.build_filenamev([srcdir, 'lib']),
     ];
+    base = `file://${GLib.build_filenamev([srcdir, 'src'])}`;
 } else {
     const oldSearchPath = imports.searchPath.slice();  // make a copy
     imports.searchPath.unshift('@datadir@');
-    window.jasmineImporter = imports['jasmine-gjs'];
+    globalThis.jasmineImporter = imports['jasmine-gjs'];
     imports.searchPath = oldSearchPath;
+    base = 'file://@datadir@/jasmine-gjs';
 }
 
-const Command = jasmineImporter.command;
-const Timer = jasmineImporter.timer;
-const JasmineBoot = jasmineImporter.jasmineBoot;
-
-Timer.installAPI(window);
+const Command = await import(`${base}/command.js`);
+const JasmineBoot = await import(`${base}/jasmineBoot.js`);
 
 // Do not conflict with global "jasmine" object
 const _jasmine = new JasmineBoot.Jasmine();
-_jasmine.installAPI(window);
+_jasmine.installAPI(globalThis);
 
 // Don't put any code after this; the return value is used as the exit code.
-Command.run(_jasmine, ARGV, 10);
+await Command.run(_jasmine, ARGV, 10);

bin/jasmine.in

@@ -1,21 +1,22 @@
-#!/usr/bin/env gjs
+#!/usr/bin/env -S gjs -m
 
-const {GLib} = imports.gi;
-const System = imports.system;
+import GLib from 'gi://GLib';
+import * as System from 'system';
 
 let runnerPath = '@pkglibexecdir@/jasmine-runner';
+let base;
 if (GLib.getenv('JASMINE_UNINSTALLED')) {
     // Trick to use the uninstalled copy of Jasmine when running "make check".
     const srcdir = GLib.getenv('SRCDIR');
-    imports.searchPath.unshift(GLib.build_filenamev([srcdir, 'src']));
+    base = `file://${GLib.build_filenamev([srcdir, 'src'])}`;
     const builddir = GLib.getenv('BUILDDIR');
     runnerPath = GLib.build_filenamev([builddir, 'jasmine-runner']);
 } else {
-    imports.searchPath.unshift('@datadir@/jasmine-gjs');
+    base = 'file://@datadir@/jasmine-gjs';
 }
 
-const Config = imports.config;
-const Options = imports.options;
+const Config = await import(`${base}/config.js`);
+const Options = await import(`${base}/options.js`);
 
 const [files, options] = Options.parseOptions(ARGV);