Merge branch 'main' into misc/add-security-headers

dart-lang · Jan 3, 2024 · 4a930c9 · 4a930c9
2 parents 2b534e4 + ae401b2
commit 4a930c9
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 30 deletions.
diff --git a/.cloud_build/dart_services.yaml b/.cloud_build/dart_services.yaml
@@ -73,6 +73,8 @@ steps:
       - PROJECT_ID=$PROJECT_ID
       - --build-arg
       - FLUTTER_CHANNEL=${_FLUTTER_CHANNEL}
+      - --build-arg
+      - BUILD_SHA=${SHORT_SHA}
       - .
     dir: pkgs/dart_services
 

diff --git a/.github/workflows/dart_pad.yml b/.github/workflows/dart_pad.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: dart-lang/setup-dart@b64355ae6ca0b5d484f0106a033dd1388965d06d
         with:
           sdk: ${{ matrix.sdk }}
-      - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
+      - uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
 
       - name: Install dart dependencies
         run: dart pub get

diff --git a/.github/workflows/no-response.yml b/.github/workflows/no-response.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'dart-lang' }}
     steps:
-      - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e
         with:
           days-before-stale: -1
           days-before-close: 14

diff --git a/pkgs/dart_pad/lib/playground.dart b/pkgs/dart_pad/lib/playground.dart
@@ -241,8 +241,6 @@ class Playground extends EditorUi implements GistContainer, GistController {
           Layout.flutter),
       Sample('85e77d36533b16647bf9b6eb8c03296d', 'Implicit animations',
           Layout.flutter),
-      Sample('d57c6c898dabb8c6fb41018588b8cf73', 'Firebase Nanochat',
-          Layout.flutter),
       Sample(
           '493c8b3ef8931cbac3fbbe5c04b9c4cf', 'Google Fonts', Layout.flutter),
       Sample('a133148221a8cbacbcef8bc77a6c82ec', 'Provider', Layout.flutter),

diff --git a/pkgs/dart_services/Dockerfile b/pkgs/dart_services/Dockerfile
@@ -1,5 +1,7 @@
 ARG PROJECT_ID
 ARG FLUTTER_CHANNEL
+ARG BUILD_SHA
+
 FROM gcr.io/$PROJECT_ID/flutter:$FLUTTER_CHANNEL
 
 WORKDIR /app
@@ -8,7 +10,9 @@ COPY . /app
 RUN dart pub get
 RUN dart compile exe bin/server.dart -o bin/server
 
-RUN dart pub run grinder build-project-templates
+RUN dart run grinder build-project-templates
+
+ENV BUILD_SHA=$BUILD_SHA
 
 EXPOSE 8080
 CMD ["/app/bin/server"]
diff --git a/pkgs/dart_services/README.md b/pkgs/dart_services/README.md
@@ -35,7 +35,7 @@ To run tests:
 
 `dart test`
 
-### Re-renerating source
+### Re-generating source
 
 To rebuild the shelf router, run:
 

diff --git a/pkgs/dart_services/lib/server.dart b/pkgs/dart_services/lib/server.dart
@@ -9,6 +9,7 @@ import 'package:args/args.dart';
 import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart';
 import 'package:shelf/shelf_io.dart' as shelf;
+import 'package:shelf_gzip/shelf_gzip.dart';
 
 import 'src/caching.dart';
 import 'src/common_server.dart';
@@ -103,7 +104,6 @@ class EndpointsServer {
 
   late final HttpServer server;
 
-  late final Pipeline pipeline;
   late final Handler handler;
 
   late final CommonServerApi commonServer;
@@ -127,10 +127,11 @@ class EndpointsServer {
     GitHubOAuthHandler.setCache(cache);
     GitHubOAuthHandler.addRoutes(commonServer.router);
 
-    pipeline = const Pipeline()
+    final pipeline = const Pipeline()
         .addMiddleware(logRequestsToLogger(_logger))
         .addMiddleware(createCustomCorsHeadersMiddleware())
-        .addMiddleware(exceptionResponse());
+        .addMiddleware(exceptionResponse())
+        .addMiddleware(gzipMiddleware);
 
     handler = pipeline.addHandler(commonServer.router.call);
   }

diff --git a/pkgs/dart_services/lib/src/analysis.dart b/pkgs/dart_services/lib/src/analysis.dart
@@ -121,10 +121,13 @@ class AnalysisServerWrapper {
   }
 
   Future<api.CompleteResponse> complete(String source, int offset) async {
+    const maxResults = 500;
+
     final results = await _completeImpl(
       {kMainDart: source},
       kMainDart,
       offset,
+      maxResults: maxResults,
     );
 
     final suggestions =
@@ -149,14 +152,6 @@ class AnalysisServerWrapper {
       }
 
       return false;
-    }).toList();
-
-    suggestions.sort((CompletionSuggestion x, CompletionSuggestion y) {
-      if (x.relevance == y.relevance) {
-        return x.completion.compareTo(y.completion);
-      } else {
-        return y.relevance.compareTo(x.relevance);
-      }
     });
 
     return api.CompleteResponse(
@@ -359,13 +354,17 @@ class AnalysisServerWrapper {
   }
 
   Future<Suggestions2Result> _completeImpl(
-      Map<String, String> sources, String sourceName, int offset) async {
+    Map<String, String> sources,
+    String sourceName,
+    int offset, {
+    required int maxResults,
+  }) async {
     await _loadSources(_getOverlayMapWithPaths(sources));
 
     return await analysisServer.completion.getSuggestions2(
       _getPathFromName(sourceName),
       offset,
-      500,
+      maxResults,
     );
   }
 

diff --git a/pkgs/dart_services/lib/src/common_server.dart b/pkgs/dart_services/lib/src/common_server.dart
@@ -4,6 +4,7 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:logging/logging.dart';
 import 'package:shelf/shelf.dart';
@@ -241,6 +242,7 @@ class CommonServerApi {
       dartVersion: sdk.dartVersion,
       flutterVersion: sdk.flutterVersion,
       engineVersion: sdk.engineVersion,
+      serverRevision: Platform.environment['BUILD_SHA'],
       experiments: sdk.experiments,
       packages: packages,
     );

diff --git a/pkgs/dart_services/lib/src/shared/model.dart b/pkgs/dart_services/lib/src/shared/model.dart
diff --git a/pkgs/dart_services/lib/src/shared/model.g.dart b/pkgs/dart_services/lib/src/shared/model.g.dart
diff --git a/pkgs/dart_services/pubspec.lock b/pkgs/dart_services/pubspec.lock
diff --git a/pkgs/dart_services/pubspec.yaml b/pkgs/dart_services/pubspec.yaml
@@ -18,6 +18,7 @@ dependencies:
   path: ^1.8.3
   resp_client: ^1.2.0
   shelf: ^1.4.1
+  shelf_gzip: ^4.1.0
   shelf_router: ^1.1.4
   yaml: ^3.1.2
 

diff --git a/pkgs/dart_services/test/src/sample_code.dart b/pkgs/dart_services/test/src/sample_code.dart
@@ -4,15 +4,15 @@
 
 const sampleCode = '''
 void main() {
-  print("hello");
+  print('hello');
 }
 ''';
 
 const sampleCodeWeb = """
 import 'dart:html';
 
 void main() {
-  print("hello");
+  print('hello');
   querySelector('#foo')?.text = 'bar';
 }
 """;
@@ -114,6 +114,7 @@ class _MyHomePageState extends State<MyHomePage> {
 // From https://gist.github.com/RedBrogdon/e0a2e942e85fde2cd39b2741ff0c49e5
 const sampleCodeFlutterSunflower = r'''
 import 'dart:math' as math;
+
 import 'package:flutter/material.dart';
 
 const Color primaryColor = Colors.orange;
@@ -254,7 +255,7 @@ const sampleCodeFlutterDraggableCard = '''
 import 'package:flutter/material.dart';
 import 'package:flutter/physics.dart';
 
-main() {
+void main() {
   runApp(
     MaterialApp(
       debugShowCheckedModeBanner: false,

diff --git a/pkgs/dartpad_shared/lib/model.dart b/pkgs/dartpad_shared/lib/model.dart
@@ -363,13 +363,15 @@ class VersionResponse {
   final String dartVersion;
   final String flutterVersion;
   final String engineVersion;
+  final String? serverRevision;
   final List<String> experiments;
   final List<PackageInfo> packages;
 
   VersionResponse({
     required this.dartVersion,
     required this.flutterVersion,
     required this.engineVersion,
+    this.serverRevision,
     required this.experiments,
     required this.packages,
   });

diff --git a/pkgs/dartpad_shared/lib/model.g.dart b/pkgs/dartpad_shared/lib/model.g.dart