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

Fix packaging with files that contain dots as part of the name #8130

Merged
merged 2 commits into from Aug 27, 2020
Merged

Fix packaging with files that contain dots as part of the name #8130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a6df26
Fix packaging with files that contain dots as part of the name
crash7 Aug 25, 2020
42de6cc
Update globby to v11 and replace nanomatch with micromatch
crash7 Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/plugins/package/lib/packageService.js
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
const path = require('path');
const globby = require('globby');
const _ = require('lodash');
const nanomatch = require('nanomatch');
const micromatch = require('micromatch');
const serverlessConfigFileUtils = require('../../../../lib/utils/getServerlessConfigFile');

module.exports = {
Expand Down Expand Up @@ -257,14 +257,14 @@ module.exports = {
}).then(allFilePaths => {
const filePathStates = allFilePaths.reduce((p, c) => Object.assign(p, { [c]: true }), {});
patterns
// nanomatch only does / style path delimiters, so convert them if on windows
// micromatch only does / style path delimiters, so convert them if on windows
.map(p => {
return process.platform === 'win32' ? p.replace(/\\/g, '/') : p;
})
.forEach(p => {
const exclude = p.startsWith('!');
const pattern = exclude ? p.slice(1) : p;
nanomatch(allFilePaths, [pattern], { dot: true }).forEach(key => {
micromatch(allFilePaths, [pattern], { dot: true }).forEach(key => {
filePathStates[key] = !exclude;
});
});
Expand Down
4 changes: 3 additions & 1 deletion lib/plugins/package/lib/packageService.test.js
View file
Open in desktop
Expand Up @@ -612,12 +612,14 @@ describe('#packageService()', () => {
// independent file paths
const handlerFile = 'src/function/handler.js';
const utilsFile = 'src/utils/utils.js';
const dotsFile = 'src/dots/[...file].js';
let servicePath;

beforeEach(() => {
servicePath = createTmpDir();
fse.ensureFileSync(path.join(servicePath, handlerFile));
fse.ensureFileSync(path.join(servicePath, utilsFile));
fse.ensureFileSync(path.join(servicePath, dotsFile));
});

it('should exclude all and include function/handler.js', () => {
Expand Down Expand Up @@ -651,7 +653,7 @@ describe('#packageService()', () => {
exclude: [],
include: [`!${utilsFile}`],
};
const expected = [handlerFile];
const expected = [dotsFile, handlerFile];
serverless.config.servicePath = servicePath;

return expect(
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@
"filesize": "^3.6.1",
"fs-extra": "^8.1.0",
"get-stdin": "^6.0.0",
"globby": "^9.2.0",
"globby": "^11.0.1",
"graceful-fs": "^4.2.4",
"https-proxy-agent": "^5.0.0",
"is-docker": "^1.1.0",
Expand All @@ -57,8 +57,8 @@
"jwt-decode": "^2.2.0",
"lodash": "^4.17.20",
"memoizee": "^0.4.14",
"micromatch": "^4.0.2",
"mkdirp": "^0.5.4",
"nanomatch": "^1.2.13",
"ncjsm": "^4.1.0",
"node-fetch": "^2.6.0",
"object-hash": "^2.0.3",
Expand Down