Fix tests

Author: badsyntax

src/__tests__/s3.test.ts

@@ -9,6 +9,16 @@ import {
   generateSyncCriteria,
 } from '../s3.js';
 
+function sorter(a: string, b: string) {
+  if (a < b) {
+    return -1;
+  }
+  if (a > b) {
+    return 1;
+  }
+  return 0;
+}
+
 describe('getObjectKeyFromFilePath', () => {
   it('should generate the key', () => {
     const key = getObjectKeyFromFilePath(
@@ -33,16 +43,19 @@ describe('getObjectKeyFromFilePath', () => {
   it('should find files using srcDir and filesGlob', async () => {
     const srcDir = './test-fixtures';
     const rootDir = path.join(path.resolve(process.cwd()), srcDir);
-    const files = await getFilesFromSrcDir(srcDir, '**/*.html');
+    const files = (await getFilesFromSrcDir(srcDir, '**/*.html')).sort(sorter);
     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}/**/*');
+    const files = (
+      await getFilesFromSrcDir(srcDir, '{css,site-assets,img}/**/*')
+    ).sort(sorter);
     expect(files).toEqual([
       `${rootDir}/css/styles.css`,
+      `${rootDir}/img/sample.hdr`,
       `${rootDir}/site-assets/script.js`,
     ]);
   });

src/s3.ts

@@ -1,8 +1,7 @@
 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 { glob } from 'glob';
 import { generateETag } from 's3-etag';
 import {
   DeleteObjectsCommand,
@@ -17,7 +16,7 @@ import {
 } from '@aws-sdk/client-s3';
 import { Upload } from '@aws-sdk/lib-storage';
 import { debug, info } from '@actions/core';
-import minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 
 import { workspace } from './github.js';
 import { AsyncBatchQueue } from './AsyncBatchQueue.js';
@@ -235,7 +234,7 @@ export async function getFilesFromSrcDir(
   if (srcDir.trim() === '' || filesGlob.trim() === '') {
     throw new Error('srcDir and filesGlob must not be empty');
   }
-  return util.promisify(glob)(filesGlob, {
+  return glob(filesGlob, {
     cwd: srcDir,
     absolute: true,
     nodir: true,

tsconfig.json

@@ -7,7 +7,8 @@
     "strict": true,
     "noImplicitAny": true,
     "esModuleInterop": true,
-    "moduleResolution": "node"
+    "moduleResolution": "node",
+    "skipLibCheck": true
   },
   "exclude": ["node_modules"]
 }