Skip to content

Annagrin/prep to release webdev #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 17, 2021
Merged

Annagrin/prep to release webdev #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c1cc85
Prep to release webdev
Sep 17, 2021
0104b7e
build
Sep 17, 2021
66f9d53
Fix integration test break
Sep 17, 2021
05f290b
Made integration test for for all sdk versions
Sep 17, 2021
1f8a56b
Trigger rebuild to unstuck the CI
Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions dwds/test/readers/frontend_server_asset_reader_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import 'package:dwds/dwds.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';

final _batExt = Platform.isWindows ? '.bat' : '';
import '../fixtures/utilities.dart';

final packagesDir = p.relative('../fixtures/_test', from: p.current);

void main() {
Expand All @@ -31,7 +32,7 @@ void main() {
}

setUpAll(() async {
await Process.run('pub$_batExt', ['upgrade'],
await Process.run(dartPath, ['pub', 'upgrade'],
workingDirectory: packagesDir);
});

Expand Down
2 changes: 1 addition & 1 deletion webdev/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 2.7.6-dev
## 2.7.6

- Update SDK constraint to `>=2.14.0 <3.0.0`

Expand Down
10 changes: 5 additions & 5 deletions webdev/lib/src/pubspec.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ class PackageExceptionDetails {
{this.description, bool missingDependency})
: _missingDependency = missingDependency ?? false;

static const noPubspecLock = PackageExceptionDetails._(
'`pubspec.lock` does not exist.',
description:
'Run `$appName` in a Dart package directory. Run `pub get` first.',
missingDependency: true);
static const noPubspecLock =
PackageExceptionDetails._('`pubspec.lock` does not exist.',
description: 'Run `$appName` in a Dart package directory. '
'Run `dart pub get` first.',
missingDependency: true);

static PackageExceptionDetails missingDep(
String pkgName, VersionConstraint constraint) =>
Expand Down
2 changes: 1 addition & 1 deletion webdev/lib/src/version.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions webdev/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: webdev
# Every time this changes you need to run `pub run build_runner build`.
version: 2.7.6-dev
version: 2.7.6
# We should not depend on a dev SDK before publishing.
# publish_to: none
homepage: https://github.com/dart-lang/webdev
Expand All @@ -18,7 +18,7 @@ dependencies:
browser_launcher: ^1.0.0
crypto: ^3.0.0
dds: ^2.0.0
dwds: ^11.2.3
dwds: ^11.3.0
http: ^0.13.0
http_multi_server: ^3.0.0
io: ^1.0.0
Expand Down Expand Up @@ -50,9 +50,5 @@ dev_dependencies:
test_process: ^2.0.2
webdriver: ^3.0.0

dependency_overrides:
dwds:
path: ../dwds

executables:
webdev:
12 changes: 10 additions & 2 deletions webdev/test/integration_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@
// @dart = 2.9

import 'dart:async';
import 'dart:io';

import 'package:pub_semver/pub_semver.dart';
import 'package:test/test.dart';
import 'package:test_descriptor/test_descriptor.dart' as d;

import 'test_utils.dart';

void main() {
var sdkVersion = Version.parse(Platform.version.split(' ')[0]);
var firstSdkVersionWithoutPub = Version(2, 15, 0, pre: '0');

var pubCommand =
sdkVersion.compareTo(firstSdkVersionWithoutPub) < 0 ? 'pub' : 'dart pub';

test('non-existant commands create errors', () async {
var process = await runWebDev(['monkey']);

Expand Down Expand Up @@ -224,7 +232,7 @@ name: sample

await checkProcessStdout(process, [
'webdev could not run for this project.',
'No pubspec.lock file found, please run "pub get" first.'
'No pubspec.lock file found, please run "$pubCommand get" first.'
]);
await process.shouldExit(78);
});
Expand All @@ -251,7 +259,7 @@ dependencies:
// See https://github.com/dart-lang/linter/issues/965
// ignore: prefer_adjacent_string_concatenation
'The pubspec.yaml file has changed since the pubspec.lock file ' +
'was generated, please run "pub get" again.'
'was generated, please run "$pubCommand get" again.'
]);
await process.shouldExit(78);
});
Expand Down