feat(angular2): update to beta 14

justindujardin · Apr 9, 2016 · 7afdd23 · 7afdd23
1 parent 78f2ead
commit 7afdd23
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 103 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -246,14 +246,7 @@ module.exports = function (grunt) {
     },
     webpack: {
       singleJs: require('./webpack.config.js')
-    },
-
-    universal: {
-      examples: {
-        src: 'index.html'
-      }
     }
-
   });
 
   grunt.loadNpmTasks('grunt-contrib-copy');
@@ -361,98 +354,6 @@ module.exports = function (grunt) {
     });
   });
 
-  // NOTE: This task does not work.  It is WIP.
-  grunt.registerMultiTask('universal', 'Prerender examples app as static HTML', function () {
-    var done = this.async();
-    /*
-     * based on angular2-grunt-prerender
-     * https://github.com/angular/universal
-     *
-     * Copyright (c) 2016 Wassim Chegham
-     * Licensed under the MIT license.
-     */
-    try {
-      var proxyquire = require('proxyquire');
-      var zone = require('zone.js');
-      var reflect = require('reflect-metadata');
-      var provide = require('angular2/core');
-      var router = require('angular2/router');
-      var ng2material = require('./ng2-material/all');
-      ng2material['@global'] = true;
-      ng2material['@noCallThru'] = true;
-      var app = proxyquire('./examples/app', {
-        'ng2-material/all': ng2material
-      });
-      var all = proxyquire('./examples/all', {
-        'ng2-material/all': ng2material
-      });
-      var universal = require('angular2-universal-preview');
-      var options = this.options({
-        component: [app.DemosApp],
-        providers: ng2material.MATERIAL_NODE_PROVIDERS,
-        platformProviders: [
-          universal.NODE_LOCATION_PROVIDERS,
-        ],
-        directives: ng2material.MATERIAL_DIRECTIVES.concat(all.DEMO_DIRECTIVES),
-        preboot: false,
-        separator: '\r\n'
-      });
-      var angular2Prerender = function (file) {
-        var clientHtml = file.toString();
-        // bootstrap and render component to string
-        var bootloader = options.bootloader;
-        if (!options.bootloader) {
-          options.bootloader = {
-            component: options.component,
-            document: universal.parseDocument(clientHtml),
-            providers: options.providers,
-            componentProviders: options.componentProviders,
-            platformProviders: options.platformProviders,
-            directives: options.directives,
-            preboot: options.preboot
-          };
-        }
-        bootloader = universal.Bootloader.create(options.bootloader);
-        return bootloader.serializeApplication().then(function (html) {
-          return new Buffer(html);
-        });
-      };
-      this.files.forEach(function (f) {
-        var src = f.src.filter(function (filepath) {
-            if (!grunt.file.exists(filepath)) {
-              grunt.log.warn('Source file "' + filepath + '" not found.');
-              return false;
-            }
-            else {
-              return true;
-            }
-          })
-          .map(function (filepath) {
-            return grunt.file.read(filepath);
-          })
-          .join(grunt.util.normalizelf(options.separator));
-        // Handle options.
-        angular2Prerender(src)
-          .then(function (buffer) {
-            return src = buffer;
-          })
-          .then(function (_src) {
-            return grunt.file.write(f.dest, _src);
-          })
-          .then(function (_) {
-            return grunt.log.writeln('File "' + f.dest + '" created.');
-            done();
-          });
-      });
-
-    }
-    catch (e) {
-      console.error(e.stack);
-      return;
-    }
-
-  });
-
   grunt.registerTask('site-meta', 'Build metadata files describing example usages', function (tag) {
     var done = this.async();
     var glob = require('glob');

diff --git a/examples/platform/node/bootstrap.ts b/examples/platform/node/bootstrap.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from "angular2-universal-preview";
+import {bootstrap} from "angular2-universal";
 import {ROUTER_PROVIDERS} from "angular2/router"; 
 import {MATERIAL_NODE_PROVIDERS} from "ng2-material/all";
 import {HTTP_PROVIDERS} from "angular2/http";

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "test": "$(npm bin)/grunt karma"
   },
   "dependencies": {
-    "angular2": ">=2.0.0-beta.12",
+    "angular2": ">=2.0.0-beta.14",
     "es6-promise": ">=3.0.2",
     "es6-shim": ">=0.35.0",
     "reflect-metadata": "0.1.2",
@@ -24,7 +24,8 @@
   },
   "typings": "dist/ng2-material.d.ts",
   "devDependencies": {
-    "angular2-universal-preview": "*",
+    "angular2-universal-polyfills": "^0.3.4",
+    "angular2-universal": "0.90.2",
     "autoprefixer": "6.2.0",
     "coveralls": "2.11.6",
     "css": "^2.2.1",

diff --git a/tsconfig.json b/tsconfig.json
@@ -60,7 +60,6 @@
         "ng2-material/core/util/util.ts",
         "ng2-material/core/util/viewport.ts",
         "ng2-material/webpack_all.ts",
-        "ng2-material/webpack_scripts.ts",
         "ng2-material/webpack_styles.ts",
         "examples/all.ts",
         "examples/app.ts",