From c1a163359315d96a3b64c5d578c9d2554b9501b6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Jun 2013 09:30:33 -0700 Subject: [PATCH 1/3] Break on first path match --- src/app/package-config-view.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/package-config-view.coffee b/src/app/package-config-view.coffee index eb403fca5..07cfd2824 100644 --- a/src/app/package-config-view.coffee +++ b/src/app/package-config-view.coffee @@ -139,6 +139,7 @@ class PackageConfigView extends View for packageDirPath in config.bundledPackageDirPaths if packagePath.indexOf("#{packageDirPath}/") is 0 @bundled = true + break version = loadedPackage?.metadata.version unless version From 94c1ed4c289728a687245bd07fe99e9257b2af1e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Jun 2013 09:32:20 -0700 Subject: [PATCH 2/3] Add node_modules dir to config.bundledPackageDirPaths array --- src/app/config.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/config.coffee b/src/app/config.coffee index 8673f950c..bb8315cb1 100644 --- a/src/app/config.coffee +++ b/src/app/config.coffee @@ -8,6 +8,7 @@ pathWatcher = require 'pathwatcher' configDirPath = fsUtils.absolute("~/.atom") bundledPackagesDirPath = fsUtils.join(resourcePath, "src/packages") +nodeModulesDirPath = fsUtils.join(resourcePath, "node_modules") bundledThemesDirPath = fsUtils.join(resourcePath, "themes") vendoredPackagesDirPath = fsUtils.join(resourcePath, "vendor/packages") vendoredThemesDirPath = fsUtils.join(resourcePath, "vendor/themes") @@ -22,7 +23,7 @@ module.exports = class Config configDirPath: configDirPath themeDirPaths: [userThemesDirPath, bundledThemesDirPath, vendoredThemesDirPath] - bundledPackageDirPaths: [vendoredPackagesDirPath, bundledPackagesDirPath] + bundledPackageDirPaths: [vendoredPackagesDirPath, bundledPackagesDirPath, nodeModulesDirPath] packageDirPaths: [userPackagesDirPath, vendoredPackagesDirPath, bundledPackagesDirPath] userPackagesDirPath: userPackagesDirPath lessSearchPaths: [fsUtils.join(resourcePath, 'static'), fsUtils.join(resourcePath, 'vendor')] From 2b6a4365acddb744036af51bd5da8088fde611c3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Jun 2013 09:34:53 -0700 Subject: [PATCH 3/3] Upgrade apm --- vendor/apm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/apm b/vendor/apm index 01ded1c72..13385e0b3 160000 --- a/vendor/apm +++ b/vendor/apm @@ -1 +1 @@ -Subproject commit 01ded1c72cb71a0ac85fe267e3dafc370797211f +Subproject commit 13385e0b36db757b0f7a97faecdffbe5ac363c4b