From cbc1a9227c24715db3f090bbdee9671969724ae7 Mon Sep 17 00:00:00 2001 From: Bernhard Rode Date: Tue, 28 Feb 2017 07:37:05 +0100 Subject: [PATCH 1/2] refactor: sort dependencies alphabetically Sorted dependencies makes merging a lot easier. Helps a lot, when upgrading the cli and pulling in the correct deps. --- .../cli/blueprints/ng/files/package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json index f35a9e6c93a6..6277c118ecae 100644 --- a/packages/@angular/cli/blueprints/ng/files/package.json +++ b/packages/@angular/cli/blueprints/ng/files/package.json @@ -3,12 +3,12 @@ "version": "0.0.0", "license": "MIT", "scripts": { - "ng": "ng", - "start": "ng serve", "build": "ng build", - "test": "ng test", + "e2e": "ng e2e", "lint": "ng lint", - "e2e": "ng e2e" + "ng": "ng", + "start": "ng serve", + "test": "ng test" }, "private": true, "dependencies": { @@ -17,8 +17,8 @@ "@angular/core": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/forms": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/http": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", - "@angular/platform-browser": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/platform-browser-dynamic": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", + "@angular/platform-browser": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/router": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^3.4.0' %>", "core-js": "^2.4.1", "rxjs": "^5.1.0", @@ -32,12 +32,12 @@ "codelyzer": "~2.0.0", "jasmine-core": "~2.5.2", "jasmine-spec-reporter": "~3.2.0", - "karma": "~1.4.1", "karma-chrome-launcher": "~2.0.0", "karma-cli": "~1.0.1", - "karma-jasmine": "~1.1.0", - "karma-jasmine-html-reporter": "^0.2.2", "karma-coverage-istanbul-reporter": "^0.2.0", + "karma-jasmine-html-reporter": "^0.2.2", + "karma-jasmine": "~1.1.0", + "karma": "~1.4.1", "protractor": "~5.1.0", "ts-node": "~2.0.0", "tslint": "~4.4.2", From 39912b88265f4ab07ed6da7471e4ad8da4fc5c93 Mon Sep 17 00:00:00 2001 From: Bernhard Rode Date: Wed, 1 Mar 2017 07:49:26 +0100 Subject: [PATCH 2/2] refactor: sort dependencies alphabetically --- packages/@angular/cli/blueprints/ng/files/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/@angular/cli/blueprints/ng/files/package.json b/packages/@angular/cli/blueprints/ng/files/package.json index 6277c118ecae..91a1be77a038 100644 --- a/packages/@angular/cli/blueprints/ng/files/package.json +++ b/packages/@angular/cli/blueprints/ng/files/package.json @@ -17,8 +17,8 @@ "@angular/core": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/forms": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/http": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", - "@angular/platform-browser-dynamic": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/platform-browser": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", + "@angular/platform-browser-dynamic": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^2.4.0' %>", "@angular/router": "<%= ng4 ? '>=4.0.0-beta <5.0.0' : '^3.4.0' %>", "core-js": "^2.4.1", "rxjs": "^5.1.0", @@ -34,9 +34,9 @@ "jasmine-spec-reporter": "~3.2.0", "karma-chrome-launcher": "~2.0.0", "karma-cli": "~1.0.1", - "karma-coverage-istanbul-reporter": "^0.2.0", - "karma-jasmine-html-reporter": "^0.2.2", "karma-jasmine": "~1.1.0", + "karma-jasmine-html-reporter": "^0.2.2", + "karma-coverage-istanbul-reporter": "^0.2.0", "karma": "~1.4.1", "protractor": "~5.1.0", "ts-node": "~2.0.0",