8000 fix(version): update version of @angular packages. by hansl · Pull Request #3145 · angular/angular-cli · GitHub
[go: up one dir, main page]
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(version): update version of @angular packages. 
And remove unnecessary dependencies.
  • Loading branch information
@hansl
hansl committed Nov 16, 2016
commit 6a74cbf6c0a1fd32d90c0b05749f99a9ebc90d59
11 changes: 5 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
17 changes: 9 additions & 8 deletions packages/angular-cli/blueprints/ng2/files/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
},
"private": true,
10000 "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",
Expand All @@ -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 %>",
Expand Down
85 changes: 30 additions & 55 deletions packages/angular-cli/ember-cli/lib/models/addon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');


Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
};

Expand Down Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions packages/angular-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion packages/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
0