Update build and serve commands to run in an isolate (#6)

Add example angular app to experiment with.
dart-lang · Jan 17, 2018 · bf1e804 · bf1e804
1 parent 7ce4e6a
commit bf1e804
Show file tree

Hide file tree

Showing 15 changed files with 134 additions and 20 deletions.
diff --git a/webdev/README.md b/webdev/README.md
@@ -0,0 +1,12 @@
+# Experimental Usage
+
+The example directory contains a package that is configured to work with
+`pub run webdev <command>`. Support for `pub global activate webdev` and simply
+adding a dev_dependency to your packages is coming soon.
+
+## Commands
+
+* __build__: Run builders to build a package.
+* __help__: Display help information for webdev.
+* __serve__: Run a local web development server and a file system watcher that
+  re-builds on changes.
diff --git a/webdev/example/lib/app_component.css b/webdev/example/lib/app_component.css
@@ -0,0 +1,3 @@
+:host {
+    /* This is equivalent of the 'body' selector of a page. */
+}
diff --git a/webdev/example/lib/app_component.dart b/webdev/example/lib/app_component.dart
@@ -0,0 +1,13 @@
+import 'package:angular/angular.dart';
+
+import 'src/hello_world/hello_world.dart';
+
+@Component(
+  selector: 'my-app',
+  styleUrls: const ['app_component.css'],
+  templateUrl: 'app_component.html',
+  directives: const [HelloWorldComponent],
+)
+class AppComponent {
+  // Nothing here.
+}
diff --git a/webdev/example/lib/app_component.html b/webdev/example/lib/app_component.html
@@ -0,0 +1,3 @@
+<h1>Webdev Example: Angular App</h1>
+
+<hello-world></hello-world>
diff --git a/webdev/example/lib/src/hello_world/hello_world.css b/webdev/example/lib/src/hello_world/hello_world.css
@@ -0,0 +1,3 @@
+div {
+  color: teal;
+}
diff --git a/webdev/example/lib/src/hello_world/hello_world.dart b/webdev/example/lib/src/hello_world/hello_world.dart
@@ -0,0 +1,10 @@
+import 'package:angular/angular.dart';
+
+@Component(
+  selector: 'hello-world',
+  styleUrls: const ['hello_world.css'],
+  templateUrl: 'hello_world.html',
+)
+class HelloWorldComponent {
+  // Nothing here.
+}
diff --git a/webdev/example/lib/src/hello_world/hello_world.html b/webdev/example/lib/src/hello_world/hello_world.html
@@ -0,0 +1 @@
+<div>Hello World<div>
diff --git a/webdev/example/pubspec.yaml b/webdev/example/pubspec.yaml
@@ -0,0 +1,25 @@
+name: webdev_example_app
+description: A web app example for webdev CLI.
+version: 0.0.1
+
+environment:
+  sdk: ">=2.0.0-dev.3.0 <2.0.0"
+
+dependencies:
+  angular: ^5.0.0-alpha+3
+  browser: ^0.10.0
+
+dev_dependencies:
+  webdev:
+    path: ../
+  ##############################################################################
+  # Temporary until build_runner exposes a function to generate it's script.
+  build_runner:
+    git:
+      url: https://github.com/dart-lang/build.git
+      path: build_runner
+  ##############################################################################
+
+dependency_overrides:
+  # Necessary with angular: ^5.0.0-alpha+1 dependency.
+  analyzer: ^0.31.0-alpha.1
diff --git a/webdev/example/web/index.html b/webdev/example/web/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>webdev example</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script defer src="main.dart" type="application/dart"></script>
+    <script defer src="packages/browser/dart.js"></script>
+    <link rel="stylesheet" href="styles.css">
+  </head>
+  <body>
+    <my-app>Loading...</my-app>
+  </body>
+</html>
diff --git a/webdev/example/web/main.dart b/webdev/example/web/main.dart
@@ -0,0 +1,7 @@
+import 'package:angular/angular.dart';
+import 'package:webdev_example_app/app_component.dart';
+import 'main.template.dart' as ng;
+
+main() {
+  bootstrapStatic(AppComponent, [/*providers*/], ng.initReflector);
+}
diff --git a/webdev/example/web/styles.css b/webdev/example/web/styles.css
@@ -0,0 +1,12 @@
+@import url(https://fonts.googleapis.com/css?family=Roboto);
+@import url(https://fonts.googleapis.com/css?family=Material+Icons);
+
+body {
+  max-width: 600px;
+  margin: 0 auto;
+  padding: 5vw;
+}
+
+* {
+  font-family: Roboto, Helvetica, Arial, sans-serif;
+}
diff --git a/webdev/lib/src/command/build_command.dart b/webdev/lib/src/command/build_command.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
-
-import 'package:io/io.dart';
+import 'dart:isolate';
 
 import 'build_runner_command_base.dart';
 
@@ -14,13 +13,11 @@ class BuildCommand extends BuildRunnerCommandBase {
 
   @override
   Future run() async {
-    final manager = new ProcessManager();
-    final executable = 'pub';
-    final arguments = ['run', 'build_runner', 'build', '--assume-tty'];
+    final arguments = ['build'];
     arguments.addAll(argResults.arguments);
-    var spawn = await manager.spawn(executable, arguments);
-
-    await spawn.exitCode;
-    await sharedStdIn.terminate();
+    var exitPort = new ReceivePort();
+    await Isolate.spawnUri(await buildRunnerScript, arguments, null,
+        onExit: exitPort.sendPort, automaticPackageResolution: true);
+    await exitPort.first;
   }
 }
diff --git a/webdev/lib/src/command/build_runner_command_base.dart b/webdev/lib/src/command/build_runner_command_base.dart
@@ -1,3 +1,6 @@
+import 'dart:async';
+import 'dart:io';
+
 import 'package:args/command_runner.dart';
 
 /// Extend to get a command with the arguments common to all build_runner
@@ -15,4 +18,14 @@ abstract class BuildRunnerCommandBase extends Command {
           negatable: false,
           help: 'Enables verbose logging.');
   }
+
+  Future<Uri> get buildRunnerScript async {
+    // TODO(nshahan) build_runner will expose this as a function call that will
+    // be imported to avoid running a binary in a transitive dependency with
+    // pub run.
+    final executable = 'pub';
+    final arguments = ['run', 'build_runner', 'generate-build-script'];
+    final results = await Process.run(executable, arguments);
+    return new Uri.file(results.stdout.toString().trim());
+  }
 }
diff --git a/webdev/lib/src/command/serve_command.dart b/webdev/lib/src/command/serve_command.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
-
-import 'package:io/io.dart';
+import 'dart:isolate';
 
 import 'build_runner_command_base.dart';
 
@@ -23,13 +22,11 @@ class ServeCommand extends BuildRunnerCommandBase {
 
   @override
   Future run() async {
-    final manager = new ProcessManager();
-    final executable = 'pub';
-    final arguments = ['run', 'build_runner', 'serve', '--assume-tty'];
+    final arguments = ['serve'];
     arguments.addAll(argResults.arguments);
-    var spawn = await manager.spawn(executable, arguments);
-
-    await spawn.exitCode;
-    await sharedStdIn.terminate();
+    var exitPort = new ReceivePort();
+    await Isolate.spawnUri(await buildRunnerScript, arguments, null,
+        onExit: exitPort.sendPort, automaticPackageResolution: true);
+    await exitPort.first;
   }
 }
diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml
@@ -4,11 +4,15 @@ author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/webdev
 
 environment:
-  sdk: ">=2.0.0-dev <2.0.0"
+  sdk: ">=2.0.0-dev.3.0 <2.0.0"
 
 dependencies:
   args: ^1.2.0
-  io: ^0.3.1
+  build_runner:
+    git:
+      url: https://github.com/dart-lang/build.git
+      path: build_runner
+  build_web_compilers: ^0.1.1
 
 dev_dependencies:
   test: "^0.12.0"