Improve globbing to support brace expansion

.github/workflows/build-test-deploy.yml

@@ -93,7 +93,7 @@ jobs:
           bucket: ${{ steps.update-stack.outputs.S3BucketName }}
           action: 'sync'
           src-dir: './test-fixtures'
-          files-glob: 'css/**'
+          files-glob: '{site-assets,css}/**/*'
           aws-region: 'us-east-1'
           prefix: 'preview'
           cache-control: 'public,max-age=31536000,immutable'

package.json

@@ -36,15 +36,16 @@
   "dependencies": {
     "@actions/core": "^1.6.0",
     "@actions/github": "^5.0.0",
-    "@actions/glob": "^0.2.0",
     "@aws-sdk/client-s3": "^3.44.0",
     "@aws-sdk/lib-storage": "^3.44.0",
+    "glob": "^7.2.0",
     "mime-types": "^2.1.34",
     "minimatch": "^3.0.4",
     "s3-etag": "^0.0.6"
   },
   "devDependencies": {
     "@octokit/webhooks-definitions": "^3.67.3",
+    "@types/glob": "^7.2.0",
     "@types/mime-types": "^2.1.1",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^17.0.0",

src/__tests__/s3.test.ts

@@ -36,6 +36,16 @@ describe('getObjectKeyFromFilePath', () => {
     const files = await getFilesFromSrcDir(srcDir, '**/*.html');
     expect(files).toEqual([`${rootDir}/blog.html`, `${rootDir}/index.html`]);
   });
+
+  it('should find files using srcDir and filesGlob with brace expansion', async () => {
+    const srcDir = './test-fixtures';
+    const rootDir = path.join(path.resolve(process.cwd()), srcDir);
+    const files = await getFilesFromSrcDir(srcDir, '{css,site-assets}/**/*');
+    expect(files).toEqual([
+      `${rootDir}/css/styles.css`,
+      `${rootDir}/site-assets/script.js`,
+    ]);
+  });
 });
 
 describe('shouldUploadFile', () => {

src/s3.ts

@@ -1,6 +1,8 @@
 import path from 'node:path';
 import fs from 'node:fs';
+import util from 'node:util';
 import mime from 'mime-types';
+import glob from 'glob';
 import { generateETag } from 's3-etag';
 import {
   DeleteObjectsCommand,
@@ -14,8 +16,7 @@ import {
   ServiceOutputTypes,
 } from '@aws-sdk/client-s3';
 import { Upload } from '@aws-sdk/lib-storage';
-import glob from '@actions/glob';
-import { debug, error, info } from '@actions/core';
+import { debug, info } from '@actions/core';
 import minimatch from 'minimatch';
 
 import { workspace } from './github.js';
@@ -234,10 +235,7 @@ export async function getFilesFromSrcDir(
   if (srcDir.trim() === '' || filesGlob.trim() === '') {
     throw new Error('srcDir and filesGlob must not be empty');
   }
-  const globber = await glob.create(`${srcDir}/${filesGlob}`, {
-    matchDirectories: false,
-  });
-  return globber.glob();
+  return util.promisify(glob)(filesGlob, { cwd: srcDir, absolute: true });
 }
 
 type FileToUpload = {

test-fixtures/site-assets/script.js

@@ -0,0 +1 @@
+// hello