Merge branch 'main' into feature/analyzer-6-0-0

.cloud_build/dart_pad.yaml

@@ -9,4 +9,4 @@ steps:
     dir: pkgs/dart_pad
   - name: gcr.io/$PROJECT_ID/firebase
     args: ['deploy', '--project=$PROJECT_ID', '--only=hosting']
-    dir: pkgs/dart_pad
+    dir: pkgs/dart_pad

.cloud_build/flutter/Dockerfile

@@ -64,4 +64,4 @@ RUN flutter upgrade
 # Perform an artifact precache so that no extra assets need to be downloaded on demand.
 RUN flutter precache --web
 
-ENTRYPOINT [ "flutter" ]
+ENTRYPOINT [ "flutter" ]

pkgs/dart_pad/lib/elements/dialog.dart

@@ -18,10 +18,10 @@ enum DialogResult {
 
 class Dialog {
   final MDCDialog _mdcDialog;
-  final Element? _leftButton;
-  final Element? _rightButton;
-  final Element? _title;
-  final Element? _content;
+  final Element _leftButton;
+  final Element _rightButton;
+  final Element _title;
+  final Element _content;
 
   Dialog()
       : assert(querySelector('.mdc-dialog') != null),
@@ -30,10 +30,10 @@ class Dialog {
         assert(querySelector('#my-dialog-title') != null),
         assert(querySelector('#my-dialog-content') != null),
         _mdcDialog = MDCDialog(querySelector('.mdc-dialog')!),
-        _leftButton = querySelector('#dialog-left-button'),
-        _rightButton = querySelector('#dialog-right-button'),
-        _title = querySelector('#my-dialog-title'),
-        _content = querySelector('#my-dialog-content');
+        _leftButton = querySelector('#dialog-left-button')!,
+        _rightButton = querySelector('#dialog-right-button')!,
+        _title = querySelector('#my-dialog-title')!,
+        _content = querySelector('#my-dialog-content')!;
 
   Future<DialogResult> showYesNo(String title, String htmlMessage,
       {String yesText = 'Yes', String noText = 'No'}) {
@@ -78,24 +78,24 @@ class Dialog {
       DialogResult leftButtonResult,
       DialogResult rightButtonResult,
       [bool showLeftButton = true]) {
-    _title!.text = title;
-    _content!.setInnerHtml(htmlMessage, validator: PermissiveNodeValidator());
-    _rightButton!.text = rightButtonText;
+    _title.text = title;
+    _content.setInnerHtml(htmlMessage, validator: PermissiveNodeValidator());
+    _rightButton.text = rightButtonText;
 
     final completer = Completer<DialogResult>();
     StreamSubscription<MouseEvent>? leftSub;
 
     if (showLeftButton) {
-      _leftButton!.text = leftButtonText;
-      _leftButton!.removeAttribute('hidden');
-      leftSub = _leftButton!.onClick.listen((_) {
+      _leftButton.text = leftButtonText;
+      _leftButton.removeAttribute('hidden');
+      leftSub = _leftButton.onClick.listen((_) {
         completer.complete(leftButtonResult);
       });
     } else {
-      _leftButton!.setAttribute('hidden', 'true');
+      _leftButton.setAttribute('hidden', 'true');
     }
 
-    final rightSub = _rightButton!.onClick.listen((_) {
+    final rightSub = _rightButton.onClick.listen((_) {
       completer.complete(rightButtonResult);
     });
 

pkgs/dart_pad/pubspec.yaml

@@ -3,7 +3,7 @@ description: The front end of DartPad.
 publish_to: none
 
 environment:
-  sdk: ^3.1.0
+  sdk: ^3.2.0
 
 dependencies:
   checked_yaml: ^2.0.3

pkgs/dart_pad/third_party/pkg/split/pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/flutter/devtools/tree/master/third_party/packages/s
 version: 0.0.7
 
 environment:
-  sdk: ^3.1.0
+  sdk: ^3.2.0
 
 dependencies:
   js: ^0.6.7

pkgs/dart_services/.gitignore

@@ -28,3 +28,5 @@ config.properties
 
 # Editor configuration
 .vscode/
+
+bin/server

pkgs/dart_services/lib/src/sdk.dart

@@ -45,22 +45,23 @@ class Sdk {
   }
 
   void _initPaths() {
-    // <flutter-sdk>/bin/cache/dart-sdk
-    final dartVM = Platform.resolvedExecutable;
+    // Note below, 'Platform.resolvedExecutable' will not lead to a real SDK if
+    // we've been compiled into an AOT binary. In those cases we fall back to
+    // looking for a 'FLUTTER_ROOT' environment variable.
+
+    // <flutter-sdk>/bin/cache/dart-sdk/bin/dart
+    String? potentialPath = path.dirname(path.dirname(
+        path.dirname(path.dirname(path.dirname(Platform.resolvedExecutable)))));
+    if (!_validFlutterSdk(potentialPath)) {
+      potentialPath = Platform.environment['FLUTTER_ROOT'];
+      if (potentialPath == null || !_validFlutterSdk(potentialPath)) {
+        throw StateError('Flutter SDK not found');
+      }
+    }
 
-    dartSdkPath = path.dirname(path.dirname(dartVM));
-    flutterSdkPath = path.dirname(path.dirname(path.dirname(dartSdkPath)));
+    flutterSdkPath = potentialPath;
     _flutterBinPath = path.join(flutterSdkPath, 'bin');
-
-    // Verify that this is a flutter sdk; check for bin/, packages/, and
-    // packages/flutter/.
-    final packages = path.join(flutterSdkPath, 'packages');
-    if (!FileSystemEntity.isDirectorySync(flutterSdkPath) ||
-        !FileSystemEntity.isDirectorySync(path.join(flutterSdkPath, 'bin')) ||
-        !FileSystemEntity.isDirectorySync(packages) ||
-        !FileSystemEntity.isDirectorySync(path.join(packages, 'flutter'))) {
-      throw StateError('flutter sdk not found (from $dartSdkPath)');
-    }
+    dartSdkPath = path.join(flutterSdkPath, 'bin', 'cache', 'dart-sdk');
   }
 
   Sdk() {
@@ -123,4 +124,21 @@ class Sdk {
     final file = File(path.join(filePath, 'version'));
     return file.readAsStringSync().trim();
   }
+
+  static bool _validFlutterSdk(String sdkPath) {
+    // Verify that this is a Flutter sdk; check for bin/, packages/, and
+    // packages/flutter/.
+    if (!FileSystemEntity.isDirectorySync(sdkPath) ||
+        !FileSystemEntity.isDirectorySync(path.join(sdkPath, 'bin'))) {
+      return false;
+    }
+
+    final packages = path.join(sdkPath, 'packages');
+    if (!FileSystemEntity.isDirectorySync(packages) ||
+        !FileSystemEntity.isDirectorySync(path.join(packages, 'flutter'))) {
+      return false;
+    }
+
+    return true;
+  }
 }

pkgs/dartpad_shared/pubspec.yaml

@@ -3,7 +3,7 @@ description: Shared code between the DartPad frontend and backend.
 publish_to: 'none'
 
 environment:
-  sdk: ^3.1.0
+  sdk: ^3.2.0
 
 dependencies:
   http: ^1.1.0

pkgs/samples/pubspec.yaml

@@ -3,7 +3,7 @@ description: Sample code snippets for DartPad.
 publish_to: 'none'
 
 environment:
-  sdk: ^3.1.0
+  sdk: ^3.2.0
 
 dependencies:
   flutter:

pkgs/sketch_pad/pubspec.yaml

@@ -3,7 +3,7 @@ description: An experimental redux of the DartPad UI.
 publish_to: 'none'
 
 environment:
-  sdk: ^3.1.0
+  sdk: ^3.2.0
 
 dependencies:
   codemirror: any