Implement /flutter for flutter.new as firebase redirect (#3093)

dart-lang · Nov 20, 2024 · 4d7507e · 4d7507e
1 parent 2ce90bf
commit 4d7507e
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 150 deletions.
diff --git a/pkgs/dartpad_ui/firebase.json b/pkgs/dartpad_ui/firebase.json
@@ -9,6 +9,16 @@
         "**/node_modules/**"
       ],
       "redirects": [
+        {
+          "source": "/dart",
+          "destination": "/?sample=dart",
+          "type": 301
+        },
+        {
+          "source": "/flutter",
+          "destination": "/?sample=flutter",
+          "type": 301
+        },
         {
           "source": "/embed-dart?(.html)",
           "destination": "/?embed=true",

diff --git a/pkgs/dartpad_ui/lib/main.dart b/pkgs/dartpad_ui/lib/main.dart
@@ -119,7 +119,6 @@ class _DartPadAppState extends State<DartPadApp> {
 
   Widget _homePageBuilder(BuildContext context, GoRouterState state,
       {String? gist}) {
-    final path = state.path;
     final gistId = gist ?? state.uri.queryParameters['id'];
     final builtinSampleId = state.uri.queryParameters['sample'];
     final flutterSampleId = state.uri.queryParameters['sample_id'];
@@ -128,7 +127,6 @@ class _DartPadAppState extends State<DartPadApp> {
     final runOnLoad = state.uri.queryParameters['run'] == 'true';
 
     return DartPadMainPage(
-      path: path,
       initialChannel: channelParam,
       embedMode: embedMode,
       runOnLoad: runOnLoad,
@@ -207,7 +205,6 @@ class DartPadMainPage extends StatefulWidget {
   final String? gistId;
   final String? builtinSampleId;
   final String? flutterSampleId;
-  final String? path;
 
   DartPadMainPage({
     required this.initialChannel,
@@ -217,7 +214,6 @@ class DartPadMainPage extends StatefulWidget {
     this.gistId,
     this.builtinSampleId,
     this.flutterSampleId,
-    this.path,
   }) : super(
           key: ValueKey(
             'sample:$builtinSampleId gist:$gistId flutter:$flutterSampleId',
@@ -276,14 +272,13 @@ class _DartPadMainPageState extends State<DartPadMainPage>
     );
 
     appServices.populateVersions();
-    final fallBackSnippetType = widget.path == '/flutter' ? 'flutter' : 'dart';
     appServices
         .performInitialLoad(
             gistId: widget.gistId,
             sampleId: widget.builtinSampleId,
             flutterSampleId: widget.flutterSampleId,
             channel: widget.initialChannel,
-            fallbackSnippet: Samples.getDefault(type: fallBackSnippetType))
+            fallbackSnippet: Samples.defaultSnippet())
         .then((value) {
       // Start listening for inject code messages.
       handleEmbedMessage(appServices, runOnInject: widget.runOnLoad);

diff --git a/pkgs/dartpad_ui/lib/model.dart b/pkgs/dartpad_ui/lib/model.dart
@@ -168,7 +168,8 @@ class AppServices {
 
   void resetTo({String? type}) {
     type ??= 'dart';
-    final source = Samples.getDefault(type: type);
+    final source =
+        Samples.defaultSnippet(forFlutter: type.toLowerCase() == 'flutter');
 
     // Reset the source.
     appModel.sourceCodeController.text = source;

diff --git a/pkgs/dartpad_ui/lib/samples.g.dart b/pkgs/dartpad_ui/lib/samples.g.dart
diff --git a/pkgs/dartpad_ui/test/samples_test.dart b/pkgs/dartpad_ui/test/samples_test.dart
@@ -7,13 +7,13 @@ import 'package:test/test.dart';
 
 void main() {
   group('samples', () {
-    test('has dart default', () {
-      final sample = Samples.getDefault(type: 'dart');
+    test('has default dart sample', () {
+      final sample = Samples.getById('dart');
       expect(sample, isNotNull);
     });
 
-    test('has flutter default', () {
-      final sample = Samples.getDefault(type: 'flutter');
+    test('has default flutter sample', () {
+      final sample = Samples.getById('flutter');
       expect(sample, isNotNull);
     });
   });

diff --git a/pkgs/samples/README.md b/pkgs/samples/README.md
@@ -9,6 +9,8 @@ Sample code snippets for DartPad.
 | --- | --- | --- | --- |
 | Dart | Fibonacci | [fibonacci.dart](lib/fibonacci.dart) | `fibonacci` |
 | Dart | Hello world | [hello_world.dart](lib/hello_world.dart) | `hello-world` |
+| Defaults | Dart snippet | [default_dart.dart](lib/default_dart.dart) | `dart` |
+| Defaults | Flutter snippet | [default_flutter.dart](lib/default_flutter.dart) | `flutter` |
 | Ecosystem | Flame game | [brick_breaker.dart](lib/brick_breaker.dart) | `flame-game` |
 | Ecosystem | Google AI SDK | [google_ai.dart](lib/google_ai.dart) | `google-ai-sdk` |
 | Flutter | Counter | [main.dart](lib/main.dart) | `counter` |

diff --git a/pkgs/samples/lib/default_dart.dart b/pkgs/samples/lib/default_dart.dart
@@ -1,5 +1,9 @@
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 void main() {
-  for (int i = 0; i < 10; i++) {
+  for (var i = 0; i < 10; i++) {
     print('hello ${i + 1}');
   }
 }
diff --git a/pkgs/samples/lib/default_flutter.dart b/pkgs/samples/lib/default_flutter.dart
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
 import 'package:flutter/material.dart';
 
 void main() {