[gis_web] Uses TrustedTypes from pkg web.

packages/google_identity_services_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.1+1
+
+* Uses `TrustedTypes` from `web: ^0.5.1`.
+
 ## 0.3.1
 
 * Updates web code to package `web: ^0.5.0`.

packages/google_identity_services_web/example/pubspec.yaml

@@ -3,16 +3,16 @@ description: An example for the google_identity_services_web package, OneTap.
 publish_to: 'none'
 
 environment:
-  flutter: ">=3.16.0"
-  sdk: ">=3.2.0 <4.0.0"
+  sdk: ^3.3.0
+  flutter: ">=3.19.0"
 
 dependencies:
   flutter:
     sdk: flutter
   google_identity_services_web:
     path: ../
   http: ">=0.13.0 <2.0.0"
-  web: ^0.5.0
+  web: ^0.5.1
 
 dev_dependencies:
   build_runner: ^2.1.10 # To extract README excerpts only.

packages/google_identity_services_web/lib/src/js_interop/package_web_tweaks.dart

@@ -17,60 +17,20 @@ extension NullableTrustedTypesGetter on web.Window {
   ///
   /// See: https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API
   @JS('trustedTypes')
-  external TrustedTypePolicyFactory? get nullableTrustedTypes;
-
-  /// Bindings to window.trustedTypes.
-  ///
-  /// This will crash if accessed in a browser that doesn't support the
-  /// Trusted Types API.
-  ///
-  /// See: https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API
-  @JS('trustedTypes')
-  external TrustedTypePolicyFactory get trustedTypes;
+  external web.TrustedTypePolicyFactory? get nullableTrustedTypes;
 }
 
-/// This extension allows setting a TrustedScriptURL as the src of a script element,
-/// which currently only accepts a string.
+/// Allows setting a TrustedScriptURL as the src of a script element.
 extension TrustedTypeSrcAttribute on web.HTMLScriptElement {
   @JS('src')
-  external set trustedSrc(TrustedScriptURL value);
-}
-
-// TODO(kevmoo): drop all of this once `pkg:web` publishes `0.5.1`.
-
-/// Bindings to a JS TrustedScriptURL.
-///
-/// See: https://developer.mozilla.org/en-US/docs/Web/API/TrustedScriptURL
-extension type TrustedScriptURL._(JSObject _) implements JSObject {}
-
-/// Bindings to a JS TrustedTypePolicyFactory.
-///
-/// See: https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory
-extension type TrustedTypePolicyFactory._(JSObject _) implements JSObject {
-  ///
-  external TrustedTypePolicy createPolicy(
-    String policyName, [
-    TrustedTypePolicyOptions policyOptions,
-  ]);
+  external set trustedSrc(web.TrustedScriptURL value);
 }
 
-/// Bindings to a JS TrustedTypePolicy.
-///
-/// See: https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicy
-extension type TrustedTypePolicy._(JSObject _) implements JSObject {
-  ///
+/// Allows creating a script URL only from a string, with no arguments.
+extension CreateScriptUrlNoArgs on web.TrustedTypePolicy {
+  /// Allows calling `createScriptURL` with only the `input` argument.
   @JS('createScriptURL')
-  external TrustedScriptURL createScriptURLNoArgs(
+  external web.TrustedScriptURL createScriptURLNoArgs(
     String input,
   );
 }
-
-/// Bindings to a JS TrustedTypePolicyOptions (anonymous).
-///
-/// See: https://developer.mozilla.org/en-US/docs/Web/API/TrustedTypePolicyFactory/createPolicy#policyoptions
-extension type TrustedTypePolicyOptions._(JSObject _) implements JSObject {
-  ///
-  external factory TrustedTypePolicyOptions({
-    JSFunction createScriptURL,
-  });
-}

packages/google_identity_services_web/lib/src/js_loader.dart

@@ -25,15 +25,15 @@ Future<void> loadWebSdk({
   onGoogleLibraryLoad = () => completer.complete();
 
   // If TrustedTypes are available, prepare a trusted URL.
-  TrustedScriptURL? trustedUrl;
+  web.TrustedScriptURL? trustedUrl;
   if (web.window.nullableTrustedTypes != null) {
     web.console.debug(
       'TrustedTypes available. Creating policy: $trustedTypePolicyName'.toJS,
     );
     try {
-      final TrustedTypePolicy policy = web.window.trustedTypes.createPolicy(
+      final web.TrustedTypePolicy policy = web.window.trustedTypes.createPolicy(
           trustedTypePolicyName,
-          TrustedTypePolicyOptions(
+          web.TrustedTypePolicyOptions(
             createScriptURL: ((JSString url) => _url).toJS,
           ));
       trustedUrl = policy.createScriptURLNoArgs(_url);

packages/google_identity_services_web/pubspec.yaml

@@ -2,14 +2,14 @@ name: google_identity_services_web
 description: A Dart JS-interop layer for Google Identity Services. Google's new sign-in SDK for Web that supports multiple types of credentials.
 repository: https://github.com/flutter/packages/tree/main/packages/google_identity_services_web
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+google_identiy_services_web%22
-version: 0.3.1
+version: 0.3.1+1
 
 environment:
   sdk: ^3.3.0
 
 dependencies:
   meta: ^1.3.0
-  web: ^0.5.0
+  web: ^0.5.1
 
 dev_dependencies:
   path: ^1.8.1