chore(rebase): Rebase latest

Author: Urigo

gulpfile.js

@@ -46,7 +46,7 @@ var LIVE_EXAMPLES_PATH = path.join(RESOURCES_PATH, 'live-examples');
 var STYLES_SOURCE_PATH = path.join(TOOLS_PATH, 'styles-builder/less');
 
 var docShredder = require(path.resolve(TOOLS_PATH, 'doc-shredder/doc-shredder'));
-var ExampleZipper = require(path.resolve(TOOLS_PATH, 'example-zipper/exampleZipper'));
+var exampleZipper = require(path.resolve(TOOLS_PATH, '_example-zipper/exampleZipper'));
 var regularPlunker = require(path.resolve(TOOLS_PATH, 'plunker-builder/regularPlunker'));
 var embeddedPlunker = require(path.resolve(TOOLS_PATH, 'plunker-builder/embeddedPlunker'));
 var fsUtils = require(path.resolve(TOOLS_PATH, 'fs-utils/fsUtils'));
@@ -86,7 +86,6 @@ var _excludeMatchers = _excludePatterns.map(function(excludePattern){
 var _exampleBoilerplateFiles = [
   'src/styles.css',
   'src/systemjs.config.js',
-  'src/systemjs-angular-loader.js',
   'src/tsconfig.json',
   'bs-config.json',
   'bs-config.e2e.json',
@@ -573,7 +572,9 @@ gulp.task('build-and-serve', ['build-docs'], function (cb) {
   watchAndSync({localFiles: true}, cb);
 });
 
-gulp.task('build-docs', ['build-devguide-docs', 'build-api-docs', 'build-plunkers', '_zip-examples']);
+gulp.task('build-docs', ['build-devguide-docs', 'build-api-docs', 'build-plunkers']);
+// Stop zipping examples Feb 28, 2016
+//gulp.task('build-docs', ['build-devguide-docs', 'build-api-docs', 'build-plunkers', '_zip-examples']);
 
 gulp.task('build-api-docs', ['build-js-api-docs', 'build-ts-api-docs']);
 
@@ -786,8 +787,8 @@ gulp.task('_shred-clean-api', function(cb) {
 });
 
 gulp.task('_zip-examples', function() {
-  new ExampleZipper(_devguideShredOptions.examplesDir, _devguideShredOptions.zipDir);
-  // exampleZipper.zipExamples(_apiShredOptions.examplesDir, _apiShredOptions.zipDir);
+  exampleZipper.zipExamples(_devguideShredOptions.examplesDir, _devguideShredOptions.zipDir);
+  exampleZipper.zipExamples(_apiShredOptions.examplesDir, _apiShredOptions.zipDir);
 });
 
 

public/_data.json

@@ -15,6 +15,10 @@
     "autoformat": "true"
   },
 
+  "news": {
+    "title": "News"
+  },
+
   "events": {
     "title": "Events",
     "subtitle": "Where we'll be presenting"

public/_includes/_footer.jade

@@ -41,7 +41,7 @@ div(class="main-footer" data-swiftype-index="false")
       ul.text-body
         li <a href="/events.html">Events</a>
         li <a href="http://www.meetup.com/topics/angularjs/">Meetups</a>
-        li <a href="https://twitter.com/angular"> Twitter</a>
+        li <a href="https://twitter.com/angularjs"> Twitter</a>
         li <a href="https://github.com/angular/angular"> GitHub</a>
         li <a href="/contribute.html"> Contribute</a>
 

public/_includes/_main-nav.jade

@@ -10,4 +10,5 @@ nav(data-swiftype-index="false" class="main-nav l-pinned-top l-layer-5", scroll-
     li.l-left <a class="main-nav-button" href="/features.html" md-button>Features</a>
     li.l-left <a class="main-nav-button" href="/docs/#{language}/latest/" md-button>Docs</a>
     li.l-left <a class="main-nav-button" href="/events.html" md-button>Events</a>
+    li.l-left <a class="main-nav-button" href="/news.html" md-button>News</a>
     li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>Get Started</a>

public/docs/_examples/.gitignore

@@ -1,7 +1,6 @@
 # _boilerplate files
 !_boilerplate/*
 */*/src/styles.css
-*/*/src/systemjs-angular-loader.js
 */*/src/systemjs.config.js
 */*/src/tsconfig.json
 */*/bs-config.e2e.json

public/docs/_examples/_boilerplate/package.json

@@ -38,7 +38,7 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "angular-cli": "^1.0.0-rc.0"
+    "angular-cli": "^1.0.0-beta.26"
   },
   "repository": {}
 }

public/docs/_examples/_boilerplate/src/systemjs-angular-loader.js

@@ -11,7 +11,7 @@
     // map tells the System loader where to look for things
     map: {
       // our app is within the app folder
-      'app': 'app',
+      app: 'app',
 
       // angular bundles
       '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
@@ -32,12 +32,7 @@
     packages: {
       app: {
         main: './main.js',
-        defaultExtension: 'js',
-        meta: {
-          './*.js': {
-            loader: 'systemjs-angular-loader.js'
-          }
-        }
+        defaultExtension: 'js'
       },
       rxjs: {
         defaultExtension: 'js'

public/docs/_examples/_boilerplate/src/systemjs.config.js

@@ -34,9 +34,8 @@
     },
     // map tells the System loader where to look for things
     map: {
-      'ng-loader': './systemjs-angular-loader.js',
       // our app is within the app folder
-      'app': 'app',
+      app: 'app',
 
       // angular bundles
       '@angular/core': 'ng:core-builds/master/bundles/core.umd.js',
@@ -72,12 +71,7 @@
     packages: {
       app: {
         main: './main.ts',
-        defaultExtension: 'ts',
-        meta: {
-          './*.ts': {
-            loader: 'ng-loader'
-          }
-        }
+        defaultExtension: 'ts'
       },
       rxjs: {
         defaultExtension: 'js'

public/docs/_examples/_boilerplate/src/systemjs.config.web.build.js

@@ -31,9 +31,8 @@
     },
     // map tells the System loader where to look for things
     map: {
-      'ng-loader': './systemjs-angular-loader.js',
       // our app is within the app folder
-      'app': 'app',
+      app: 'app',
 
       // angular bundles
       '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
@@ -59,12 +58,7 @@
     packages: {
       app: {
         main: './main.ts',
-        defaultExtension: 'ts',
-        meta: {
-          './*.ts': {
-            loader: 'ng-loader'
-          }
-        }
+        defaultExtension: 'ts'
       },
       rxjs: {
         defaultExtension: 'js'