mirror of
https://github.com/wassname/talk.git
synced 2026-07-18 12:40:13 +08:00
Merge branch 'master' into live-reported
This commit is contained in:
+1
-1
@@ -15,9 +15,9 @@ const inquirer = require('inquirer');
|
||||
require('colors');
|
||||
const emoji = require('node-emoji');
|
||||
|
||||
const dir = process.cwd();
|
||||
const fs = require('fs-extra');
|
||||
const path = require('path');
|
||||
const dir = path.resolve(__dirname, '..');
|
||||
const spawn = require('cross-spawn');
|
||||
const semver = require('semver');
|
||||
const resolve = require('resolve');
|
||||
|
||||
+2
-2
@@ -110,7 +110,7 @@ function pluginPath(name) {
|
||||
try {
|
||||
return resolve.sync(name, {
|
||||
moduleDirectory: 'plugins',
|
||||
basedir: process.cwd(),
|
||||
basedir: __dirname,
|
||||
});
|
||||
} catch (e) {
|
||||
console.warn(e);
|
||||
@@ -119,7 +119,7 @@ function pluginPath(name) {
|
||||
}
|
||||
|
||||
try {
|
||||
return resolve.sync(name, { basedir: process.cwd() });
|
||||
return resolve.sync(name, { basedir: __dirname });
|
||||
} catch (e) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user