(docs) gettingstarted: Update to alpha-37 and latest guidance

wardbell · naomiblack · commit b7ee01600059 · 2015-09-30T13:05:01.000-07:00
-- squashed commits --
(examples) gettingstarted: Update to alpha-37
(fix) gettingstarted: remove id=output from template; e2e spec looks for h1 instead
(fix) gettingstarted: simplified tsd commands
(fix) gettingstarted: simplified tsd commands
gettingStarted.jade updated for tooling-4
(docs) gettingstarted example revised for system 0.19, tsd 0.6.5, and as preface to ToH
(docs) update gettingstarted to our current recommendation (still needs to be vetted)
(docs) fix:gettingStarted.jade - small clarification after following instructions on clean directory.
(docs) gettingstarted jade updated w/ tool version advice and John's suggestions
diff --git a/public/docs/_examples/gettingstarted/e2e-spec.js b/public/docs/_examples/gettingstarted/e2e-spec.js
@@ -11,7 +11,7 @@ describe('Getting Started E2E Tests', function () {
 		});
 
 		it('should display: ' + expectedMsg, function () {
-			expect(element(by.id('output')).getText()).toEqual(expectedMsg);
+			expect(element(by.css('h1')).getText()).toEqual(expectedMsg);
 		});
 	}
 	// #enddocregion
diff --git a/public/docs/_examples/gettingstarted/js/app.js b/public/docs/_examples/gettingstarted/js/app.js
@@ -9,7 +9,7 @@ var AppComponent = ng
     // #enddocregion
     // #docregion view
     .View({
-      template: '<h1 id="output">My First Angular 2 App</h1>'
+      template: '<h1>My First Angular 2 App</h1>'
     })
     // #enddocregion
     // #docregion class
diff --git a/public/docs/_examples/gettingstarted/ts/README.md b/public/docs/_examples/gettingstarted/ts/README.md
@@ -1,8 +1,6 @@
 #Getting Started (TS) for the DevGuide developer
 
-This is the source code for the "Getting Started" Typescrip example code.
-
-There are files here that are *for the audience* and **not to be executed during example development**!  
+This is the source code for the "Getting Started" Typescript example code.
 
 * **package.json** - as the audience will see it; the example reaches up to the site level **node_modules**
 and the scripts are not supposed to work here.
diff --git a/public/docs/_examples/gettingstarted/ts/package.json b/public/docs/_examples/gettingstarted/ts/package.json
@@ -1,15 +1,16 @@
 {
-  "name": "ng2-getting-started",
-  "version": "0.0.1",
-  "dependencies": {
-    "angular2": "2.0.0-alpha.35",
-    "es6-module-loader": "^0.16",
-    "systemjs": "^0.16",
-    "traceur": "0.0.91"
-  },
+  "name": "angular2-getting-started",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
   "scripts": {
-    "postinstall": "cd src && tsd reinstall -r -o && cd ..",
-    "tsc": "tsc -p src -w",
-    "start": "live-server --open=src"
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "angular2": "^2.0.0-alpha.37",
+    "systemjs": "^0.19.2"
   }
 }
diff --git a/public/docs/_examples/gettingstarted/ts/src/app/app.ts b/public/docs/_examples/gettingstarted/ts/src/app/app.ts
@@ -1,21 +1,19 @@
 // #docregion
 // #docregion import
 import {Component, View, bootstrap} from 'angular2/angular2';
-// #enddocregion
-
+// #enddocregion import
 // #docregion class-w-annotations
 @Component({
   selector: 'my-app'
 })
 @View({
-  template: '<h1 id="output">My First Angular 2 App</h1>'
+  template: '<h1>My First Angular 2 App</h1>'
 })
 // #docregion class
 class AppComponent { }
-// #enddocregion
-// #enddocregion
+// #enddocregion class
+// #enddocregion class-w-annotations
 
 // #docregion bootstrap
 bootstrap(AppComponent);
-// #enddocregion
-// #enddocregion
+// #enddocregion bootstrap
diff --git a/public/docs/_examples/gettingstarted/ts/src/dummy.spec.ts b/public/docs/_examples/gettingstarted/ts/src/dummy.spec.ts
diff --git a/public/docs/_examples/gettingstarted/ts/src/index.html b/public/docs/_examples/gettingstarted/ts/src/index.html
@@ -1,16 +1,20 @@
-<!-- #docregion -->
 <!DOCTYPE html>
+<!-- #docregion -->
 <html>
   <head>
     <script src="../node_modules/traceur/bin/traceur-runtime.js"></script>
-    <script src="../node_modules/es6-module-loader/dist/es6-module-loader.js"></script>
     <script src="../node_modules/systemjs/dist/system.src.js"></script>
     <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
   </head>
+
   <body>
-    <my-app></my-app>
+    <my-app>Loading...</my-app>
     <script>
-      System.import('app');
+      System.config({
+        packages: {'app': {defaultExtension: 'js'}}
+      });
+      System.import('app/app');
     </script>
   </body>
-</html>
+
+</html>
diff --git a/public/docs/_examples/gettingstarted/ts/src/tsconfig.json b/public/docs/_examples/gettingstarted/ts/src/tsconfig.json
@@ -4,6 +4,8 @@
     "module": "commonjs",
     "sourceMap": true,
     "emitDecoratorMetadata": true,
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "removeComments": false,
+    "noImplicitAny": true
   }
 }
diff --git a/public/docs/_examples/gettingstarted/ts/src/tsd.json b/public/docs/_examples/gettingstarted/ts/src/tsd.json
diff --git a/public/docs/_examples/styleguide/package.json b/public/docs/_examples/styleguide/package.json
@@ -1,10 +1,9 @@
 {
-  "name": "ng2-getting-started",
+  "name": "getting-started",
   "version": "0.0.1",
   "dependencies": {
-    "angular2": "2.0.0-alpha.35",
-    "es6-module-loader": "^0.16",
-    "systemjs": "^0.16",
+    "angular2": "2.0.0-alpha.37",
+    "systemjs": "^0.18.17",
     "traceur": "0.0.91"
   },
   "scripts": {
diff --git a/public/docs/js/latest/guide/gettingStarted.jade b/public/docs/js/latest/guide/gettingStarted.jade
@@ -165,7 +165,7 @@ include ../../../../_includes/_util-fns
     in the root directory of our application.
 
   pre.prettyprint.lang-bash
-    code tsd query angular2 es6-promise rx rx-lite jasmine --action install --save
+    code tsd install angular2 --save
 
   :markdown
     We'll find a ***typings*** folder in the root directory
diff --git a/public/docs/ts/latest/guide/gettingStarted.jade b/public/docs/ts/latest/guide/gettingStarted.jade

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ describe('Getting Started E2E Tests', function () {`
`11`	`11`	`});`
`12`	`12`
`13`	`13`	`it('should display: ' + expectedMsg, function () {`
`14`		`- expect(element(by.id('output')).getText()).toEqual(expectedMsg);`
	`14`	`+ expect(element(by.css('h1')).getText()).toEqual(expectedMsg);`
`15`	`15`	`});`
`16`	`16`	`}`
`17`	`17`	`// #enddocregion`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`"module": "commonjs",`
`5`	`5`	`"sourceMap": true,`
`6`	`6`	`"emitDecoratorMetadata": true,`
`7`		`- "experimentalDecorators": true`
	`7`	`+ "experimentalDecorators": true,`
	`8`	`+ "removeComments": false,`
	`9`	`+ "noImplicitAny": true`
`8`	`10`	`}`
`9`	`11`	`}`