update to test new module import

Author: tmthecoder

dargon2_flutter/dargon2_flutter/pubspec.yaml

@@ -32,7 +32,8 @@ dependencies:
   dargon2_flutter_platform_interface: '^3.1.0'
   dargon2_flutter_mobile: '^3.1.0'
   dargon2_flutter_desktop: '^3.1.0'
-  dargon2_flutter_web: '^3.1.0'
+  dargon2_flutter_web:
+    path: ../dargon2_flutter_web
   dargon2_interface: '^1.1.0'
 
 

dargon2_flutter/dargon2_flutter_web/lib/src/argon2.dart

@@ -27,16 +27,12 @@ class DArgon2FlutterWeb extends DArgon2Platform {
 
   /// The static hashwasm URL to use when getting the script.
   static const hashwasm =
-      "https://cdn.jsdelivr.net/npm/hash-wasm@4.8.0/dist/argon2.umd.min";
+      "https://cdn.jsdelivr.net/npm/hash-wasm@4.9.0/+esm";
 
   /// The [DArgon2FlutterWeb] constructor. Needed to set the global hashwasm
   /// variable to the right script.
   DArgon2FlutterWeb() {
-    if (context['require'] != null) {
-      _registerRequire();
-    } else {
-      _registerNormal();
-    }
+    _registerDependency();
   }
 
   @override
@@ -110,52 +106,46 @@ class DArgon2FlutterWeb extends DArgon2Platform {
     return current;
   }
 
-  /// Registers the hashwasm argon2 implementation in release or script-loaded
-  /// environments by adding a script tag with the dependency.
-  void _registerNormal() async {
-    print("NORMAL");
-    // Create the script element
-    ScriptElement script = ScriptElement();
-    script.type = "text/javascript";
-    script.charset = "utf-8";
-    script.async = true;
-    script.src = "$hashwasm.js";
-    // Add it to the document head
-    assert(document.head != null);
-    document.head!.append(script);
-    // await its load
-    await script.onLoad.first;
-  }
-
   /// Registers the hashwasm argon2 implementation in debug or requirejs loaded
   /// environments as adding the script tag would not suffice then.
   ///
   /// Adds it as a require.js dependency and sets the global hashwasm variable
   /// to the require app.
-  void _registerRequire() async {
+  void _registerDependency() async {
     // Make sure it's not already there
     if (context['hashwasm'] != null) return;
-    // Get the require object
-    JsObject require = JsObject.fromBrowserObject(context['require']);
-    // Add the script to the config
-    require.callMethod('config', [
-      JsObject.jsify({
-        'paths': {"hashwasm": hashwasm}
-      })
-    ]);
+
+    String windowVar = "hashwasm";
+
+    ScriptElement script = ScriptElement();
+    script.type = 'text/javascript';
+    script.crossOrigin = 'anonymous';
+    script.text = '''
+      window.trigger_$windowVar = async (callback) => {
+        let {argon2i, argon2d, argon2id} = await import($hashwasm);
+        callback([argon2i, argon2d, argon2id]);
+      };
+    ''';
+
+    assert(document.head != null);
+    document.head!.append(script);
     Completer completer = Completer();
-    List<String> services = ['hashwasm'];
-    // Load the script
-    context.callMethod('require', [
-      JsObject.jsify(services),
-      (app) {
-        // Set it to the global variable
-        context['hashwasm'] = app;
+
+    context.callMethod('trigger_$windowVar', [
+          (module) {
+        context[windowVar] = JsObject.jsify({
+          "argon2i": module[0],
+          "argon2d": module[1],
+          "argon2id": module[2],
+        });
+        context.deleteProperty('trigger_$windowVar');
         completer.complete();
       }
     ]);
+
     await completer.future;
   }
+
 }
 
 /// JS interop binding to call the hashwasm argon2i hash function.

dargon2_flutter/dargon2_flutter_web/pubspec.yaml

@@ -20,7 +20,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.0
+  flutter_lints: ^2.0.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec