Revert "[web] Access engine version to get correct gstatic URL (#40194)"

ci/licenses_golden/excluded_files

@@ -408,7 +408,6 @@
 ../../../flutter/third_party/web_locale_keymap/README.md
 ../../../flutter/third_party/web_locale_keymap/pubspec.yaml
 ../../../flutter/third_party/web_locale_keymap/test
-../../../flutter/third_party/web_sdk_version/pubspec.yaml
 ../../../flutter/third_party/web_test_fonts/pubspec.yaml
 ../../../flutter/third_party/web_unicode/README.md
 ../../../flutter/third_party/web_unicode/pubspec.yaml

ci/licenses_golden/licenses_flutter

@@ -680,7 +680,6 @@ LIBRARY: engine
 LIBRARY: spring_animation
 LIBRARY: tonic
 LIBRARY: txt
-LIBRARY: web_sdk_version
 LIBRARY: web_test_fonts
 LIBRARY: web_unicode
 ORIGIN: ../../../flutter/LICENSE
@@ -3168,8 +3167,6 @@ ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_fuchsia.cc + ../../../
 ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_linux.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_mac.mm + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/third_party/txt/src/txt/platform_windows.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/third_party/web_sdk_version/lib/web_sdk_version.dart + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/third_party/web_sdk_version/lib/web_sdk_version/web_sdk_version.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts/web_test_fonts.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/third_party/web_unicode/lib/web_unicode.dart + ../../../flutter/LICENSE
@@ -5718,8 +5715,6 @@ FILE: ../../../flutter/third_party/txt/src/txt/platform_fuchsia.cc
 FILE: ../../../flutter/third_party/txt/src/txt/platform_linux.cc
 FILE: ../../../flutter/third_party/txt/src/txt/platform_mac.mm
 FILE: ../../../flutter/third_party/txt/src/txt/platform_windows.cc
-FILE: ../../../flutter/third_party/web_sdk_version/lib/web_sdk_version.dart
-FILE: ../../../flutter/third_party/web_sdk_version/lib/web_sdk_version/web_sdk_version.dart
 FILE: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts.dart
 FILE: ../../../flutter/third_party/web_test_fonts/lib/web_test_fonts/web_test_fonts.dart
 FILE: ../../../flutter/third_party/web_unicode/lib/web_unicode.dart

lib/web_ui/lib/src/engine/configuration.dart

@@ -46,11 +46,14 @@ library configuration;
 
 import 'package:js/js.dart';
 import 'package:meta/meta.dart';
-import 'package:web_sdk_version/web_sdk_version.dart';
-
 import 'canvaskit/renderer.dart';
 import 'dom.dart';
 
+/// The version of CanvasKit used by the web engine by default.
+// DO NOT EDIT THE NEXT LINE OF CODE MANUALLY
+// See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
+const String _canvaskitVersion = '0.38.0';
+
 /// The Web Engine configuration for the current application.
 FlutterConfiguration get configuration =>
   _configuration ??= FlutterConfiguration.legacy(_jsConfiguration);
@@ -179,7 +182,7 @@ class FlutterConfiguration {
   String get canvasKitBaseUrl => _configuration?.canvasKitBaseUrl ?? _defaultCanvasKitBaseUrl;
   static const String _defaultCanvasKitBaseUrl = String.fromEnvironment(
     'FLUTTER_WEB_CANVASKIT_URL',
-    defaultValue: 'https://gstatic.com/flutter-canvaskit/$flutterWebSdkVersion/'
+    defaultValue: 'https://unpkg.com/canvaskit-wasm@$_canvaskitVersion/bin/',
   );
 
   /// The variant of CanvasKit to download.

lib/web_ui/pubspec.yaml

@@ -17,9 +17,6 @@ dependencies:
   web_test_fonts:
     path: ../../third_party/web_test_fonts
 
-  web_sdk_version:
-    path: ../../third_party/web_sdk_version
-
 dev_dependencies:
   analyzer: 5.2.0
   archive: 3.1.2

web_sdk/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//flutter/build/zip_bundle.gni")
 import("//flutter/common/config.gni")
-import("//flutter/shell/version/version.gni")
 import("//third_party/dart/build/dart/dart_action.gni")
 
 dart_sdk_package_config = "//third_party/dart/.dart_tool/package_config.json"
@@ -25,7 +24,6 @@ web_engine_libraries = [
   ":web_unicode_library",
   ":web_test_fonts_library",
   ":web_locale_keymap_library",
-  ":web_sdk_version_library",
 ]
 
 group("web_sdk") {
@@ -153,14 +151,6 @@ sdk_rewriter("web_locale_keymap_library") {
   output_dir = "$root_out_dir/flutter_web_sdk/lib/_web_locale_keymap/"
 }
 
-generated_file("web_sdk_version_library") {
-  outputs = [
-    "$root_out_dir/flutter_web_sdk/lib/_web_sdk_version/web_sdk_version.dart",
-  ]
-
-  contents = "// Copyright 2013 The Flutter Authors. All rights reserved.$0x0A// Use of this source code is governed by a BSD-style license that can be$0x0A// found in the LICENSE file.$0x0A$0x0A@JS()$0x0Alibrary dart._web_sdk_version;$0x0A$0x0Aimport 'dart:_js_annotations';$0x0A$0x0Aconst String flutterWebSdkVersion = '$engine_version';$0x0A"
-}
-
 copy("web_ui_library") {
   sources = [ "//flutter/web_sdk/libraries.json" ]
 
@@ -324,8 +314,6 @@ template("_compile_platform") {
       "dart:_web_unicode",
       "--source",
       "dart:_web_locale_keymap",
-      "--source",
-      "dart:_web_sdk_version",
     ]
     if (flutter_prebuilt_dart_sdk) {
       args += [

web_sdk/libraries.json

@@ -26,9 +26,6 @@
       },
       "_web_test_fonts": {
         "uri": "lib/_web_test_fonts/web_test_fonts.dart"
-      },
-      "_web_sdk_version": {
-        "uri": "lib/_web_sdk_version/web_sdk_version.dart"
       }
     }
   },
@@ -57,9 +54,6 @@
       },
       "_web_test_fonts": {
         "uri": "lib/_web_test_fonts/web_test_fonts.dart"
-      },
-      "_web_sdk_version": {
-        "uri": "lib/_web_sdk_version/web_sdk_version.dart"
       }
     }
   },
@@ -88,9 +82,6 @@
       },
       "_web_test_fonts": {
         "uri": "lib/_web_test_fonts/web_test_fonts.dart"
-      },
-      "_web_sdk_version": {
-        "uri": "lib/_web_sdk_version/web_sdk_version.dart"
       }
     }
   }

web_sdk/libraries.yaml

@@ -36,9 +36,6 @@ dartdevc:
     _web_test_fonts:
       uri: "lib/_web_test_fonts/web_test_fonts.dart"
 
-    _web_sdk_version:
-      uri: "lib/_web_sdk_version/web_sdk_version.dart"
-
 dart2js:
   include:
     - {path: "../dart-sdk/lib/libraries.json", target: dart2js}
@@ -62,9 +59,6 @@ dart2js:
     _web_test_fonts:
       uri: "lib/_web_test_fonts/web_test_fonts.dart"
 
-    _web_sdk_version:
-      uri: "lib/_web_sdk_version/web_sdk_version.dart"
-
 wasm:
   include:
     - {path: "../dart-sdk/lib/libraries.json", target: wasm}
@@ -87,6 +81,3 @@ wasm:
 
     _web_test_fonts:
       uri: "lib/_web_test_fonts/web_test_fonts.dart"
-
-    _web_sdk_version:
-      uri: "lib/_web_sdk_version/web_sdk_version.dart"

web_sdk/sdk_rewriter.dart

@@ -96,7 +96,6 @@ final Map<Pattern, String> extraImportsMap = <Pattern, String>{
   'web_unicode': "import 'dart:_web_unicode';",
   'web_test_fonts': "import 'dart:_web_test_fonts';",
   'web_locale_keymap': "import 'dart:_web_locale_keymap' as locale_keymap;",
-  'web_sdk_version': "import 'dart:_web_sdk_version';",
 };
 
 // Rewrites the "package"-style web ui library into a dart:ui implementation.

web_sdk/test/sdk_rewriter_test.dart

@@ -132,28 +132,24 @@ void printSomething() {
       "import 'dart:_web_unicode';",
       "import 'dart:_web_test_fonts';",
       "import 'dart:_web_locale_keymap' as locale_keymap;",
-      "import 'dart:_web_sdk_version';",
     ]);
     expect(getExtraImportsForLibrary('skwasm_stub'), <String>[
       "import 'dart:_engine';",
       "import 'dart:_web_unicode';",
       "import 'dart:_web_test_fonts';",
       "import 'dart:_web_locale_keymap' as locale_keymap;",
-      "import 'dart:_web_sdk_version';",
     ]);
     expect(getExtraImportsForLibrary('skwasm_impl'), <String>[
       "import 'dart:_engine';",
       "import 'dart:_web_unicode';",
       "import 'dart:_web_test_fonts';",
       "import 'dart:_web_locale_keymap' as locale_keymap;",
-      "import 'dart:_web_sdk_version';",
       "import 'dart:ffi';",
     ]);
 
     // Other libraries (should not have extra imports).
     expect(getExtraImportsForLibrary('web_unicode'), isEmpty);
     expect(getExtraImportsForLibrary('web_test_fonts'), isEmpty);
     expect(getExtraImportsForLibrary('web_locale_keymap'), isEmpty);
-    expect(getExtraImportsForLibrary('web_sdk_version'), isEmpty);
   });
 }