From 87e32cd80dc1cc8576d6bfaf71e484953143475c Mon Sep 17 00:00:00 2001 From: Kathy Walrath Date: Thu, 31 Mar 2016 14:56:52 -0700 Subject: [PATCH] docs(dart/quickstart): merge 2 examples into 1 --- .../_examples/quickstart/dart/ex1/pubspec.yaml | 12 ------------ .../_examples/quickstart/dart/ex2/web/index.html | 16 ---------------- .../_examples/quickstart/dart/ex2/web/main.dart | 10 ---------- .../quickstart/dart/{ex2 => }/pubspec.yaml | 5 +++++ .../quickstart/dart/{ex1 => }/web/index.html | 0 .../quickstart/dart/{ex1 => }/web/main.dart | 0 public/docs/dart/latest/quickstart.jade | 10 +++++----- 7 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 public/docs/_examples/quickstart/dart/ex1/pubspec.yaml delete mode 100644 public/docs/_examples/quickstart/dart/ex2/web/index.html delete mode 100644 public/docs/_examples/quickstart/dart/ex2/web/main.dart rename public/docs/_examples/quickstart/dart/{ex2 => }/pubspec.yaml (71%) rename public/docs/_examples/quickstart/dart/{ex1 => }/web/index.html (100%) rename public/docs/_examples/quickstart/dart/{ex1 => }/web/main.dart (100%) diff --git a/public/docs/_examples/quickstart/dart/ex1/pubspec.yaml b/public/docs/_examples/quickstart/dart/ex1/pubspec.yaml deleted file mode 100644 index 0254fd3eb0..0000000000 --- a/public/docs/_examples/quickstart/dart/ex1/pubspec.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# #docregion -name: angular2_getting_started -description: QuickStart -version: 0.0.1 -environment: - sdk: '>=1.13.0 <2.0.0' -dependencies: - angular2: 2.0.0-beta.12 - browser: ^0.10.0 -transformers: -- angular2: - entry_points: web/main.dart diff --git a/public/docs/_examples/quickstart/dart/ex2/web/index.html b/public/docs/_examples/quickstart/dart/ex2/web/index.html deleted file mode 100644 index a1e925b8fb..0000000000 --- a/public/docs/_examples/quickstart/dart/ex2/web/index.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - Getting Started - - - - - - - - - Loading... - - diff --git a/public/docs/_examples/quickstart/dart/ex2/web/main.dart b/public/docs/_examples/quickstart/dart/ex2/web/main.dart deleted file mode 100644 index 3d1f7a3015..0000000000 --- a/public/docs/_examples/quickstart/dart/ex2/web/main.dart +++ /dev/null @@ -1,10 +0,0 @@ -// #docregion -import 'package:angular2/core.dart'; -import 'package:angular2/platform/browser.dart'; - -@Component(selector: 'my-app', template: '

My First Angular 2 App

') -class AppComponent {} - -main() { - bootstrap(AppComponent); -} diff --git a/public/docs/_examples/quickstart/dart/ex2/pubspec.yaml b/public/docs/_examples/quickstart/dart/pubspec.yaml similarity index 71% rename from public/docs/_examples/quickstart/dart/ex2/pubspec.yaml rename to public/docs/_examples/quickstart/dart/pubspec.yaml index b6bca476bc..0fdec66a3f 100644 --- a/public/docs/_examples/quickstart/dart/ex2/pubspec.yaml +++ b/public/docs/_examples/quickstart/dart/pubspec.yaml @@ -1,4 +1,6 @@ +# #docplaster # #docregion +# #docregion no-rewriter name: angular2_getting_started description: QuickStart version: 0.0.1 @@ -7,8 +9,11 @@ environment: dependencies: angular2: 2.0.0-beta.12 browser: ^0.10.0 +# #enddocregion no-rewriter dart_to_js_script_rewriter: ^1.0.1 +# #docregion no-rewriter transformers: - angular2: entry_points: web/main.dart +# #enddocregion no-rewriter - dart_to_js_script_rewriter diff --git a/public/docs/_examples/quickstart/dart/ex1/web/index.html b/public/docs/_examples/quickstart/dart/web/index.html similarity index 100% rename from public/docs/_examples/quickstart/dart/ex1/web/index.html rename to public/docs/_examples/quickstart/dart/web/index.html diff --git a/public/docs/_examples/quickstart/dart/ex1/web/main.dart b/public/docs/_examples/quickstart/dart/web/main.dart similarity index 100% rename from public/docs/_examples/quickstart/dart/ex1/web/main.dart rename to public/docs/_examples/quickstart/dart/web/main.dart diff --git a/public/docs/dart/latest/quickstart.jade b/public/docs/dart/latest/quickstart.jade index 3f99d37ed8..df9e92cac5 100644 --- a/public/docs/dart/latest/quickstart.jade +++ b/public/docs/dart/latest/quickstart.jade @@ -43,7 +43,7 @@ p. Angular 2 is still changing, so provide an exact version: 2.0.0-beta.12. - +makeExample('quickstart/dart/ex1/pubspec.yaml', null, 'pubspec.yaml') + +makeExample('quickstart/dart/pubspec.yaml', 'no-rewriter', 'pubspec.yaml') p. In the same directory, create a web directory, and then @@ -71,7 +71,7 @@ p. p. Paste the following code into web/main.dart: - +makeExample('quickstart/dart/ex1/web/main.dart', null, 'web/main.dart') + +makeExample('quickstart/dart/web/main.dart', null, 'web/main.dart') :marked You've just defined an Angular 2 **component**, @@ -119,7 +119,7 @@ p. Create a file named web/index.html that contains the following code: - +makeExample('quickstart/dart/ex1/web/index.html', null, 'web/index.html') + +makeExample('quickstart/dart/web/index.html', null, 'web/index.html') :marked The `` tag in the `` is @@ -170,7 +170,7 @@ p. in both the `dependencies` and `transformers` sections. - var stylePattern = { pnk: /(dart_to_js_script_rewriter.*$)|(- dart_to_js_script_rewriter.*$)/gm, otl: /(dependencies:)|(transformers:)/g }; - +makeExample('quickstart/dart/ex2/pubspec.yaml', null, 'pubspec.yaml', stylePattern) + +makeExample('quickstart/dart/pubspec.yaml', null, 'pubspec.yaml', stylePattern) p. Then compile your Dart code to JavaScript, @@ -194,7 +194,7 @@ p. configure the Angular transformer: - var stylePattern = { otl: /(transformers:)|(- angular2:)|(entry_points.*$)/gm }; - +makeExample('quickstart/dart/ex2/pubspec.yaml', null, 'pubspec.yaml', stylePattern) + +makeExample('quickstart/dart/pubspec.yaml', null, 'pubspec.yaml', stylePattern) p. The entry_points item