Refactor path resolve #116
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| var fs = require("fs") | ||
| var path = require("path") | ||
| var resolve = require("resolve") | ||
|
|
||
| var moduleDirectories = [ | ||
| "web_modules", | ||
| "node_modules", | ||
| ] | ||
|
|
||
| function isFilePromise(path) { | ||
| return new Promise(function(resolve, reject) { | ||
| fs.stat(path, function(err, stat) { | ||
| if (err) { | ||
| if (err.code === "ENOENT") { | ||
| return resolve(false) | ||
| } | ||
| return reject(err) | ||
| } | ||
| resolve(stat.isFile() || stat.isFIFO()) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| function resolvePromise(id, opts) { | ||
| return new Promise(function(res, rej) { | ||
| resolve(id, opts, function(err, path) { | ||
| if (err) { | ||
| return rej(err) | ||
| } | ||
| res(path) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| module.exports = function(id, base, paths) { | ||
| var resolveOpts = { | ||
| basedir: base, | ||
| moduleDirectory: moduleDirectories, | ||
| paths: paths, | ||
| extensions: [ ".css" ], | ||
| packageFilter: function processPackage(pkg) { | ||
| pkg.main = pkg.style || "index.css" | ||
| return pkg | ||
| }, | ||
| } | ||
| return resolvePromise(id, resolveOpts).catch(function() { | ||
| // fix to try relative files on windows with "./" | ||
| // if it's look like it doesn't start with a relative path already | ||
| // if (id.match(/^\.\.?/)) {throw e} | ||
| return resolvePromise("./" + id, resolveOpts) | ||
| }).catch(function() { | ||
| // LAST HOPE | ||
| return Promise.all(paths.map(function(p) { | ||
| return isFilePromise(path.resolve(p, id)) | ||
| })).then(function(results) { | ||
| for (var i = 0; i < results.length; i += 1) { | ||
| if (results[i]) { | ||
| return path.resolve(paths[i], id) | ||
| } | ||
| } | ||
|
|
||
| throw new Error([ | ||
| "Failed to find '" + id + "'", | ||
| "in [ ", | ||
| " " + paths.join(",\n "), | ||
| "]", | ||
| ].join("\n ")) | ||
| }) | ||
| }) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fyi, you can just add bower support by it to the
pathoption.So I would use
"bower_components" not supported by default anymore, use "path" option to add it back.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bower support is also bower.json support, which is not simple with main field as array.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know that, but bower is more a downloader, so I guess lots of people just point to the right css file when they import it (eg:
@import "jquery-slider-fx-2016/slider.css") so we don't really care about it. The idea is just to inform people that are currently using the feature we are breaking how to upgrade easily.