Skip to content

Support optional peer dependencies via packageJson.peerDependenciesMeta #44

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

Merged
merged 4 commits into from
Mar 4, 2020
Merged

Support optional peer dependencies via packageJson.peerDependenciesMeta #44

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82b703f
Support optional peer dependencies
seanmarthur Dec 12, 2019
447ea48
pass `packageJson.peerDependenciesMeta` to `handle`
seanmarthur Dec 12, 2019
a168712
Support peerDependenciesMeta
dryror Jan 27, 2020
1646f2b
Merge pull request #1 from dryror/master
seanmarthur Jan 27, 2020
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
Prev Previous commit
Next Next commit
pass packageJson.peerDependenciesMeta to handle
  • Loading branch information
@seanmarthur
seanmarthur authored Dec 12, 2019
commit 447ea480a080181a974805fdd6251c4eea28e14c
8 changes: 4 additions & 4 deletions get-dependency-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const requirePackageName = require('require-package-name');
const glob = require('glob');

function ignoreMissing(dependency, optional, peerDependenciesMeta) {
return optional && dependency in optional
return optional && dependency in optional
|| peerDependenciesMeta && dependency in peerDependenciesMeta && peerDependenciesMeta[dependency].optional;
}

Expand All @@ -22,7 +22,7 @@ module.exports = function(filename, serverless) {
const modulesToProcess = [];
const localFilesToProcess = [filename];

function handle(name, basedir, optionalDependencies) {
function handle(name, basedir, optionalDependencies, peerDependenciesMeta) {
const moduleName = requirePackageName(name.replace(/\\/, '/'));

try {
Expand All @@ -34,7 +34,7 @@ module.exports = function(filename, serverless) {
}
} catch (e) {
if (e.code === 'MODULE_NOT_FOUND') {
if (ignoreMissing(moduleName, optionalDependencies)) {
if (ignoreMissing(moduleName, optionalDependencies, peerDependenciesMeta)) {
serverless.cli.log(`[serverless-plugin-include-dependencies]: WARNING missing optional dependency: ${moduleName}`);
return null;
}
Expand Down Expand Up @@ -89,7 +89,7 @@ module.exports = function(filename, serverless) {

if (dependencies) {
Object.keys(dependencies).forEach(dependency => {
handle(dependency, currentModulePath, packageJson.optionalDependencies);
handle(dependency, currentModulePath, packageJson.optionalDependencies, packageJson.peerDependenciesMeta);
});
}
});
Expand Down