Skip to content
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

Jump to bottom

Feature/fix dependencies #99

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/fix dependencies #99

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f1d1f0
feat: add caching on dependencies
phoenix741 Jun 28, 2024
49d19d6
fix: fix correction to read global patterns event if in package
phoenix741 Jun 28, 2024
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
24 changes: 17 additions & 7 deletions include-dependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ module.exports = class IncludeDependencies {
this.serverless = serverless;
this.options = options;
this.cache = new Set();
this.globalDependenciesCache = new Map();

this.hooks = {
'before:deploy:function:packageFunction': this.functionDeploy.bind(this),
Expand All @@ -53,7 +54,8 @@ module.exports = class IncludeDependencies {
}

addDependenciesForTarget(target, useCache = false) {
const filteredPatterns = this.getPatterns(target).filter(pattern => !pattern.startsWith('!') && !pattern.includes('node_modules'));
const patterns = this.getPatterns(target);
const filteredPatterns = patterns.filter(pattern => !pattern.startsWith('!') && !pattern.includes('node_modules'));
const files = Array.from(new Set(filteredPatterns))
.map(modulePath => glob.sync(modulePath, {
nodir: true,
Expand All @@ -63,7 +65,7 @@ module.exports = class IncludeDependencies {
).flat().map(file => file.replaceAll('\\', '/'));

files.forEach(fileName => {
const dependencies = this.getDependencies(fileName, target.package.patterns, useCache);
const dependencies = this.getDependencies(fileName, patterns, useCache);
target.package.patterns = union(target.package.patterns, dependencies);
});
}
Expand Down Expand Up @@ -99,7 +101,7 @@ module.exports = class IncludeDependencies {
}

getPatterns(target) {
return target.package?.patterns || [];
return union(this.serverless.service.package?.patterns || [], target.package?.patterns || []);
}

getPluginOptions() {
Expand All @@ -115,7 +117,8 @@ module.exports = class IncludeDependencies {
const individually = this.shouldPackageIndividually(functionObject);
const enableCaching = !individually && this.getPluginOptions().enableCaching;
const target = individually ? functionObject : service;
const dependencies = this.getDependencies(fileName, target.package.patterns, enableCaching && this.cache);
const patterns = this.getPatterns(target);
const dependencies = this.getDependencies(fileName, patterns, enableCaching && this.cache);
target.package.patterns = union(target.package.patterns, dependencies);

if (!individually) { return; }
Expand All @@ -141,9 +144,16 @@ module.exports = class IncludeDependencies {
}

getDependencies(fileName, patterns, useCache = false) {
const servicePath = this.serverless.config.servicePath;
const dependencies = getDependencyList(fileName, this.serverless, useCache && this.cache) || [];
const relativeDependencies = dependencies.map(p => path.relative(servicePath, p));
let relativeDependencies;
if (this.globalDependenciesCache.has(fileName)) {
relativeDependencies = this.globalDependenciesCache.get(fileName);
} else {
const servicePath = this.serverless.config.servicePath;
const dependencies = getDependencyList(fileName, this.serverless, useCache && this.cache) || [];
relativeDependencies = dependencies.map(p => path.relative(servicePath, p));

this.globalDependenciesCache.set(fileName, relativeDependencies);
}

const exclusions = patterns.filter(p => {
return !(p.indexOf('!node_modules') !== 0 || p === '!node_modules' || p === '!node_modules/**');
Expand Down