Skip to content

Commit

Permalink
fix(mobile): remove mobile-specific dependencies from root package
Browse files Browse the repository at this point in the history
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 #733
  • Loading branch information
jeffbcross committed May 12, 2016
1 parent 7f86ab3 commit 263e23b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 19 deletions.
2 changes: 2 additions & 0 deletions addon/ng2/blueprints/ng2/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
},
"devDependencies": {<% if(isMobile) { %>
"@angular/platform-server": "2.0.0-rc.1",
"@angular/router-deprecated": "2.0.0-rc.1",
"@angular/service-worker": "^0.1.13",
"angular2-broccoli-prerender": "^0.11.0",
"angular2-universal":"^0.100.3",
"angular2-universal-polyfills": "^0.4.1",
Expand Down
18 changes: 1 addition & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,6 @@
},
"homepage": "https://github.com/angular/angular-cli",
"dependencies": {
"@angular/common": "2.0.0-rc.1",
"@angular/compiler": "2.0.0-rc.1",
"@angular/core": "2.0.0-rc.1",
"@angular/platform-browser": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
"@angular/platform-server": "2.0.0-rc.1",
"@angular/router": "2.0.0-rc.1",
"angular2-broccoli-prerender": "^0.11.0",
"angular2-universal": "^0.100.3",
"angular2-universal-polyfills": "^0.4.1",
"broccoli": "^1.0.0-beta.7",
"broccoli-caching-writer": "^2.2.1",
"broccoli-concat": "^2.2.0",
Expand All @@ -51,26 +41,20 @@
"chalk": "^1.1.3",
"ember-cli": "2.5.0",
"ember-cli-string-utils": "^1.0.0",
"es6-shim": "^0.35.0",
"exit": "^0.1.2",
"fs-extra": "^0.30.0",
"glob": "^7.0.3",
"handlebars": "^4.0.5",
"leek": "0.0.21",
"lodash": "^4.11.1",
"opn": "4.0.1",
"preboot": "^2.0.10",
"reflect-metadata": "0.1.3",
"resolve": "^1.1.7",
"rxjs": "^5.0.0-beta.6",
"shelljs": "^0.7.0",
"silent-error": "^1.0.0",
"symlink-or-copy": "^1.0.3",
"systemjs": "0.19.26",
"systemjs-builder": "^0.15.16",
"typescript": "^1.8.10",
"typings": "^0.8.1",
"zone.js": "^0.6.12"
"typings": "^0.8.1"
},
"ember-addon": {
"paths": [
Expand Down
5 changes: 3 additions & 2 deletions tests/e2e/e2e_workflow.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function existsSync(path) {
}
}

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

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

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

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

0 comments on commit 263e23b

Please sign in to comment.