Skip to content

Commit

Permalink
Revert "remove use of copied code (#2956)" (#2957)
Browse files Browse the repository at this point in the history
This reverts commit b1b17c7.
  • Loading branch information
devoncarew committed May 8, 2024
1 parent b1b17c7 commit ab51e58
Show file tree
Hide file tree
Showing 10 changed files with 815 additions and 9 deletions.
6 changes: 6 additions & 0 deletions pkgs/dart_services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ To rebuild the shelf router, run:
dart run build_runner build --delete-conflicting-outputs
```

And to update the shared code from dartpad_shared, run:

```
dart tool/grind.dart copy-shared-source
```

### Modifying supported packages

Package dependencies are pinned using the `pub_dependencies_<CHANNEL>.yaml`
Expand Down
2 changes: 1 addition & 1 deletion pkgs/dart_services/lib/src/analysis.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import 'dart:io';

import 'package:analysis_server_lib/analysis_server_lib.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:dartpad_shared/model.dart' as api;
import 'package:logging/logging.dart';
import 'package:path/path.dart' as path;

import 'common.dart';
import 'project_templates.dart';
import 'pub.dart';
import 'sdk.dart';
import 'shared/model.dart' as api;
import 'utils.dart' as utils;
import 'utils.dart';

Expand Down
2 changes: 1 addition & 1 deletion pkgs/dart_services/lib/src/common_server.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';

import 'package:dartpad_shared/model.dart' as api;
import 'package:logging/logging.dart';
import 'package:shelf/shelf.dart';
import 'package:shelf_router/shelf_router.dart';
Expand All @@ -17,6 +16,7 @@ import 'compiling.dart';
import 'project_templates.dart';
import 'pub.dart';
import 'sdk.dart';
import 'shared/model.dart' as api;
import 'shelf_cors.dart' as shelf_cors;
import 'utils.dart';

Expand Down

0 comments on commit ab51e58

Please sign in to comment.