Skip to content

Commit

Permalink
fix: package.json no dependencies or devdependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
sky committed Sep 7, 2019
1 parent ebff8f1 commit 05cee63
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion lib/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ const BASE_FRAMEWORKS = ['vue', 'react', 'weex', 'html', 'js'];
exports.getFramework = baseDir => {
const pkgFile = path.join(baseDir, 'package.json');
const pkg = require(pkgFile);
const { dependencies = {}, devDependencies = {} } = pkg;
return BASE_FRAMEWORKS.find(framework => {
const key = `${BASE_SOLUTION}-${framework}`;
return pkg.dependencies[key] || pkg.devDependencies[key];
return dependencies[key] || devDependencies[key];
});
};

Expand Down
4 changes: 2 additions & 2 deletions lib/core/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ class Config {
this.loaders = this.utils.cloneDeep(require('../../config/loader'));
this.plugins = this.utils.cloneDeep(require('../../config/plugin'));
const pkgFile = path.join(this.baseDir, 'package.json');
const devDependencies = fs.existsSync(pkgFile) ? require(pkgFile).devDependencies : {};
const fullDependencies = require('../../package.json').fullDependencies;
const devDependencies = fs.existsSync(pkgFile) ? require(pkgFile).devDependencies || {} : {};
const fullDependencies = require('../../package.json').fullDependencies || {};
this.dependencies = this.utils.getDeps(devDependencies, fullDependencies);
}

Expand Down
3 changes: 2 additions & 1 deletion utils/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,8 @@ utils.isEgg = config => {
const pkg = require(path.join(config.baseDir, 'package.json'));
const vuePKGName = 'egg-view-vue-ssr';
const reactPKGName = 'egg-view-react-ssr';
const hasDeps = pkg.dependencies[vuePKGName] || pkg.dependencies[reactPKGName];
const dependencies = pkg.dependencies || {} ;
const hasDeps = dependencies[vuePKGName] || dependencies[reactPKGName];
if (hasDeps) {
return true;
}
Expand Down

0 comments on commit 05cee63

Please sign in to comment.