Skip to content

fix: fix fis.require package need #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xtx1130 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: fix fis.require package need #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9636804
fix: fix fis.require global package need
xtx1130 Dec 8, 2017
1bbded9
fix: fix undefined.path bug
xtx1130 Dec 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions fis-kernel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

'use strict';

var paths = require('path');
var klawSync = require('klaw-sync');
var last = Date.now();

//oo
Expand Down Expand Up @@ -78,6 +80,7 @@ fis.require = function(){
var name = Array.prototype.slice.call(arguments, 0).join('-');
if(fis.require._cache.hasOwnProperty(name)) return fis.require._cache[name];
var names = [];
var projectModulePath = void 0;
for(var i = 0, len = fis.require.prefixes.length; i < len; i++){
try {
var pluginName = fis.require.prefixes[i] + '-' + name;
Expand All @@ -89,8 +92,22 @@ fis.require = function(){
fis.log.error('load plugin [' + pluginName + '] error : ' + e.message);
}
} catch (e){
if (e.code !== 'MODULE_NOT_FOUND') {
throw e;
try {
projectModulePath = klawSync(process.cwd(), {
nofile:true,
filter: function(item){
return item.path.match(pluginName)
}
});
projectModulePath = projectModulePath.length ? projectModulePath[0].path : void 0;
if(!projectModulePath)
throw e;
path = require.resolve(projectModulePath);
return fis.require._cache[name] = require(projectModulePath);
} catch (e) {
if (e.code !== 'MODULE_NOT_FOUND') {
throw e;
}
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fis-kernel",
"description": "fis kernel.",
"version": "2.0.19",
"version": "2.0.20",
"author": "FIS Team <fis@baidu.com>",
"homepage": "http://fis.baidu.com/",
"license": "MIT",
Expand All @@ -20,8 +20,9 @@
"test": "mocha test/ut"
},
"dependencies": {
"tar": "2.2.1",
"iconv-lite": "0.2.10"
"iconv-lite": "0.2.10",
"klaw-sync": "^3.0.2",
"tar": "2.2.1"
},
"devDependencies": {
"chai": "1.9.1",
Expand Down