github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5487 from atom/ks-dedupe-q

Browse Source 
Upgrade and dedupe q
This commit is contained in:
Kevin Sawicki
2015-02-10 16:25:38 -08:00
parent 03148d56f2 d0b56ba9af
commit 090561eb00
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -47,9 +47,9 @@
"nslog": "^2.0.0",
"oniguruma": "^4.0.0",
"optimist": "0.4.0",
"pathwatcher": "^3.1.0",
"pathwatcher": "^3.1.1",
"property-accessors": "^1",
"q": "^1.0.1",
"q": "^1.1.2",
"random-words": "0.0.1",
"react-atom-fork": "^0.11.5",
"reactionary-atom-fork": "^1.0.0",
@@ -64,7 +64,7 @@
"space-pen": "3.8.2",
"stacktrace-parser": "0.1.1",
"temp": "0.7.0",
"text-buffer": "^4.0.0",
"text-buffer": "^4.1.1",
"theorist": "^1.0.2",
"underscore-plus": "^1.6.6",
"vm-compatibility-layer": "0.1.0"
@@ -109,12 +109,12 @@
"open-on-github": "0.32.0",
"package-generator": "0.37.0",
"release-notes": "0.47.0",
"settings-view": "0.175.0",
"settings-view": "0.176.0",
"snippets": "0.72.0",
"spell-check": "0.54.0",
"status-bar": "0.59.0",
"styleguide": "0.44.0",
"symbols-view": "0.81.0",
"symbols-view": "0.82.0",
"tabs": "0.65.0",
"timecop": "0.29.0",
"tree-view": "0.154.0",

2
script/bootstrap
View File

@@ -37,7 +37,7 @@ function bootstrap() {
var initialNpmCommand = fs.existsSync(npmPath) ? npmPath : 'npm';
var npmFlags = ' --userconfig=' + path.resolve('.npmrc') + ' ';
var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim'];
var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season', 'grim', 'q'];
var buildInstallCommand = initialNpmCommand + npmFlags + 'install';
var buildInstallOptions = {cwd: path.resolve(__dirname, '..', 'build')};