github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-22 21:38:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Inline isAbsolute method

Browse Source 
This allows fs-plus to be required through the cache
This commit is contained in:
Kevin Sawicki
2014-10-09 15:23:17 -07:00
parent 40c5289e2b
commit a6866656b7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/module-cache.coffee
View File

@@ -20,6 +20,15 @@ requireDependencies = ->
fs ?= require 'fs-plus'
semver ?= require 'semver'
# isAbsolute is inlined from fs-plus so that fs-plust itself can be required
# from this cache.
if process.platform is 'win32'
isAbsolute = (pathToCheck) ->
pathToCheck and (pathToCheck[1] is ':' or (pathToCheck[0] is '\\' and pathToCheck[1] is '\\'))
else
isAbsolute = (pathToCheck) ->
pathToCheck and pathToCheck[0] is '/'
loadDependencies = (modulePath, rootPath, rootMetadata, moduleCache) ->
for childPath in fs.listSync(path.join(modulePath, 'node_modules'))
continue if path.basename(childPath) is '.bin'
@@ -87,7 +96,7 @@ satisfies = (version, rawRange) ->
resolveFilePath = (relativePath, parentModule) ->
return unless relativePath
return unless parentModule?.filename
return unless relativePath[0] is '.' or fs.isAbsolute(relativePath)
return unless relativePath[0] is '.' or isAbsolute(relativePath)
return if relativePath[relativePath.length - 1] is '/'
resolvedPath = path.resolve(path.dirname(parentModule.filename), relativePath)
@@ -109,7 +118,7 @@ resolveModulePath = (relativePath, parentModule) ->
return if nativeModules.hasOwnProperty(relativePath)
return if relativePath[0] is '.'
return if relativePath[relativePath.length - 1] is '/'
return if fs.isAbsolute(relativePath)
return if isAbsolute(relativePath)
folderPath = path.dirname(parentModule.filename)