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

Commit a2f0a1a

Browse files
hanslhansl
authored
fix(version): update version of @angular packages. (angular#3145)
And remove unnecessary dependencies.
1 parent 27a034d commit a2f0a1a

File tree

5 files changed

+46
-77
lines changed

5 files changed

+46
-77
lines changed

‎package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,12 @@
4545
"homepage": "https://github.com/angular/angular-cli",
4646
"dependencies": {
4747
"@angular-cli/ast-tools": "^1.0.0",
48-
"@angular/common": "~2.1.0",
49-
"@angular/compiler": "~2.1.0",
50-
"@angular/compiler-cli": "~2.1.0",
51-
"@angular/core": "~2.1.0",
52-
"@angular/platform-browser": "~ 8000 2.1.0",
53-
"@angular/platform-server": "~2.1.0",
48+
"@angular/compiler": "^2.1.0",
49+
"@angular/compiler-cli": "^2.1.0",
50+
"@angular/core": "^2.1.0",
5451
"@angular/tsc-wrapped": "^0.3.0",
5552
"angular2-template-loader": "^0.5.0",
53+
"autoprefixer": "^6.5.3",
5654
"awesome-typescript-loader": "^2.2.3",
5755
"chalk": "^1.1.3",
5856
"common-tags": "^1.3.1",
@@ -107,6 +105,7 @@
107105
"quick-temp": "0.1.5",
108106
"raw-loader": "^0.5.1",
109107
"readline2": "0.1.1",
108+
"reflect-metadata": "^0.1.8",
110109
"remap-istanbul": "^0.6.4",
111110
"resolve": "^1.1.7",
112111
"rimraf": "^2.5.3",

‎packages/angular-cli/blueprints/ng2/files/package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/common": "~2.1.0",
16-
"@angular/compiler": "~2.1.0",
17-
"@angular/core": "~2.1.0",
18-
"@angular/forms": "~2.1.0",
19-
"@angular/http": "~2.1.0",
20-
"@angular/platform-browser": "~2.1.0",
21-
"@angular/platform-browser-dynamic": "~2.1.0",
22-
"@angular/router": "~3.1.0",
15+
"@angular/common": "^2.1.0",
16+
"@angular/compiler": "^2.1.0",
17+
"@angular/core": "^2.1.0",
18+
"@angular/forms": "^2.1.0",
19+
"@angular/http": "^2.1.0",
20+
"@angular/platform-browser": "^2.1.0",
21+
"@angular/platform-browser-dynamic": "^2.1.0",
22+
"@angular/router": "^3.1.0",
2323
"core-js": "^2.4.1",
2424
"rxjs": "5.0.0-beta.12",
2525
"ts-helpers": "^1.1.1",
@@ -33,6 +33,7 @@
3333
"angular2-universal-polyfills": "0.4.1",
3434
"preboot": "2.1.2",
3535
"parse5": "1.5.1",<% } %>
36+
"@angular/compiler-cli": "^2.1.0",
3637
"@types/jasmine": "^2.2.30",
3738
"@types/node": "^6.0.42",
3839
"angular-cli": "<%= version %>",

‎packages/angular-cli/ember-cli/lib/models/addon.js

Lines changed: 30 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ var AddonsFactory = require('../models/addons-factory');
2222
var CoreObject = require('../ext/core-object');
2323
var Project = require('./project');
2424

25-
var upstreamMergeTrees = require('broccoli-merge-trees');
26-
var Funnel = require('broccoli-funnel');
25+
// var upstreamMergeTrees = require('broccoli-merge-trees');
26+
// var Funnel = require('broccoli-funnel');
2727
var walkSync = require('walk-sync');
2828

2929

@@ -79,31 +79,6 @@ function Addon(parent, project) {
7979
}
8080
this.nodeModulesPath = nodeModulesPath(this.root);
8181

82-
this.treePaths = {
83-
app: 'app',
84-
styles: 'app/styles',
85-
templates: 'app/templates',
86-
addon: 'addon',
87-
'addon-styles': 'addon/styles',
88-
'addon-templates': 'addon/templates',
89-
vendor: 'vendor',
90-
'test-support': 'test-support',
91-
'addon-test-support': 'addon-test-support',
92-
public: 'public'
93-
};
94-
95-
this.treeForMethods = {
96-
app: 'treeForApp',
97-
styles: 'treeForStyles',
98-
templates: 'treeForTemplates',
99-
'addon-templates': 'treeForAddonTemplates',
100-
addon: 'treeForAddon',
101-
vendor: 'treeForVendor',
102-
'test-support': 'treeForTestSupport',
103-
'addon-test-support': 'treeForAddonTestSupport',
104-
public: 'treeForPublic'
105-
};
106-
10782
p.setupRegistry(this);
10883

10984
if (!this.name) {
@@ -148,7 +123,7 @@ Addon.prototype._requireBuildPackages = function() {
148123
return new Funnel(tree, options);
149124
});
150125

151-
this.mergeTrees = deprecatedAddonFilters(this, 'this.mergeTrees', 'broccoli-merge-trees', mergeTrees);
126+
// this.mergeTrees = deprecatedAddonFilters(this, 'this.mergeTrees', 'broccoli-merge-trees', mergeTrees);
152127
this.walkSync = deprecatedAddonFilters(this, 'this.walkSync', 'node-walk-sync', walkSync);
153128
};
154129

@@ -278,33 +253,33 @@ Addon.prototype.treeFor = function treeFor(name) {
278253
trees.push(this.jshintAddonTree());
279254
}
280255

281-
return mergeTrees(trees.filter(Boolean), {
282-
overwrite: true,
283-
annotation: 'Addon#treeFor (' + this.name + ' - ' + name + ')'
284-
});
285-
};
286-
287-
/**
288-
@private
289-
@param {String} name
290-
@method _treeFor
291-
@return {tree}
292-
*/
293-
Addon.prototype._treeFor = function _treeFor(name) {
294-
var treePath = path.resolve(this.root, this.treePaths[name]);
295-
var treeForMethod = this.treeForMethods[name];
296-
var tree;
297-
298-
// if (existsSync(treePath)) {
299-
// tree = this.treeGenerator(treePath);
300-
// }
301-
302-
if (this[treeForMethod]) {
303-
tree = this[treeForMethod](tree);
304-
}
305-
306-
return tree;
307-
};
256+
// return mergeTrees(trees.filter(Boolean), {
257+
// overwrite: true,
258+
// annotation: 'Addon#treeFor (' + this.name + ' - ' + name + ')'
259+
// });
260+
};
261+
//
262+
// /**
263+
// @private
264+
// @param {String} name
265+
// @method _treeFor
266+
// @return {tree}
267+
// */
268+
// Addon.prototype._treeFor = function _treeFor(name) {
269+
// var treePath = path.resolve(this.root, this.treePaths[name]);
270+
// var treeForMethod = this.treeForMethods[name];
271+
// var tree;
272+
//
273+
// // if (existsSync(treePath)) {
274+
// // tree = this.treeGenerator(treePath);
275+
// // }
276+
//
277+
// if (this[treeForMethod]) {
278+
// tree = this[treeForMethod](tree);
279+
// }
280+
//
281+
// return tree;
282+
// };
308283

309284
/**
310285
This method is called when the addon is included in a build. You

‎packages/angular-cli/package.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@
2727
"dependencies": {
2828
"@angular-cli/ast-tools": "^1.0.1",
2929
"@angular-cli/base-href-webpack": "^1.0.0",
30-
"@angular/common": "~2.1.0",
31-
"@angular/compiler": "~2.1.0",
32-
"@angular/compiler-cli": "~2.1.0",
33-
"@angular/core": "~2.1.0",
34-
"@angular/platform-browser": "~2.1.0",
35-
"@angular/platform-server": "~2.1.0",
36-
"@angular/tsc-wrapped": "~0.3.0",
3730
"@ngtools/webpack": "latest",
3831
"angular2-template-loader": "^0.5.0",
3932
"awesome-typescript-loader": "^2.2.3",

‎packages/webpack/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDif 64D8 f line numberDiff line change
@@ -30,6 +30,7 @@
3030
"peerDependencies": {
3131
"typescript": "^2.0.2",
3232
"@angular/compiler-cli": "^2.1.0",
33-
"@angular/core": "^2.0.0"
33+
"@angular/core": "^2.0.0",
34+
"reflect-metadata": "^0.1.8"
3435
}
3536
}

0 commit comments

Comments
 (0)
0