Skip to content

Commit

Permalink
Migrate to pub workspaces (dart-lang#7762)
Browse files Browse the repository at this point in the history
  • Loading branch information
sigurdm authored Nov 8, 2024
1 parent 85190f4 commit 088812e
Show file tree
Hide file tree
Showing 28 changed files with 239 additions and 6,157 deletions.
3 changes: 3 additions & 0 deletions Dockerfile.app
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ COPY static /project/static
COPY doc /project/doc
COPY third_party /project/third_party
COPY tool /project/tool
COPY pubspec.lock /project/pubspec.lock
COPY pubspec.yaml /project/pubspec.yaml


WORKDIR /project/pkg/web_app
RUN dart /project/tool/pub_get_offline.dart /project/pkg/web_app
Expand Down
8 changes: 2 additions & 6 deletions app/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
name: pub_dev
description: The pub.dartlang.org website.
environment:
sdk: ^3.5.0
sdk: '^3.5.0'
resolution: workspace
dependencies:
_popularity:
path: ../pkg/_popularity
_pub_shared:
path: ../pkg/_pub_shared
appengine: ^0.13.8
args: '^2.0.0'
basics: ^0.10.0
Expand All @@ -25,7 +24,6 @@ dependencies:
http: ^1.0.0
http_parser: ^4.0.0
indexed_blob:
path: ../pkg/indexed_blob
intl: '^0.19.0'
json_annotation: '^4.3.0'
lints: ^5.0.0
Expand All @@ -39,7 +37,6 @@ dependencies:
pem: ^2.0.1
pool: '^1.5.0'
pub_package_reader:
path: ../pkg/pub_package_reader
pub_semver: '^2.0.0'
pubspec_parse: ^1.2.1
retry: ^3.1.0
Expand All @@ -57,7 +54,6 @@ dependencies:
ulid: '2.0.1'
tar: '2.0.0'
api_builder:
path: ../pkg/api_builder

dev_dependencies:
build_runner: '^2.0.0'
Expand Down
7 changes: 6 additions & 1 deletion app/test/shared/versions_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
// BSD-style license that can be found in the LICENSE file.

import 'dart:io';
import 'dart:isolate';

import 'package:_pub_shared/utils/flutter_archive.dart';
import 'package:collection/collection.dart' show IterableExtension;
import 'package:path/path.dart' as p;
import 'package:pub_dev/shared/versions.dart';
import 'package:test/test.dart';
import 'package:yaml/yaml.dart';
Expand Down Expand Up @@ -97,7 +99,10 @@ void main() {
});

test('analyzer version should match resolved pana version', () async {
final String lockContent = await File('pubspec.lock').readAsString();
final String lockContent = await File(p.join(
p.dirname(p.dirname(Isolate.packageConfigSync!.toFilePath())),
'pubspec.lock'))
.readAsString();
final lock = loadYaml(lockContent) as Map;
expect(lock['packages']['pana']['version'], panaVersion);
});
Expand Down
Loading

0 comments on commit 088812e

Please sign in to comment.