Skip to content

Commit 263e23b

Browse files
committed
fix(mobile): remove mobile-specific dependencies from root package
Also wait to npm install inside e2e tests until after linking local angular-cli, and change execution of `ngBin` to be windows-friendly. Part of angular#733
1 parent 7f86ab3 commit 263e23b

File tree

3 files changed

+6
-19
lines changed

3 files changed

+6
-19
lines changed

addon/ng2/blueprints/ng2/files/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
},
3030
"devDependencies": {<% if(isMobile) { %>
3131
"@angular/platform-server": "2.0.0-rc.1",
32+
"@angular/router-deprecated": "2.0.0-rc.1",
33+
"@angular/service-worker": "^0.1.13",
3234
"angular2-broccoli-prerender": "^0.11.0",
3335
"angular2-universal":"^0.100.3",
3436
"angular2-universal-polyfills": "^0.4.1",

package.json

+1-17
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@
3030
},
3131
"homepage": "https://github.com/angular/angular-cli",
3232
"dependencies": {
33-
"@angular/common": "2.0.0-rc.1",
34-
"@angular/compiler": "2.0.0-rc.1",
35-
"@angular/core": "2.0.0-rc.1",
36-
"@angular/platform-browser": "2.0.0-rc.1",
37-
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
38-
"@angular/platform-server": "2.0.0-rc.1",
39-
"@angular/router": "2.0.0-rc.1",
40-
"angular2-broccoli-prerender": "^0.11.0",
41-
"angular2-universal": "^0.100.3",
42-
"angular2-universal-polyfills": "^0.4.1",
4333
"broccoli": "^1.0.0-beta.7",
4434
"broccoli-caching-writer": "^2.2.1",
4535
"broccoli-concat": "^2.2.0",
@@ -51,26 +41,20 @@
5141
"chalk": "^1.1.3",
5242
"ember-cli": "2.5.0",
5343
"ember-cli-string-utils": "^1.0.0",
54-
"es6-shim": "^0.35.0",
5544
"exit": "^0.1.2",
5645
"fs-extra": "^0.30.0",
5746
"glob": "^7.0.3",
5847
"handlebars": "^4.0.5",
5948
"leek": "0.0.21",
6049
"lodash": "^4.11.1",
6150
"opn": "4.0.1",
62-
"preboot": "^2.0.10",
63-
"reflect-metadata": "0.1.3",
6451
"resolve": "^1.1.7",
65-
"rxjs": "^5.0.0-beta.6",
6652
"shelljs": "^0.7.0",
6753
"silent-error": "^1.0.0",
6854
"symlink-or-copy": "^1.0.3",
69-
"systemjs": "0.19.26",
7055
"systemjs-builder": "^0.15.16",
7156
"typescript": "^1.8.10",
72-
"typings": "^0.8.1",
73-
"zone.js": "^0.6.12"
57+
"typings": "^0.8.1"
7458
},
7559
"ember-addon": {
7660
"paths": [

tests/e2e/e2e_workflow.spec.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function existsSync(path) {
1919
}
2020
}
2121

22-
const ngBin = path.join(process.cwd(), 'bin', 'ng');
22+
const ngBin = `node ${path.join(process.cwd(), 'bin', 'ng')}`;
2323

2424
describe('Basic end-to-end Workflow', function () {
2525
before(conf.setup);
@@ -47,7 +47,7 @@ describe('Basic end-to-end Workflow', function () {
4747
it('Can create new project using `ng new test-project`', function () {
4848
this.timeout(4200000);
4949

50-
return ng(['new', 'test-project']).then(function () {
50+
return ng(['new', 'test-project', '--skip-npm']).then(function () {
5151
expect(existsSync(path.join(root, 'test-project')));
5252
});
5353
});
@@ -57,6 +57,7 @@ describe('Basic end-to-end Workflow', function () {
5757
process.chdir(path.join(root, 'test-project'));
5858
sh.exec('npm link angular-cli', { silent: true });
5959
expect(path.basename(process.cwd())).to.equal('test-project');
60+
sh.exec('npm install');
6061
});
6162

6263
it('Supports production builds via `ng build --environment=production`', function() {

0 commit comments

Comments
 (0)