From e79f6746c85a483cdafa2009ff3ce166a73038f5 Mon Sep 17 00:00:00 2001
From: Jacob MacDonald <jakemac@google.com>
Date: Thu, 4 May 2017 12:49:51 -0700
Subject: [PATCH] Add DartDevcBootstrapTransformer and compiler tests for
dartdevc (#1582)
Some additional updates based on testing with PPW (now that we have an e2e to play with):
* add sourcemaps to output and update tests
* use strong mode summaries, support filenames with dots, add a fake sourcemap to satisfy package test
* add better error if the module reader fails to find a module for a file
* stop diet parsing, remove --unsafe-force-compile
* add environment constant support to the DartDevcModuleTransformer
* don't output ddc resources in folders with no entrypoints
* don't create sourcemaps in release mode
* update relevant compiler tests to run with dartdevc
---
lib/src/barback/asset_environment.dart | 27 +++--
.../dartdevc_bootstrap_transformer.dart | 101 ++++++++++++++++++
.../dartdevc/dartdevc_module_transformer.dart | 31 +++++-
.../dartdevc_resource_transformer.dart | 13 +++
.../dartdevc/linked_summary_transformer.dart | 4 +-
lib/src/barback/dartdevc/module_computer.dart | 1 +
lib/src/barback/dartdevc/module_reader.dart | 8 ++
.../unlinked_summary_transformer.dart | 4 +-
.../dartdevc_module_transformer_test.dart | 5 +
.../allows_import_in_dart_code_test.dart | 21 +++-
test/compiler/compiler_flag_test.dart | 47 +++++---
...iles_entrypoints_in_root_package_test.dart | 14 ++-
.../compiles_generated_dart_file_test.dart | 14 ++-
...file_from_dependency_outside_web_test.dart | 19 +++-
...s_generated_file_from_dependency_test.dart | 18 +++-
...compiles_imported_generated_file_test.dart | 15 ++-
...nverts_isolate_entrypoint_in_web_test.dart | 21 +++-
test/compiler/environment_constant_test.dart | 58 +++++++---
...ignores_entrypoint_in_dependency_test.dart | 6 +-
.../ignores_entrypoints_in_lib_test.dart | 15 +--
...gnores_non_entrypoint_dart_files_test.dart | 23 +++-
.../includes_source_maps_in_debug_test.dart | 62 ++++++++---
.../omits_source_map_in_release_test.dart | 54 ++++++++--
.../reports_dart_parse_errors_test.dart | 41 ++++---
.../source_maps_are_self_contained_test.dart | 41 +++++--
...upports_configuration_with_build_test.dart | 9 +-
test/compiler/utils.dart | 20 ++++
test/serve/utils.dart | 14 ++-
28 files changed, 568 insertions(+), 138 deletions(-)
create mode 100644 lib/src/barback/dartdevc/dartdevc_bootstrap_transformer.dart
create mode 100644 test/compiler/utils.dart
diff --git a/lib/src/barback/asset_environment.dart b/lib/src/barback/asset_environment.dart
index 7c5581a0..935bb641 100644
--- a/lib/src/barback/asset_environment.dart
+++ b/lib/src/barback/asset_environment.dart
@@ -18,6 +18,7 @@ import '../package.dart';
import '../package_graph.dart';
import '../source/cached.dart';
import '../utils.dart';
+import 'dartdevc/dartdevc_bootstrap_transformer.dart';
import 'dartdevc/dartdevc_module_transformer.dart';
import 'dartdevc/dartdevc_resource_transformer.dart';
import 'dartdevc/linked_summary_transformer.dart';
@@ -181,21 +182,27 @@ class AssetEnvironment {
///
/// Returns `null` if there are none.
Iterable<Set> getBuiltInTransformers(Package package) {
- var transformers = <Set>[];
+ var transformers = <List>[];
var isRootPackage = package.name == rootPackage.name;
switch (compiler) {
case Compiler.dartDevc:
+ var firstPhase = <dynamic>[new ModuleConfigTransformer()];
+ var lastPhase = <dynamic>[
+ new DartDevcModuleTransformer(mode,
+ environmentConstants: environmentConstants)
+ ];
+ if (isRootPackage) {
+ firstPhase.add(new DartDevcResourceTransformer());
+ lastPhase.add(new DartDevcBootstrapTransformer(mode));
+ }
+
transformers.addAll([
- [new ModuleConfigTransformer()],
+ firstPhase,
[new UnlinkedSummaryTransformer()],
[new LinkedSummaryTransformer()],
- [new DartDevcModuleTransformer(mode)],
- ].map((list) => list.toSet()));
-
- if (isRootPackage) {
- transformers.first.add(new DartDevcResourceTransformer());
- }
+ lastPhase,
+ ]);
break;
case Compiler.dart2JS:
// the dart2js transformer only runs on the root package.
@@ -213,12 +220,12 @@ class AssetEnvironment {
transformers.add([
new Dart2JSTransformer(this, mode),
new DartForwardingTransformer(),
- ].toSet());
+ ]);
}
}
}
- return transformers;
+ return transformers.map((list) => list.toSet());
}
/// Starts up the admin server on an appropriate port and returns it.
diff --git a/lib/src/barback/dartdevc/dartdevc_bootstrap_transformer.dart b/lib/src/barback/dartdevc/dartdevc_bootstrap_transformer.dart
new file mode 100644
index 00000000..e831c0c7
--- /dev/null
+++ b/lib/src/barback/dartdevc/dartdevc_bootstrap_transformer.dart
@@ -0,0 +1,101 @@
+// Copyright (c) 2017, 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 'dart:async';
+
+import 'package:analyzer/analyzer.dart';
+import 'package:barback/barback.dart';
+import 'package:path/path.dart' as p;
+
+import '../../dart.dart';
+import '../../io.dart';
+import 'module_reader.dart';
+
+class DartDevcBootstrapTransformer extends Transformer {
+ final BarbackMode mode;
+
+ DartDevcBootstrapTransformer(this.mode);
+
+ @override
+ bool isPrimary(AssetId id) {
+ // Only `.dart` files not under `lib` or `bin` are considered candidates for
+ // being dartdevc application entrypoints.
+ if (id.extension != '.dart') return false;
+ var dir = topLevelDir(id.path);
+ return dir != 'lib' && dir != 'bin';
+ }
+
+ @override
+ Future apply(Transform transform) async {
+ var parsed =
+ parseCompilationUnit(await transform.primaryInput.readAsString());
+ if (!isEntrypoint(parsed)) return;
+ await _bootstrapEntrypoint(transform.primaryInput.id, mode, transform);
+ }
+}
+
+/// Bootstraps the js module for the entrypoint dart file [dartEntrypointId]
+/// with two additional JS files:
+///
+/// * A `$dartEntrypointId.js` file which is the main entrypoint for the app. It
+/// injects a script tag whose src is `require.js` and whose `data-main`
+/// attribute points at a `$dartEntrypointId.bootstrap.js` file.
+/// * A `$dartEntrypointId.bootstrap.js` file which invokes the top level `main`
+/// function from the entrypoint module, after performing some necessary SDK
+/// setup.
+Future _bootstrapEntrypoint(
+ AssetId dartEntrypointId, BarbackMode mode, Transform transform) async {
+ var moduleReader = new ModuleReader(transform.readInputAsString);
+ var module = await moduleReader.moduleFor(dartEntrypointId);
+
+ // The path to the entrypoint js module as it should appear in the call to
+ // `require` in the bootstrap file.
+ var moduleDir = topLevelDir(dartEntrypointId.path);
+ var appModulePath = p.relative(p.join(moduleDir, module.id.name),
+ from: p.dirname(dartEntrypointId.path));
+
+ // The name of the entrypoint dart library within the entrypoint js module.
+ //
+ // This is used to invoke `main()` from within the bootstrap script.
+ //
+ // TODO(jakemac53): Sane module name creation, this only works in the most
+ // basic of cases.
+ //
+ // See https://github.com/dart-lang/sdk/issues/27262 for the root issue which
+ // will allow us to not rely on the naming schemes that dartdevc uses
+ // internally, but instead specify our own.
+ var appModuleScope = p.url
+ .split(p
+ .withoutExtension(p.relative(dartEntrypointId.path, from: moduleDir)))
+ .join("__")
+ .replaceAll('.', '\$46');
+ var bootstrapContent = '''
+require(["$appModulePath", "dart_sdk"], function(app, dart_sdk) {
+ dart_sdk._isolate_helper.startRootIsolate(() => {}, []);
+ app.$appModuleScope.main();
+});
+''';
+ var bootstrapId = dartEntrypointId.addExtension('.bootstrap.js');
+ transform.addOutput(new Asset.fromString(bootstrapId, bootstrapContent));
+
+ var bootstrapModuleName = p.withoutExtension(
+ p.relative(bootstrapId.path, from: p.dirname(dartEntrypointId.path)));
+ var entrypointJsContent = '''
+var el = document.createElement("script");
+el.defer = true;
+el.async = false;
+el.src = "require.js";
+el.setAttribute("data-main", "$bootstrapModuleName");
+document.head.appendChild(el);
+''';
+ transform.addOutput(new Asset.fromString(
+ dartEntrypointId.addExtension('.js'), entrypointJsContent));
+
+ if (mode == BarbackMode.DEBUG) {
+ transform.addOutput(new Asset.fromString(
+ dartEntrypointId.addExtension('.js.map'),
+ '{"version":3,"sourceRoot":"","sources":[],"names":[],"mappings":"",'
+ '"file":""}'));
+ }
+}
diff --git a/lib/src/barback/dartdevc/dartdevc_module_transformer.dart b/lib/src/barback/dartdevc/dartdevc_module_transformer.dart
index 3c2a4495..9bdc3eef 100644
--- a/lib/src/barback/dartdevc/dartdevc_module_transformer.dart
+++ b/lib/src/barback/dartdevc/dartdevc_module_transformer.dart
@@ -23,10 +23,11 @@ class DartDevcModuleTransformer extends Transformer {
@override
String get allowedExtensions => moduleConfigName;
+ final Map<String, String> environmentConstants;
final BarbackMode mode;
- DartDevcModuleTransformer(this.mode);
-
+ DartDevcModuleTransformer(this.mode, {this.environmentConstants = const {}});
+
@override
Future apply(Transform transform) async {
ScratchSpace scratchSpace;
@@ -46,7 +47,12 @@ class DartDevcModuleTransformer extends Transformer {
scratchSpace =
await ScratchSpace.create(allAssetIds, transform.readInput);
await Future.wait(modules.map((m) => _createDartdevcModule(
- m, scratchSpace, summariesForModule[m.id], mode, transform)));
+ m,
+ scratchSpace,
+ summariesForModule[m.id],
+ environmentConstants,
+ mode,
+ transform)));
} finally {
scratchSpace?.delete();
}
@@ -59,6 +65,7 @@ Future _createDartdevcModule(
Module module,
ScratchSpace scratchSpace,
Set<AssetId> linkedSummaryIds,
+ Map<String, String> environmentConstants,
BarbackMode mode,
Transform transform) async {
var jsOutputFile = scratchSpace.fileFor(module.id.jsId);
@@ -74,13 +81,25 @@ Future _createDartdevcModule(
'--module-root=${scratchSpace.tempDir.path}',
'--library-root=${p.dirname(jsOutputFile.path)}',
'--summary-extension=${linkedSummaryExtension.substring(1)}',
+ '--no-summarize',
'-o',
jsOutputFile.path,
]);
+
+ if (mode == BarbackMode.RELEASE) {
+ request.arguments.add('--no-source-map');
+ }
+
+ // Add environment constants.
+ environmentConstants.forEach((key, value) {
+ request.arguments.add('-D$key=$value');
+ });
+
// Add all the linked summaries as summary inputs.
for (var id in linkedSummaryIds) {
request.arguments.addAll(['-s', scratchSpace.fileFor(id).path]);
}
+
// Add URL mappings for all the package: files to tell DartDevc where to find
// them.
for (var id in module.assetIds) {
@@ -121,5 +140,11 @@ Future _createDartdevcModule(
} else {
transform.addOutput(
new Asset.fromBytes(module.id.jsId, jsOutputFile.readAsBytesSync()));
+ if (mode == BarbackMode.DEBUG) {
+ var sourceMapOutputId = module.id.jsId.addExtension('.map');
+ var sourceMapFile = scratchSpace.fileFor(sourceMapOutputId);
+ transform.addOutput(new Asset.fromBytes(
+ sourceMapOutputId, sourceMapFile.readAsBytesSync()));
+ }
}
}
diff --git a/lib/src/barback/dartdevc/dartdevc_resource_transformer.dart b/lib/src/barback/dartdevc/dartdevc_resource_transformer.dart
index d9d68364..46e69cbc 100644
--- a/lib/src/barback/dartdevc/dartdevc_resource_transformer.dart
+++ b/lib/src/barback/dartdevc/dartdevc_resource_transformer.dart
@@ -5,10 +5,12 @@
import 'dart:async';
import 'dart:io';
+import 'package:analyzer/analyzer.dart';
import 'package:barback/barback.dart';
import 'package:cli_util/cli_util.dart' as cli_util;
import 'package:path/path.dart' as p;
+import '../../dart.dart';
import '../../io.dart';
/// Copies the `dart_sdk.js` and `require.js` AMD files from the SDK into each
@@ -26,6 +28,17 @@ class DartDevcResourceTransformer extends AggregateTransformer
@override
Future apply(AggregateTransform transform) async {
+ // If there are no entrypoints then skip this folder.
+ var hasEntrypoint = false;
+ await for (var asset in transform.primaryInputs) {
+ if (isEntrypoint(parseCompilationUnit(await asset.readAsString(),
+ parseFunctionBodies: false))) {
+ hasEntrypoint = true;
+ break;
+ }
+ }
+ if (!hasEntrypoint) return;
+
var sdk = cli_util.getSdkDir();
// Copy the dart_sdk.js file for AMD into the output folder.
diff --git a/lib/src/barback/dartdevc/linked_summary_transformer.dart b/lib/src/barback/dartdevc/linked_summary_transformer.dart
index 2980536b..4ba00bf4 100644
--- a/lib/src/barback/dartdevc/linked_summary_transformer.dart
+++ b/lib/src/barback/dartdevc/linked_summary_transformer.dart
@@ -59,10 +59,12 @@ Future _createLinkedSummaryForModule(
Transform transform) async {
var summaryOutputFile = tempEnv.fileFor(module.id.linkedSummaryId);
var request = new WorkRequest();
+ // TODO(jakemac53): Diet parsing results in erroneous errors in later steps,
+ // but ideally we would do that (pass '--build-summary-only-diet').
request.arguments.addAll([
'--build-summary-only',
- '--build-summary-only-diet',
'--build-summary-output=${summaryOutputFile.path}',
+ '--strong',
]);
// Add all the unlinked summaries as build summary inputs.
request.arguments.addAll(unlinkedSummaryIds.map(
diff --git a/lib/src/barback/dartdevc/module_computer.dart b/lib/src/barback/dartdevc/module_computer.dart
index 9721866b..85b5694f 100644
--- a/lib/src/barback/dartdevc/module_computer.dart
+++ b/lib/src/barback/dartdevc/module_computer.dart
@@ -85,6 +85,7 @@ Future<List<Module>> computeModules(
for (var asset in srcAssets) {
var id = asset.id;
var content = await asset.readAsString();
+ // Skip errors here, dartdevc gives nicer messages.
var parsed = parseCompilationUnit(content,
name: id.path, parseFunctionBodies: false, suppressErrors: true);
parsedAssetsById[id] = parsed;
diff --git a/lib/src/barback/dartdevc/module_reader.dart b/lib/src/barback/dartdevc/module_reader.dart
index 38716dbe..8e30ad55 100644
--- a/lib/src/barback/dartdevc/module_reader.dart
+++ b/lib/src/barback/dartdevc/module_reader.dart
@@ -58,6 +58,14 @@ class ModuleReader {
Future updateDeps(Iterable<AssetId> assetDepIds) async {
for (var assetDepId in assetDepIds) {
var assetDepModule = await moduleFor(assetDepId);
+ if (assetDepModule == null) {
+ throw new StateError(
+ 'Unable to find module for asset `$assetDepId`. This indicates '
+ 'that either the file doesn\'t exist or it is not imported by '
+ 'any public entrypoints in its package (files not under `lib/src`'
+ '). Importing a file directly that lives under `lib/src` is not '
+ 'supported by the dartdevc transformers.');
+ }
if (!result.add(assetDepModule.id)) continue;
await updateDeps(assetDepModule.directDependencies);
}
diff --git a/lib/src/barback/dartdevc/unlinked_summary_transformer.dart b/lib/src/barback/dartdevc/unlinked_summary_transformer.dart
index 2bce94d1..bb6ed440 100644
--- a/lib/src/barback/dartdevc/unlinked_summary_transformer.dart
+++ b/lib/src/barback/dartdevc/unlinked_summary_transformer.dart
@@ -47,11 +47,13 @@ Future _createUnlinkedSummaryForModule(
Module module, ScratchSpace scratchSpace, Transform transform) async {
var summaryOutputFile = scratchSpace.fileFor(module.id.unlinkedSummaryId);
var request = new WorkRequest();
+ // TODO(jakemac53): Diet parsing results in erroneous errors later on today,
+ // but ideally we would do that (pass '--build-summary-only-diet').
request.arguments.addAll([
'--build-summary-only',
'--build-summary-only-unlinked',
- '--build-summary-only-diet',
'--build-summary-output=${summaryOutputFile.path}',
+ '--strong',
]);
// Add all the files to include in the unlinked summary bundle.
request.arguments.addAll(module.assetIds.map((id) {
diff --git a/test/barback/dartdevc/dartdevc_module_transformer_test.dart b/test/barback/dartdevc/dartdevc_module_transformer_test.dart
index 0bc0b205..3e3d40ab 100644
--- a/test/barback/dartdevc/dartdevc_module_transformer_test.dart
+++ b/test/barback/dartdevc/dartdevc_module_transformer_test.dart
@@ -52,8 +52,13 @@ void main() {
// Just confirm some basic things are present indicating that the module
// was compiled. The goal here is not to test dartdevc itself.
requestShouldSucceed('web__main.js', contains('main'));
+ requestShouldSucceed('web__main.js.map', contains('web__main.js'));
requestShouldSucceed('packages/myapp/lib__hello.js', contains('hello'));
+ requestShouldSucceed(
+ 'packages/myapp/lib__hello.js.map', contains('lib__hello.js'));
requestShouldSucceed('packages/foo/lib__foo.js', contains('message'));
+ requestShouldSucceed(
+ 'packages/foo/lib__foo.js.map', contains('lib__foo.js'));
endPubServe();
});
}
diff --git a/test/compiler/allows_import_in_dart_code_test.dart b/test/compiler/allows_import_in_dart_code_test.dart
index a2926ad6..0514d2bb 100644
--- a/test/compiler/allows_import_in_dart_code_test.dart
+++ b/test/compiler/allows_import_in_dart_code_test.dart
@@ -7,9 +7,10 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
- integration("handles imports in the Dart code", () {
+ integrationWithCompiler("handles imports in the Dart code", (compiler) {
d.dir("foo", [
d.libPubspec("foo", "0.0.1"),
d.dir("lib", [
@@ -47,9 +48,21 @@ void main() {
]).create();
pubGet();
- pubServe();
- requestShouldSucceed("main.dart.js", contains("footext"));
- requestShouldSucceed("main.dart.js", contains("libtext"));
+ pubServe(compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("main.dart.js", contains("footext"));
+ requestShouldSucceed("main.dart.js", contains("libtext"));
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("main.dart.js", contains("main.dart.bootstrap"));
+ requestShouldSucceed("main.dart.bootstrap.js", contains("web__main"));
+ requestShouldSucceed(
+ "web__main.js", allOf(contains("foo"), contains("lib")));
+ requestShouldSucceed("packages/foo/lib__foo.js", contains("footext"));
+ requestShouldSucceed("packages/myapp/lib__lib.js", contains("libtext"));
+ break;
+ }
endPubServe();
});
}
diff --git a/test/compiler/compiler_flag_test.dart b/test/compiler/compiler_flag_test.dart
index f6da3851..57763e6d 100644
--- a/test/compiler/compiler_flag_test.dart
+++ b/test/compiler/compiler_flag_test.dart
@@ -11,9 +11,10 @@ import 'package:pub/src/exit_codes.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
- integration("compiler flag switches compilers", () {
+ integrationWithCompiler("compiler flag switches compilers", (compiler) {
d.dir(appPath, [
d.appPubspec(),
d.dir("lib", [
@@ -31,22 +32,36 @@ main() {
]).create();
pubGet();
- pubServe(args: ['--compiler', 'dartdevc']);
- requestShouldSucceed(
- 'packages/$appPath/$moduleConfigName', contains('lib__hello'));
- requestShouldSucceed(moduleConfigName, contains('web__main'));
- requestShouldSucceed('packages/$appPath/lib__hello.unlinked.sum', null);
- requestShouldSucceed('web__main.unlinked.sum', null);
- requestShouldSucceed('packages/$appPath/lib__hello.linked.sum', null);
- requestShouldSucceed('web__main.linked.sum', null);
- requestShouldSucceed('packages/$appPath/lib__hello.js', contains('hello'));
- requestShouldSucceed('web__main.js', contains('hello'));
- requestShouldSucceed('dart_sdk.js', null);
- requestShouldSucceed('require.js', null);
- // TODO(jakemac53): Not implemented yet, update once available.
- requestShould404('main.dart.js');
+ pubServe(compiler: compiler);
+ switch (compiler) {
+ case Compiler.dartDevc:
+ requestShouldSucceed(
+ 'packages/$appPath/$moduleConfigName', contains('lib__hello'));
+ requestShouldSucceed(moduleConfigName, contains('web__main'));
+ requestShouldSucceed('packages/$appPath/lib__hello.unlinked.sum', null);
+ requestShouldSucceed('web__main.unlinked.sum', null);
+ requestShouldSucceed('packages/$appPath/lib__hello.linked.sum', null);
+ requestShouldSucceed('web__main.linked.sum', null);
+ requestShouldSucceed(
+ 'packages/$appPath/lib__hello.js', contains('hello'));
+ requestShouldSucceed(
+ 'packages/$appPath/lib__hello.js.map', contains('lib__hello.js'));
+ requestShouldSucceed('web__main.js', contains('hello'));
+ requestShouldSucceed('web__main.js.map', contains('web__main.js'));
+ requestShouldSucceed('dart_sdk.js', null);
+ requestShouldSucceed('require.js', null);
+ requestShouldSucceed('main.dart.js', null);
+ break;
+ case Compiler.dart2JS:
+ requestShouldSucceed('main.dart.js', null);
+ requestShould404('web__main.js');
+ break;
+ case Compiler.none:
+ requestShould404('main.dart.js');
+ break;
+ }
endPubServe();
- });
+ }, compilers: Compiler.all);
integration("invalid compiler flag gives an error", () {
d.dir(appPath, [
diff --git a/test/compiler/compiles_entrypoints_in_root_package_test.dart b/test/compiler/compiles_entrypoints_in_root_package_test.dart
index ebfcca9b..5321c3a0 100644
--- a/test/compiler/compiles_entrypoints_in_root_package_test.dart
+++ b/test/compiler/compiles_entrypoints_in_root_package_test.dart
@@ -9,9 +9,11 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
+import 'utils.dart';
main() {
- integration("compiles Dart entrypoints in root package to JS", () {
+ integrationWithCompiler("compiles Dart entrypoints in root package to JS",
+ (compiler) {
d.dir(appPath, [
d.appPubspec(),
d.dir('benchmark', [
@@ -35,9 +37,13 @@ main() {
]).create();
pubGet();
- schedulePub(
- args: ["build", "benchmark", "foo", "web"],
- output: new RegExp(r'Built 6 files to "build".'));
+ schedulePub(args: [
+ "build",
+ "benchmark",
+ "foo",
+ "web",
+ "--compiler=${compiler.name}"
+ ], output: new RegExp(r'Built [\d]+ files to "build".'));
d.dir(appPath, [
d.dir('build', [
diff --git a/test/compiler/compiles_generated_dart_file_test.dart b/test/compiler/compiles_generated_dart_file_test.dart
index 9a09be83..f18fac46 100644
--- a/test/compiler/compiles_generated_dart_file_test.dart
+++ b/test/compiler/compiles_generated_dart_file_test.dart
@@ -7,9 +7,10 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
- integration("compiles a generated Dart file to JS", () {
+ integrationWithCompiler("compiles a generated Dart file to JS", (compiler) {
serveBarback();
d.dir(appPath, [
@@ -31,8 +32,15 @@ void main() => print(TOKEN);
]).create();
pubGet();
- pubServe();
- requestShouldSucceed("main.dart.js", contains("(before, munge)"));
+ pubServe(compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("main.dart.js", contains("(before, munge)"));
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("web__main.js", contains("(before, munge)"));
+ break;
+ }
endPubServe();
});
}
diff --git a/test/compiler/compiles_generated_file_from_dependency_outside_web_test.dart b/test/compiler/compiles_generated_file_from_dependency_outside_web_test.dart
index ab7b96ec..84cecefe 100644
--- a/test/compiler/compiles_generated_file_from_dependency_outside_web_test.dart
+++ b/test/compiler/compiles_generated_file_from_dependency_outside_web_test.dart
@@ -7,12 +7,13 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
// This is a regression test for issue #17198.
- integration(
+ integrationWithCompiler(
"compiles a Dart file that imports a generated file to JS "
- "outside web/", () {
+ "outside web/", (compiler) {
serveBarback();
d.dir(appPath, [
@@ -39,9 +40,17 @@ const TOKEN = "before";
]).create();
pubGet();
- pubServe(args: ["test"]);
- requestShouldSucceed("main.dart.js", contains("(before, munge)"),
- root: "test");
+ pubServe(args: ["test"], compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("main.dart.js", contains("(before, munge)"),
+ root: "test");
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("test__main.js", contains("(before, munge)"),
+ root: "test");
+ break;
+ }
endPubServe();
});
}
diff --git a/test/compiler/compiles_generated_file_from_dependency_test.dart b/test/compiler/compiles_generated_file_from_dependency_test.dart
index 5713720c..4e68478e 100644
--- a/test/compiler/compiles_generated_file_from_dependency_test.dart
+++ b/test/compiler/compiles_generated_file_from_dependency_test.dart
@@ -7,11 +7,12 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
- integration(
+ integrationWithCompiler(
"compiles a Dart file that imports a generated file in another "
- "package to JS", () {
+ "package to JS", (compiler) {
serveBarback();
d.dir("foo", [
@@ -47,8 +48,17 @@ main() => print(foo());
]).create();
pubGet();
- pubServe();
- requestShouldSucceed("main.dart.js", contains("(before, munge)"));
+ pubServe(compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("main.dart.js", contains("(before, munge)"));
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("web__main.js", contains("foo"));
+ requestShouldSucceed(
+ "packages/foo/lib__foo.js", contains("(before, munge)"));
+ break;
+ }
endPubServe();
});
}
diff --git a/test/compiler/compiles_imported_generated_file_test.dart b/test/compiler/compiles_imported_generated_file_test.dart
index 4b774e35..18d548ca 100644
--- a/test/compiler/compiles_imported_generated_file_test.dart
+++ b/test/compiler/compiles_imported_generated_file_test.dart
@@ -7,9 +7,11 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
- integration("compiles a Dart file that imports a generated file to JS", () {
+ integrationWithCompiler(
+ "compiles a Dart file that imports a generated file to JS", (compiler) {
serveBarback();
d.dir(appPath, [
@@ -36,8 +38,15 @@ const TOKEN = "before";
]).create();
pubGet();
- pubServe();
- requestShouldSucceed("main.dart.js", contains("(before, munge)"));
+ pubServe(compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("main.dart.js", contains("(before, munge)"));
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("web__main.js", contains("(before, munge)"));
+ break;
+ }
endPubServe();
});
}
diff --git a/test/compiler/converts_isolate_entrypoint_in_web_test.dart b/test/compiler/converts_isolate_entrypoint_in_web_test.dart
index 6c8f91f5..a6f30d39 100644
--- a/test/compiler/converts_isolate_entrypoint_in_web_test.dart
+++ b/test/compiler/converts_isolate_entrypoint_in_web_test.dart
@@ -10,22 +10,33 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
- integration("converts a Dart isolate entrypoint in web to JS", () {
+ integrationWithCompiler("converts a Dart isolate entrypoint in web to JS",
+ (compiler) {
d.dir(appPath, [
d.appPubspec(),
d.dir("web", [
d.file(
"isolate.dart",
- "void main(List<String> args, SendPort "
- "sendPort) => print('hello');")
+ """
+ import 'dart:isolate';
+ void main(List<String> args, SendPort sendPort) => print('hello');
+ """)
])
]).create();
pubGet();
- pubServe();
- requestShouldSucceed("isolate.dart.js", contains("hello"));
+ pubServe(compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("isolate.dart.js", contains("hello"));
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("web__isolate.js", contains("hello"));
+ break;
+ }
endPubServe();
});
}
diff --git a/test/compiler/environment_constant_test.dart b/test/compiler/environment_constant_test.dart
index 54077704..8e2853e4 100644
--- a/test/compiler/environment_constant_test.dart
+++ b/test/compiler/environment_constant_test.dart
@@ -10,9 +10,10 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../serve/utils.dart';
import '../test_pub.dart';
+import 'utils.dart';
main() {
- group("passes environment constants to dart2js", () {
+ group("passes environment constants to", () {
setUp(() {
d.dir(appPath, [
d.appPubspec(),
@@ -23,29 +24,48 @@ main() {
]).create();
});
- integration('from "pub build"', () {
+ integrationWithCompiler('from "pub build"', (compiler) {
pubGet();
- schedulePub(
- args: ["build", "--define", "name=fblthp"],
- output: new RegExp(r'Built 1 file to "build".'));
+ schedulePub(args: [
+ "build",
+ "--define",
+ "name=fblthp",
+ "--compiler=${compiler.name}"
+ ], output: new RegExp(r'Built [\d]+ file[s]? to "build".'));
+
+ var expectedFile;
+ switch (compiler) {
+ case Compiler.dart2JS:
+ expectedFile = d.matcherFile('file.dart.js', contains('fblthp'));
+ break;
+ case Compiler.dartDevc:
+ expectedFile = d.matcherFile('web__file.js', contains('fblthp'));
+ break;
+ }
d.dir(appPath, [
d.dir('build', [
- d.dir('web', [
- d.matcherFile('file.dart.js', contains('fblthp')),
- ])
+ d.dir('web', [expectedFile])
])
]).validate();
});
- integration('from "pub serve"', () {
+ integrationWithCompiler('from "pub serve"', (compiler) {
pubGet();
- pubServe(args: ["--define", "name=fblthp"]);
- requestShouldSucceed("file.dart.js", contains("fblthp"));
+ pubServe(args: ["--define", "name=fblthp"], compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("file.dart.js", contains("fblthp"));
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("web__file.js", contains("fblthp"));
+ break;
+ }
endPubServe();
});
- integration('which takes precedence over the pubspec', () {
+ integrationWithCompiler('which takes precedence over the pubspec',
+ (compiler) {
d.dir(appPath, [
d.pubspec({
"name": "myapp",
@@ -60,9 +80,17 @@ main() {
]).create();
pubGet();
- pubServe(args: ["--define", "name=fblthp"]);
- requestShouldSucceed("file.dart.js",
- allOf([contains("fblthp"), isNot(contains("slartibartfast"))]));
+ pubServe(args: ["--define", "name=fblthp"], compiler: compiler);
+ switch (compiler) {
+ case Compiler.dart2JS:
+ requestShouldSucceed("file.dart.js",
+ allOf([contains("fblthp"), isNot(contains("slartibartfast"))]));
+ break;
+ case Compiler.dartDevc:
+ requestShouldSucceed("web__file.js",
+ allOf([contains("fblthp"), isNot(contains("slartibartfast"))]));
+ break;
+ }
endPubServe();
});
});
diff --git a/test/compiler/ignores_entrypoint_in_dependency_test.dart b/test/compiler/ignores_entrypoint_in_dependency_test.dart
index 53c075a4..8ea407b1 100644
--- a/test/compiler/ignores_entrypoint_in_dependency_test.dart
+++ b/test/compiler/ignores_entrypoint_in_dependency_test.dart
@@ -5,9 +5,11 @@
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
- integration("ignores a Dart entrypoint in a dependency", () {
+ integrationWithCompiler("ignores a Dart entrypoint in a dependency",
+ (compiler) {
d.dir("foo", [
d.libPubspec("foo", "0.0.1"),
d.dir("lib", [d.file("lib.dart", "main() => print('foo');")])
@@ -20,7 +22,7 @@ main() {
]).create();
pubGet();
- pubServe();
+ pubServe(compiler: compiler);
requestShould404("web/packages/foo/lib.dart.js");
endPubServe();
});
diff --git a/test/compiler/ignores_entrypoints_in_lib_test.dart b/test/compiler/ignores_entrypoints_in_lib_test.dart
index 23f25fc9..c5f36d37 100644
--- a/test/compiler/ignores_entrypoints_in_lib_test.dart
+++ b/test/compiler/ignores_entrypoints_in_lib_test.dart
@@ -7,6 +7,7 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
setUp(() {
@@ -21,21 +22,23 @@ main() {
]).create();
});
- integration("build ignores Dart entrypoints in lib", () {
+ integrationWithCompiler("build ignores Dart entrypoints in lib", (compiler) {
pubGet();
schedulePub(
- args: ["build", "--all"],
- output: new RegExp(r'Built 1 file to "build".'));
+ args: ["build", "--all", "--compiler=${compiler.name}"],
+ output: new RegExp(r'Built [\d]+ files? to "build".'));
d.dir(appPath, [
- d.dir('build', [d.nothing('lib')])
+ d.dir('build', [
+ d.nothing('lib'),
+ ])
]).validate();
});
- integration("serve ignores Dart entrypoints in lib", () {
+ integrationWithCompiler("serve ignores Dart entrypoints in lib", (compiler) {
pubGet();
pubServe();
- requestShould404("packages/myapp/main.dart.js");
+ requestShould404("packages/myapp/file.dart.js");
endPubServe();
});
}
diff --git a/test/compiler/ignores_non_entrypoint_dart_files_test.dart b/test/compiler/ignores_non_entrypoint_dart_files_test.dart
index 04416ca4..3e678e43 100644
--- a/test/compiler/ignores_non_entrypoint_dart_files_test.dart
+++ b/test/compiler/ignores_non_entrypoint_dart_files_test.dart
@@ -7,6 +7,7 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
import '../serve/utils.dart';
+import 'utils.dart';
main() {
setUp(() {
@@ -21,19 +22,31 @@ main() {
]).create();
});
- integration("build ignores non-entrypoint Dart files", () {
+ integrationWithCompiler("build ignores non-entrypoint Dart files",
+ (compiler) {
pubGet();
schedulePub(
- args: ["build"], output: new RegExp(r'Built 0 files to "build".'));
+ args: ["build", "--compiler=${compiler.name}"],
+ output: new RegExp(r'Built [\d]+ files? to "build".'));
+ var expectedWebDir;
+ switch (compiler) {
+ case Compiler.dart2JS:
+ expectedWebDir = d.nothing('web');
+ break;
+ case Compiler.dartDevc:
+ expectedWebDir = d.dir('web', [d.file('.moduleConfig', '[]')]);
+ break;
+ }
d.dir(appPath, [
- d.dir('build', [d.nothing('web')])
+ d.dir('build', [expectedWebDir])
]).validate();
});
- integration("serve ignores non-entrypoint Dart files", () {
+ integrationWithCompiler("serve ignores non-entrypoint Dart files",
+ (compiler) {
pubGet();
- pubServe();
+ pubServe(compiler: compiler);
requestShould404("file1.dart.js");
requestShould404("file2.dart.js");
requestShould404("file3.dart.js");
diff --git a/test/compiler/includes_source_maps_in_debug_test.dart b/test/compiler/includes_source_maps_in_debug_test.dart
index 8977b717..c048748e 100644
--- a/test/compiler/includes_source_maps_in_debug_test.dart
+++ b/test/compiler/includes_source_maps_in_debug_test.dart
@@ -6,28 +6,66 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
+import 'utils.dart';
main() {
- integration("includes source map URLs in a debug build", () {
+ integrationWithCompiler("includes source map URLs in a debug build",
+ (compiler) {
d.dir(appPath, [
d.appPubspec(),
- d.dir("web", [d.file("main.dart", "void main() => print('hello');")])
+ d.dir("lib", [d.file("message.dart", "String get message => 'hello';")]),
+ d.dir("web", [
+ d.file(
+ "main.dart",
+ """
+ import "package:$appPath/message.dart";
+ void main() => print(message);
+ """)
+ ])
]).create();
pubGet();
schedulePub(
- args: ["build", "--mode", "debug"],
+ args: ["build", "--mode", "debug", "--compiler=${compiler.name}"],
output: new RegExp(r'Built \d+ files to "build".'),
exitCode: 0);
- d.dir(appPath, [
- d.dir('build', [
- d.dir('web', [
- d.matcherFile(
- 'main.dart.js', contains("# sourceMappingURL=main.dart.js.map")),
- d.matcherFile('main.dart.js.map', contains('"file": "main.dart.js"'))
- ])
- ])
- ]).validate();
+ switch (compiler) {
+ case Compiler.dart2JS:
+ d.dir(appPath, [
+ d.dir('build', [
+ d.dir('web', [
+ d.matcherFile('main.dart.js',
+ contains("# sourceMappingURL=main.dart.js.map")),
+ d.matcherFile(
+ 'main.dart.js.map', contains('"file": "main.dart.js"'))
+ ])
+ ])
+ ]).validate();
+ break;
+ case Compiler.dartDevc:
+ d.dir(appPath, [
+ d.dir('build', [
+ d.dir('web', [
+ d.dir('packages', [
+ d.dir(appPath, [
+ d.matcherFile('lib__message.js',
+ contains("# sourceMappingURL=lib__message.js.map")),
+ d.matcherFile('lib__message.js.map',
+ contains('"file":"lib__message.js"')),
+ ]),
+ ]),
+ d.matcherFile('web__main.js',
+ contains("# sourceMappingURL=web__main.js.map")),
+ d.matcherFile(
+ 'web__main.js.map', contains('"file":"web__main.js"')),
+ // This exists to make package:test happy, but is fake (no
+ // original dart file to map to).
+ d.matcherFile('main.dart.js.map', anything),
+ ])
+ ])
+ ]).validate();
+ break;
+ }
});
}
diff --git a/test/compiler/omits_source_map_in_release_test.dart b/test/compiler/omits_source_map_in_release_test.dart
index a8e4502f..df4b1c5b 100644
--- a/test/compiler/omits_source_map_in_release_test.dart
+++ b/test/compiler/omits_source_map_in_release_test.dart
@@ -2,26 +2,62 @@
// 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:scheduled_test/scheduled_test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
+import 'utils.dart';
main() {
- integration("omits source maps from a release build", () {
+ integrationWithCompiler("omits source maps from a release build", (compiler) {
d.dir(appPath, [
d.appPubspec(),
- d.dir("web", [d.file("main.dart", "void main() => print('hello');")])
+ d.dir("lib", [d.file("message.dart", "String get message => 'hello';")]),
+ d.dir("web", [
+ d.file(
+ "main.dart",
+ """
+ import "package:$appPath/message.dart";
+ void main() => print(message);
+ """)
+ ])
]).create();
pubGet();
schedulePub(
- args: ["build"],
- output: new RegExp(r'Built 1 file to "build".'),
+ args: ["build", "--compiler=${compiler.name}"],
+ output: new RegExp(r'Built \d+ files? to "build".'),
exitCode: 0);
- d.dir(appPath, [
- d.dir('build', [
- d.dir('web', [d.nothing('main.dart.js.map')])
- ])
- ]).validate();
+ switch (compiler) {
+ case Compiler.dart2JS:
+ d.dir(appPath, [
+ d.dir('build', [
+ d.dir('web', [
+ d.nothing('main.dart.js.map'),
+ ])
+ ])
+ ]).validate();
+ break;
+ case Compiler.dartDevc:
+ d.dir(appPath, [
+ d.dir('build', [
+ d.dir('web', [
+ d.dir('packages', [
+ d.dir(appPath, [
+ d.matcherFile(
+ 'lib__message.js',
+ isNot(
+ contains("# sourceMappingURL=lib__message.js.map"))),
+ d.nothing('lib__message.js.map'),
+ ]),
+ ]),
+ d.nothing('main.dart.js.map'),
+ d.nothing('web__main.js.map'),
+ ])
+ ])
+ ]).validate();
+ break;
+ }
});
}
diff --git a/test/compiler/reports_dart_parse_errors_test.dart b/test/compiler/reports_dart_parse_errors_test.dart
index f8946462..4aabb792 100644
--- a/test/compiler/reports_dart_parse_errors_test.dart
+++ b/test/compiler/reports_dart_parse_errors_test.dart
@@ -12,31 +12,48 @@ import 'package:scheduled_test/scheduled_stream.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
+import 'utils.dart';
main() {
- integration("reports Dart parse errors", () {
+ integrationWithCompiler("reports Dart parse errors", (compiler) {
d.dir(appPath, [
d.appPubspec(),
d.dir('web', [
d.file('file.txt', 'contents'),
- d.file('file.dart', 'void void;'),
- d.dir('subdir', [d.file('subfile.dart', 'void void;')])
+ d.file('file.dart', 'void main() {}; void void;'),
+ d.dir('subdir', [d.file('subfile.dart', 'void main() {}; void void;')])
])
]).create();
pubGet();
- var pub = startPub(args: ["build"]);
+ var pub = startPub(args: ["build", "--compiler", compiler.name]);
pub.stdout.expect(startsWith("Loading source assets..."));
pub.stdout.expect(startsWith("Building myapp..."));
- var consumeFile = consumeThrough(inOrder([
- "[Error from Dart2JS]:",
- startsWith(p.join("web", "file.dart") + ":")
- ]));
- var consumeSubfile = consumeThrough(inOrder([
- "[Error from Dart2JS]:",
- startsWith(p.join("web", "subdir", "subfile.dart") + ":")
- ]));
+ var consumeFile;
+ var consumeSubfile;
+ switch (compiler) {
+ case Compiler.dart2JS:
+ consumeFile = consumeThrough(inOrder([
+ "[Error from Dart2JS]:",
+ startsWith(p.join("web", "file.dart") + ":")
+ ]));
+ consumeSubfile = consumeThrough(inOrder([
+ "[Error from Dart2JS]:",
+ startsWith(p.join("web", "subdir", "subfile.dart") + ":")
+ ]));
+ break;
+ case Compiler.dartDevc:
+ consumeFile = consumeThrough(inOrder([
+ startsWith("Error compiling dartdevc module:"),
+ contains(p.join("web", "file.dart"))
+ ]));
+ consumeSubfile = consumeThrough(inOrder([
+ startsWith("Error compiling dartdevc module:"),
+ contains(p.join("web", "subdir", "subfile.dart"))
+ ]));
+ break;
+ }
// It's nondeterministic what order the dart2js transformers start running,
// so we allow the error messages to be emitted in either order.
diff --git a/test/compiler/source_maps_are_self_contained_test.dart b/test/compiler/source_maps_are_self_contained_test.dart
index d197bccf..0a227118 100644
--- a/test/compiler/source_maps_are_self_contained_test.dart
+++ b/test/compiler/source_maps_are_self_contained_test.dart
@@ -6,13 +6,15 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
+import 'utils.dart';
main() {
// This test is a bit shaky. Since dart2js is free to inline things, it's
// not precise as to which source libraries will actually be referenced in
// the source map. But this tries to use a type from a package and validate
// that its source ends up in the source map with a valid URI.
- integration("Source maps URIs for files in packages are self-contained", () {
+ integrationWithCompiler(
+ "Source maps URIs for files in packages are self-contained", (compiler) {
d.dir("foo", [
d.libPubspec("foo", "0.0.1"),
d.dir("lib", [
@@ -53,13 +55,14 @@ main() {
pubGet();
schedulePub(
- args: ["build", "--mode", "debug"],
+ args: ["build", "--mode", "debug", "--compiler", compiler.name],
output: new RegExp(r'Built \d+ files to "build".'),
exitCode: 0);
- d.dir(appPath, [
- d.dir("build", [
- d.dir("web", [
+ var expectedWebDir;
+ switch (compiler) {
+ case Compiler.dart2JS:
+ expectedWebDir = d.dir("web", [
d.matcherFile(
"main.dart.js.map",
// Note: we include the quotes to ensure this is the full URL path
@@ -67,13 +70,31 @@ main() {
contains(r'"packages/foo/foo.dart"')),
d.dir("sub", [
d.matcherFile(
- "main2.dart.js.map", contains(r'"../packages/foo/foo.dart"'))
+ "main2.dart.js.map", contains(r'"../packages/foo/foo.dart"')),
]),
d.dir("packages", [
- d.dir(r"foo", [d.matcherFile("foo.dart", contains("foo() {"))])
- ])
- ])
- ])
+ d.dir(r"foo", [d.matcherFile("foo.dart", contains("foo() {"))]),
+ ]),
+ ]);
+ break;
+ case Compiler.dartDevc:
+ expectedWebDir = d.dir("web", [
+ d.dir("packages", [
+ d.dir("foo", [
+ d.matcherFile("foo.dart", contains("foo() {")),
+ d.matcherFile('lib__foo.js', contains("foo.dart")),
+ ]),
+ ]),
+ d.matcherFile("web__main.js.map", contains(r'"main.dart"')),
+ d.matcherFile(
+ "web__sub__main2.js.map", contains(r'"sub/main2.dart"')),
+ ]);
+
+ break;
+ }
+
+ d.dir(appPath, [
+ d.dir("build", [expectedWebDir])
]).validate();
});
}
diff --git a/test/compiler/supports_configuration_with_build_test.dart b/test/compiler/supports_configuration_with_build_test.dart
index 14e8c083..5f993a0c 100644
--- a/test/compiler/supports_configuration_with_build_test.dart
+++ b/test/compiler/supports_configuration_with_build_test.dart
@@ -11,11 +11,12 @@ import 'package:scheduled_test/scheduled_test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
+import 'utils.dart';
main() {
- integration(
+ integrationWithCompiler(
"compiles dart.js and interop.js next to entrypoints when "
- "dartjs is explicitly configured", () {
+ "dartjs is explicitly configured", (compiler) {
serve([
d.dir('api', [
d.dir('packages', [
@@ -70,8 +71,8 @@ main() {
pubGet();
schedulePub(
- args: ["build"],
- output: new RegExp(r'Built 3 files to "build".'),
+ args: ["build", "--compiler", compiler.name],
+ output: new RegExp(r'Built \d+ files? to "build".'),
exitCode: 0);
d.dir(appPath, [
diff --git a/test/compiler/utils.dart b/test/compiler/utils.dart
new file mode 100644
index 00000000..b2bee254
--- /dev/null
+++ b/test/compiler/utils.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS d.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:pub/src/barback/compiler.dart';
+
+import '../test_pub.dart';
+
+// For convenience, otherwise we need this import in pretty much all tests.
+export 'package:pub/src/barback/compiler.dart';
+
+/// Runs an integration test once for each [Compiler] in [compilers], defaulting
+/// to [Compiler.dart2JS] and [Compiler.dartDevc].
+void integrationWithCompiler(String name, void testFn(Compiler compiler),
+ {List<Compiler> compilers}) {
+ compilers ??= [Compiler.dart2JS, Compiler.dartDevc];
+ for (var compiler in compilers) {
+ integration('--compiler=${compiler.name} $name', () => testFn(compiler));
+ }
+}
diff --git a/test/serve/utils.dart b/test/serve/utils.dart
index 1b37ae09..4a0411ed 100644
--- a/test/serve/utils.dart
+++ b/test/serve/utils.dart
@@ -7,6 +7,7 @@ import 'dart:convert';
import 'dart:io';
import 'package:http/http.dart' as http;
+import 'package:pub/src/barback/compiler.dart';
import 'package:pub/src/utils.dart';
import 'package:scheduled_test/scheduled_process.dart';
import 'package:scheduled_test/scheduled_stream.dart';
@@ -147,14 +148,17 @@ class DartTransformer extends Transformer {
///
/// Returns the `pub serve` process.
ScheduledProcess startPubServe(
- {Iterable<String> args, bool createWebDir: true}) {
+ {Iterable<String> args, bool createWebDir: true, Compiler compiler}) {
var pubArgs = [
"serve",
"--port=0", // Use port 0 to get an ephemeral port.
"--force-poll",
"--admin-port=0", // Use port 0 to get an ephemeral port.
- "--log-admin-url"
+ "--log-admin-url",
];
+ if (compiler != null) {
+ pubArgs.add("--compiler=${compiler.name}");
+ }
if (args != null) pubArgs.addAll(args);
@@ -169,8 +173,10 @@ ScheduledProcess startPubServe(
/// so pub doesn't complain about having nothing to serve.
///
/// Returns the `pub serve` process.
-ScheduledProcess pubServe({bool createWebDir: true, Iterable<String> args}) {
- _pubServer = startPubServe(args: args, createWebDir: createWebDir);
+ScheduledProcess pubServe(
+ {bool createWebDir: true, Iterable<String> args, Compiler compiler}) {
+ _pubServer =
+ startPubServe(args: args, createWebDir: createWebDir, compiler: compiler);
_portsCompleter = new Completer();
currentSchedule.onComplete.schedule(() {
--
GitLab