Merge branch 'main' into release/dart-3-2-0

.gitattributes

@@ -1,3 +1,4 @@
+**/pubspec.lock linguist-generated=true
 pkgs/dart_services/lib/src/shared/** linguist-generated=true
 pkgs/sketch_pad/lib/samples.g.dart linguist-generated=true
 pkgs/sketch_pad/web/codemirror/** linguist-generated=true

.github/workflows/dart_pad.yml

@@ -37,9 +37,6 @@ jobs:
           sdk: ${{ matrix.sdk }}
       - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
 
-      - name: Install apt dependencies
-        run: sudo apt-get install -y protobuf-compiler
-
       - name: Install dart dependencies
         run: dart pub get
 
@@ -52,5 +49,4 @@ jobs:
       - name: Run buildbot
         run: |
           export PATH=$PATH:$HOME/.pub-cache/bin
-          dart pub global activate protoc_plugin
           dart run tool/grind.dart buildbot

.github/workflows/dart_services.yml

@@ -32,9 +32,6 @@ jobs:
             channel: ${{ matrix.sdk }}
       - run: flutter --version
 
-      - name: Install apt dependencies
-        run: sudo apt-get install -y protobuf-compiler redis
-
       - name: Install dart dependencies
         run: dart pub get
 

CONTRIBUTING.md

@@ -1,4 +1,5 @@
 # Contributing to DartPad
+
 Want to contribute? Great! First, read this page (including the small print at the end).
 
 ## Before you contribute
@@ -40,39 +41,10 @@ Contributions made by corporations are covered by a different agreement than the
 
 ## How to run DartPad locally
 
-* To run the DartPad against the regular serving backend:
-
-Install the [`protoc` compiler](https://grpc.io/docs/protoc-installation/).
+To run the server, see https://github.com/dart-lang/dart-pad/blob/main/pkgs/dart_services/README.md.
 
-Run these commands:
+To run the front-end, from the `pkg/dart-pad` directory, run:
 
-```bash
-# Get all Dart dependencies
-dart pub get
-# Install the Dart protobuf compiler & grinder tool
-dart pub global activate protoc_plugin
-dart pub global activate grinder
-# Serve
-grind serve
 ```
-This serves the DartPad frontend locally on port 8000.
-
-* To run DartPad against a local version of the dart-services backend:
-```bash
-cd ..
-git clone [email protected]:dart-lang/dart-services.git
-cd dart-services
-dart pub get
-# Change the SDK version dart-services serves to the one you currently have installed
-grind update-docker-version
-# Begin serving the backend locally on port 8080.
-FLUTTER_CHANNEL="stable" grind serve &
-
-cd ../dart-pad
-# Begin serving the front-end locally on port 8000, with the given backend on the default port 8080 this is defined in tools/grind.dart
-grind serve-local-backend
+dart tool/grind.dart serve
 ```
-
-You can adjust the DARTPAD_BACKEND variable to match different versions of the dart-pad backend
-serving on AppEngine for test purposes as well, e.g.:
-`DARTPAD_BACKEND=https://20180822t110058-dot-dart-services.appspot.com/`

pkgs/dart_pad/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   collection: ^1.17.2
   dartpad_shared: any
   encrypt: ^5.0.1
-  fluttering_phrases: ^0.5.0
+  fluttering_phrases: ^1.0.0
   html_unescape: ^2.0.0
   http: ^1.1.0
   js: ^0.6.7
@@ -21,7 +21,6 @@ dependencies:
   mdc_web: ^0.6.0
   meta: ^1.8.0
   path: ^1.8.0
-  protobuf: ^3.0.0
   pub_semver: ^2.1.0
   sass_builder: ^2.2.1
   shelf: ^1.3.0

pkgs/dart_services/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014, the Dart project authors. 
+Copyright 2014, the Dart project authors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are

pkgs/dart_services/README.md

@@ -6,68 +6,48 @@ A server backend to support DartPad.
 
 ## What is it? What does it do?
 
-This project is a small, stateless Dart server, which powers the front-end of DartPad.
-It provides many of DartPad's features, including static analysis (errors and warnings),
-compilation to JavaScript, code completion, dartdoc information, code formatting, and
-quick fixes for issues.
+This project is a small, stateless Dart server, which powers the front-end of
+DartPad. It provides many of DartPad's features, including static analysis
+(errors and warnings), compilation to JavaScript, code completion, dartdoc
+information, code formatting, and quick fixes for issues.
 
 ## Getting set up
 
-This project is built with [grinder](https://pub.dev/packages/grinder). To install, please run:
+### Initialize Flutter
 
-```bash
-$ dart pub global activate grinder
-```
+The Flutter SDK needs to be downloaded and setup; see
+https://docs.flutter.dev/get-started/install.
 
-The dart-services v2 API is defined in terms of Protobuf, which requires the
-installation of the Protobuf `protoc` compiler. Please see [Protocol
-Buffers](https://developers.google.com/protocol-buffers/) for detailed
-installation instructions. On macOS, you may also install with Homebrew via:
+### Running
 
-```bash
-$ brew install protobuf
-```
-
-The Dart protoc plugin is also required for the above `protoc` compiler
-to generate Dart code. To install, please run:
+To run the server, run:
 
 ```bash
-$ dart pub global activate protoc_plugin
+$ dart bin/server.dart
 ```
 
-## Initialize Flutter
-
-The Flutter SDK needs to be downloaded and setup.
-
-```bash
-$ dart pub get
-$ dart run tool/update_sdk.dart stable
-```
+The server will run from port 8080 and export several JSON APIs, like
+`/api/v3/analyze` and `/api/v3/compile`.
 
-## Build the subsidiary files
+### Testing
 
-The Dart Services server depends on generated files. Run the following to generate all the required binaries.
+To run tests:
 
-```bash
-$ dart tool/grind.dart deploy
-```
+`dart test`
 
-## Running
+### Re-renerating source
 
-To run the server, run:
+To rebuild the shelf router, run:
 
-```bash
-$ dart tool/grind.dart serve
+```
+dart run build_runner build --delete-conflicting-outputs
 ```
 
-The server will run from port 8080 and export several JSON APIs, like
-`/api/v3/compile` and `/api/v3/analyze`.
-
-## Testing
-
-To run tests:
+And to update the shared code from dartpad_shared, run:
 
-`dart test`
+```
+dart tool/grind.dart copy-shared-source
+```
 
 ## Redis
 
@@ -79,12 +59,11 @@ To configure the server to use the local redis cache, run `dart bin/server.dart`
 
 ## Issues and bugs
 
-Please file reports on the
-[GitHub Issue Tracker for DartPad](https://github.com/dart-lang/dart-pad/issues).
+Please report issues at https://github.com/dart-lang/dart-pad/issues.
 
 ## License and Contributing
 
 Contributions welcome! Please read this short
-[guide](https://github.com/dart-lang/dart-services/wiki/Contributing) first.
+[guide](https://github.com/dart-lang/dart-pad/blob/main/CONTRIBUTING.md) first.
 You can view our license
-[here](https://github.com/dart-lang/dart-services/blob/master/LICENSE).
+[here](https://github.com/dart-lang/dart-pad/blob/main/LICENSE).

pkgs/dart_services/dart_test.yaml

@@ -0,0 +1,6 @@
+# Configure test execution; documentation available at:
+# https://github.com/dart-lang/test/blob/master/pkgs/test/doc/configuration.md.
+
+# Some of the project_creator_test.dart tests don't like to run in parallel with
+# other tests.
+concurrency: 1