diff --git a/include/dependency.js b/include/dependency.js index 8a15380..1a797f8 100644 --- a/include/dependency.js +++ b/include/dependency.js @@ -21,13 +21,14 @@ module.exports = hexo => { } logger.info('=== Checking package dependencies ==='); - const missingDeps = Object.keys(packageInfo.peerDependencies) - .filter(name => !checkDependency(name, packageInfo.peerDependencies[name])); + const dependencies = Object.assign({}, packageInfo.peerDependencies, packageInfo.dependencies); + const missingDeps = Object.keys(dependencies) + .filter(name => !checkDependency(name, dependencies[name])); if (missingDeps && missingDeps.length) { logger.error('Please install the missing dependencies your Hexo site root directory:'); - logger.error(green('npm install --save ' + missingDeps.map(name => `${name}@${packageInfo.peerDependencies[name]}`).join(' '))); + logger.error(green('npm install --save ' + missingDeps.map(name => `${name}@${dependencies[name]}`).join(' '))); logger.error('or:'); - logger.error(green('yarn add ' + missingDeps.map(name => `${name}@${packageInfo.peerDependencies[name]}`).join(' '))); + logger.error(green('yarn add ' + missingDeps.map(name => `${name}@${dependencies[name]}`).join(' '))); process.exit(-1); } }; diff --git a/package.json b/package.json index 42b539d..a7b258c 100644 --- a/package.json +++ b/package.json @@ -22,18 +22,20 @@ }, "devDependencies": { "bulma-stylus": "0.8.0", - "deepmerge": "^4.2.2", "eslint": "^7.6.0", "eslint-config-hexo": "^4.1.0", "eslint-plugin-json": "^2.0.1", "eslint-plugin-react": "^7.17.0", "hexo": "^5.0.2", - "hexo-component-inferno": "^0.8.2", "hexo-log": "^2.0.0", "hexo-pagination": "^1.0.0", "hexo-renderer-inferno": "^0.1.3", - "hexo-renderer-stylus": "^1.1.0", - "hexo-util": "^2.2.0", + "hexo-renderer-stylus": "^2.0.0", + "hexo-util": "^2.2.0" + }, + "dependencies": { + "deepmerge": "^4.2.2", + "hexo-component-inferno": "^0.8.2", "inferno": "^7.3.3", "inferno-create-element": "^7.3.3", "moment": "^2.22.2", @@ -41,17 +43,11 @@ }, "peerDependencies": { "bulma-stylus": "0.8.0", - "deepmerge": "^4.2.2", "hexo": "^5.0.2", - "hexo-component-inferno": "^0.8.2", "hexo-log": "^2.0.0", "hexo-pagination": "^1.0.0", "hexo-renderer-inferno": "^0.1.3", - "hexo-renderer-stylus": "^1.1.0", - "hexo-util": "^2.2.0", - "inferno": "^7.3.3", - "inferno-create-element": "^7.3.3", - "moment": "^2.22.2", - "semver": ">=5.0.0" + "hexo-renderer-stylus": "^2.0.0", + "hexo-util": "^2.2.0" } }