Skip to content

Commit 05cee63

Browse files
author
sky
committed
fix: package.json no dependencies or devdependencies
1 parent ebff8f1 commit 05cee63

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

lib/builder.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ const BASE_FRAMEWORKS = ['vue', 'react', 'weex', 'html', 'js'];
1212
exports.getFramework = baseDir => {
1313
const pkgFile = path.join(baseDir, 'package.json');
1414
const pkg = require(pkgFile);
15+
const { dependencies = {}, devDependencies = {} } = pkg;
1516
return BASE_FRAMEWORKS.find(framework => {
1617
const key = `${BASE_SOLUTION}-${framework}`;
17-
return pkg.dependencies[key] || pkg.devDependencies[key];
18+
return dependencies[key] || devDependencies[key];
1819
});
1920
};
2021

lib/core/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ class Config {
212212
this.loaders = this.utils.cloneDeep(require('../../config/loader'));
213213
this.plugins = this.utils.cloneDeep(require('../../config/plugin'));
214214
const pkgFile = path.join(this.baseDir, 'package.json');
215-
const devDependencies = fs.existsSync(pkgFile) ? require(pkgFile).devDependencies : {};
216-
const fullDependencies = require('../../package.json').fullDependencies;
215+
const devDependencies = fs.existsSync(pkgFile) ? require(pkgFile).devDependencies || {} : {};
216+
const fullDependencies = require('../../package.json').fullDependencies || {};
217217
this.dependencies = this.utils.getDeps(devDependencies, fullDependencies);
218218
}
219219

utils/utils.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,8 @@ utils.isEgg = config => {
544544
const pkg = require(path.join(config.baseDir, 'package.json'));
545545
const vuePKGName = 'egg-view-vue-ssr';
546546
const reactPKGName = 'egg-view-react-ssr';
547-
const hasDeps = pkg.dependencies[vuePKGName] || pkg.dependencies[reactPKGName];
547+
const dependencies = pkg.dependencies || {} ;
548+
const hasDeps = dependencies[vuePKGName] || dependencies[reactPKGName];
548549
if (hasDeps) {
549550
return true;
550551
}

0 commit comments

Comments
 (0)