From 0f7dd62f16302f3017efc7217bf337186d927496 Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Mon, 29 Jun 2015 10:29:30 -0700 Subject: [PATCH] chore(npm): correct generated package json files. --- modules/angular2/package.json | 2 +- modules/angular2_material/package.json | 2 +- modules/benchpress/package.json | 7 ++++--- tools/broccoli/trees/node_tree.ts | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/angular2/package.json b/modules/angular2/package.json index d9b632d8f4..731c5233b1 100644 --- a/modules/angular2/package.json +++ b/modules/angular2/package.json @@ -13,5 +13,5 @@ "rx": "<%= packageJson.dependencies['rx'] %>", "zone.js": "<%= packageJson.dependencies['zone.js'] %>" }, - "devDependencies": <%= JSON.stringify(packageJson.devDependencies) %> + "devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %> } diff --git a/modules/angular2_material/package.json b/modules/angular2_material/package.json index fa08e91ea7..e2e0f1366e 100644 --- a/modules/angular2_material/package.json +++ b/modules/angular2_material/package.json @@ -13,5 +13,5 @@ "rx": "<%= packageJson.dependencies['rx'] %>", "zone.js": "<%= packageJson.dependencies['zone.js'] %>" }, - "devDependencies": <%= JSON.stringify(packageJson.devDependencies) %> + "devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %> } diff --git a/modules/benchpress/package.json b/modules/benchpress/package.json index cefc0fa4f9..2c80ee51e2 100644 --- a/modules/benchpress/package.json +++ b/modules/benchpress/package.json @@ -9,11 +9,12 @@ "license": "<%= packageJson.license %>", "dependencies": { "angular2": "<%= packageJson.version %>", - "firefox-profile": "<%= packageJson.devDependencies['firefox-profile'] %>", - "jpm": "<%= packageJson.devDependencies.jpm %>", "traceur": "<%= packageJson.dependencies.traceur %>", "selenium-webdriver": "<%= packageJson.dependencies['selenium-webdriver'] %>", "reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>" }, - "devDependencies": <%= JSON.stringify(packageJson.devDependencies) %> + "optionalDependencies": { + "jpm": "<%= packageJson.devDependencies.jpm %>", + "firefox-profile": "<%= packageJson.devDependencies['firefox-profile'] %>" + } } diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index 6bfc564dfd..080234ec21 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -63,7 +63,8 @@ module.exports = function makeNodeTree(destinationPath) { license: BASE_PACKAGE_JSON.license, contributors: BASE_PACKAGE_JSON.contributors, dependencies: BASE_PACKAGE_JSON.dependencies, - devDependencies: { + devDependencies: BASE_PACKAGE_JSON.devDependencies, + defaultDevDependencies: { "yargs": BASE_PACKAGE_JSON.devDependencies['yargs'], "gulp-sourcemaps": BASE_PACKAGE_JSON.devDependencies['gulp-sourcemaps'], "gulp-traceur": BASE_PACKAGE_JSON.devDependencies['gulp-traceur'],