fix(version): update version of @angular packages. (#3145)

And remove unnecessary dependencies.
angular · Nov 16, 2016 · a2f0a1a · a2f0a1a
1 parent 27a034d
commit a2f0a1a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 77 deletions.
diff --git a/package.json b/package.json
@@ -45,14 +45,12 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
     "@angular-cli/ast-tools": "^1.0.0",
-    "@angular/common": "~2.1.0",
-    "@angular/compiler": "~2.1.0",
-    "@angular/compiler-cli": "~2.1.0",
-    "@angular/core": "~2.1.0",
-    "@angular/platform-browser": "~2.1.0",
-    "@angular/platform-server": "~2.1.0",
+    "@angular/compiler": "^2.1.0",
+    "@angular/compiler-cli": "^2.1.0",
+    "@angular/core": "^2.1.0",
     "@angular/tsc-wrapped": "^0.3.0",
     "angular2-template-loader": "^0.5.0",
+    "autoprefixer": "^6.5.3",
     "awesome-typescript-loader": "^2.2.3",
     "chalk": "^1.1.3",
     "common-tags": "^1.3.1",
@@ -107,6 +105,7 @@
     "quick-temp": "0.1.5",
     "raw-loader": "^0.5.1",
     "readline2": "0.1.1",
+    "reflect-metadata": "^0.1.8",
     "remap-istanbul": "^0.6.4",
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",

diff --git a/packages/angular-cli/blueprints/ng2/files/package.json b/packages/angular-cli/blueprints/ng2/files/package.json
@@ -12,14 +12,14 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "~2.1.0",
-    "@angular/compiler": "~2.1.0",
-    "@angular/core": "~2.1.0",
-    "@angular/forms": "~2.1.0",
-    "@angular/http": "~2.1.0",
-    "@angular/platform-browser": "~2.1.0",
-    "@angular/platform-browser-dynamic": "~2.1.0",
-    "@angular/router": "~3.1.0",
+    "@angular/common": "^2.1.0",
+    "@angular/compiler": "^2.1.0",
+    "@angular/core": "^2.1.0",
+    "@angular/forms": "^2.1.0",
+    "@angular/http": "^2.1.0",
+    "@angular/platform-browser": "^2.1.0",
+    "@angular/platform-browser-dynamic": "^2.1.0",
+    "@angular/router": "^3.1.0",
     "core-js": "^2.4.1",
     "rxjs": "5.0.0-beta.12",
     "ts-helpers": "^1.1.1",
@@ -33,6 +33,7 @@
     "angular2-universal-polyfills": "0.4.1",
     "preboot": "2.1.2",
     "parse5": "1.5.1",<% } %>
+    "@angular/compiler-cli": "^2.1.0",
     "@types/jasmine": "^2.2.30",
     "@types/node": "^6.0.42",
     "angular-cli": "<%= version %>",

diff --git a/packages/angular-cli/ember-cli/lib/models/addon.js b/packages/angular-cli/ember-cli/lib/models/addon.js
@@ -22,8 +22,8 @@ var AddonsFactory   = require('../models/addons-factory');
 var CoreObject = require('../ext/core-object');
 var Project = require('./project');
 
-var upstreamMergeTrees = require('broccoli-merge-trees');
-var Funnel     = require('broccoli-funnel');
+// var upstreamMergeTrees = require('broccoli-merge-trees');
+// var Funnel     = require('broccoli-funnel');
 var walkSync   = require('walk-sync');
 
 
@@ -79,31 +79,6 @@ function Addon(parent, project) {
   }
   this.nodeModulesPath = nodeModulesPath(this.root);
 
-  this.treePaths = {
-    app:               'app',
-    styles:            'app/styles',
-    templates:         'app/templates',
-    addon:             'addon',
-    'addon-styles':    'addon/styles',
-    'addon-templates': 'addon/templates',
-    vendor:            'vendor',
-    'test-support':    'test-support',
-    'addon-test-support': 'addon-test-support',
-    public:            'public'
-  };
-
-  this.treeForMethods = {
-    app:               'treeForApp',
-    styles:            'treeForStyles',
-    templates:         'treeForTemplates',
-    'addon-templates': 'treeForAddonTemplates',
-    addon:             'treeForAddon',
-    vendor:            'treeForVendor',
-    'test-support':    'treeForTestSupport',
-    'addon-test-support': 'treeForAddonTestSupport',
-    public:            'treeForPublic'
-  };
-
   p.setupRegistry(this);
 
   if (!this.name) {
@@ -148,7 +123,7 @@ Addon.prototype._requireBuildPackages = function() {
     return new Funnel(tree, options);
   });
 
-  this.mergeTrees = deprecatedAddonFilters(this, 'this.mergeTrees', 'broccoli-merge-trees', mergeTrees);
+  // this.mergeTrees = deprecatedAddonFilters(this, 'this.mergeTrees', 'broccoli-merge-trees', mergeTrees);
   this.walkSync = deprecatedAddonFilters(this, 'this.walkSync', 'node-walk-sync', walkSync);
 };
 
@@ -278,33 +253,33 @@ Addon.prototype.treeFor = function treeFor(name) {
     trees.push(this.jshintAddonTree());
   }
 
-  return mergeTrees(trees.filter(Boolean), {
-    overwrite: true,
-    annotation: 'Addon#treeFor (' + this.name + ' - ' + name + ')'
-  });
-};
-
-/**
-  @private
-  @param {String} name
-  @method _treeFor
-  @return {tree}
-*/
-Addon.prototype._treeFor = function _treeFor(name) {
-  var treePath = path.resolve(this.root, this.treePaths[name]);
-  var treeForMethod = this.treeForMethods[name];
-  var tree;
-
-  // if (existsSync(treePath)) {
-  //   tree = this.treeGenerator(treePath);
-  // }
-
-  if (this[treeForMethod]) {
-    tree = this[treeForMethod](tree);
-  }
-
-  return tree;
-};
+  // return mergeTrees(trees.filter(Boolean), {
+  //   overwrite: true,
+  //   annotation: 'Addon#treeFor (' + this.name + ' - ' + name + ')'
+  // });
+};
+//
+// /**
+//   @private
+//   @param {String} name
+//   @method _treeFor
+//   @return {tree}
+// */
+// Addon.prototype._treeFor = function _treeFor(name) {
+//   var treePath = path.resolve(this.root, this.treePaths[name]);
+//   var treeForMethod = this.treeForMethods[name];
+//   var tree;
+//
+//   // if (existsSync(treePath)) {
+//   //   tree = this.treeGenerator(treePath);
+//   // }
+//
+//   if (this[treeForMethod]) {
+//     tree = this[treeForMethod](tree);
+//   }
+//
+//   return tree;
+// };
 
 /**
   This method is called when the addon is included in a build. You

diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json
@@ -27,13 +27,6 @@
   "dependencies": {
     "@angular-cli/ast-tools": "^1.0.1",
     "@angular-cli/base-href-webpack": "^1.0.0",
-    "@angular/common": "~2.1.0",
-    "@angular/compiler": "~2.1.0",
-    "@angular/compiler-cli": "~2.1.0",
-    "@angular/core": "~2.1.0",
-    "@angular/platform-browser": "~2.1.0",
-    "@angular/platform-server": "~2.1.0",
-    "@angular/tsc-wrapped": "~0.3.0",
     "@ngtools/webpack": "latest",
     "angular2-template-loader": "^0.5.0",
     "awesome-typescript-loader": "^2.2.3",

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -30,6 +30,7 @@
   "peerDependencies": {
     "typescript": "^2.0.2",
     "@angular/compiler-cli": "^2.1.0",
-    "@angular/core": "^2.0.0"
+    "@angular/core": "^2.0.0",
+    "reflect-metadata": "^0.1.8"
   }
 }