Merge pull request #538 from tancredi/upgrade-dependencies

Upgrade dependencies and drop Node.js < 16

- Upgrade `glob` - used as named export and Promise, change test mocks accordingly
- Replace `change-case` module to `case` to avoid issues related to mixing pure ESM modules and CommonJS
- BREAKING CHANGE: Lower support - now only Node.js >= 16.x.x
- Update CI test matrix
- Add `fix` script to write `prettier` fixes
- Update formatting after `prettier` upgrade

.github/workflows/release.yaml

@@ -6,14 +6,14 @@ on:
 
 env:
   FORCE_COLOR: 2
-  NODE: 14.x
+  NODE: 20.x
 
 jobs:
   release:
     if: "!contains(github.event.head_commit.message, 'skip ci') && github.repository == 'tancredi/fantasticon'"
     name: Release
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test.yaml

@@ -11,7 +11,7 @@ jobs:
     env:
       NODE: 16.x
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v3
@@ -43,7 +43,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macOS-11, ubuntu-20.04, windows-2019]
-        node: [14.x, 16.x, 18.x, 19.x]
+        node: [16.x, 18.x, 19.x, 20.x]
 
     steps:
       - uses: actions/checkout@v3

package.json

@@ -28,7 +28,8 @@
     "build": "rimraf lib && tsc --project ./tsconfig.json",
     "watch": "npm run build -- --watch",
     "typecheck": "tsc --noEmit --project tsconfig.test.json --noEmit",
-    "lint": "prettier --check ."
+    "lint": "prettier --check .",
+    "fix": "prettier --write ."
   },
   "files": [
     "bin/fantasticon",
@@ -38,34 +39,34 @@
   ],
   "prepublish": "build",
   "dependencies": {
-    "change-case": "^4.1.2",
-    "cli-color": "^2.0.2",
-    "commander": "^9.4.1",
-    "glob": "^8.0.3",
-    "handlebars": "^4.7.7",
-    "slugify": "^1.6.5",
+    "case": "^1.6.3",
+    "cli-color": "^2.0.4",
+    "commander": "^12.0.0",
+    "glob": "^10.3.12",
+    "handlebars": "^4.7.8",
+    "slugify": "^1.6.6",
     "svg2ttf": "^6.0.3",
     "svgicons2svgfont": "^12.0.0",
     "ttf2eot": "^3.1.0",
     "ttf2woff": "^3.0.0",
-    "ttf2woff2": "^4.0.5"
+    "ttf2woff2": "^5.0.0"
   },
   "devDependencies": {
-    "@types/cli-color": "^2.0.0",
-    "@types/glob": "^8.0.0",
-    "@types/jest": "^29.2.3",
-    "@types/node": "^18.11.9",
-    "@types/svg2ttf": "^5.0.1",
-    "@types/svgicons2svgfont": "^10.0.1",
-    "@types/ttf2eot": "^2.0.0",
-    "@types/ttf2woff": "^2.0.2",
-    "@types/ttf2woff2": "^2.0.0",
-    "jest": "^29.3.1",
-    "prettier": "^2.7.1",
-    "rimraf": "^3.0.2",
-    "semantic-release": "^19.0.5",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3"
+    "@types/cli-color": "^2.0.6",
+    "@types/glob": "^8.1.0",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.12.2",
+    "@types/svg2ttf": "^5.0.3",
+    "@types/svgicons2svgfont": "^10.0.5",
+    "@types/ttf2eot": "^2.0.2",
+    "@types/ttf2woff": "^2.0.4",
+    "@types/ttf2woff2": "^2.0.2",
+    "jest": "^29.7.0",
+    "prettier": "^3.2.5",
+    "rimraf": "^5.0.5",
+    "semantic-release": "^23.0.6",
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.4.3"
   },
   "jest": {
     "preset": "ts-jest",
@@ -81,6 +82,6 @@
     }
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 16.0.0"
   }
 }

src/__mocks__/glob.ts

@@ -1,4 +1,4 @@
-const mockGlobs = {
+const MOCK_GLOBS = {
   './valid/**/*.svg': [
     '/project/valid/foo.svg',
     '/project/valid/bar.svg',
@@ -8,18 +8,14 @@ const mockGlobs = {
   './empty/**/*.svg': []
 };
 
-module.exports = (
-  glob: string,
-  _: {},
-  callback: (err: Error | null, paths: string[] | null) => void
-) => {
-  setTimeout(() => {
-    const paths = mockGlobs[glob];
+module.exports = {
+  glob: async (glob: string, _: {}) => {
+    const paths = MOCK_GLOBS[glob];
 
     if (!paths) {
-      return callback(new Error(`Invalid glob: ${glob}`), null);
+      throw new Error(`Invalid glob: ${glob}`);
     }
 
-    return callback(null, paths);
-  });
+    return paths;
+  }
 };

src/generators/asset-types/__tests__/eot.ts

@@ -10,7 +10,7 @@ jest.mock('ttf2eot', () =>
 );
 
 const mockOptions = (eotOptions = { __mock: 'options__' } as any) =>
-  ({} as unknown as FontGeneratorOptions);
+  ({}) as unknown as FontGeneratorOptions;
 
 const ttf = '::ttf::' as unknown as Buffer;
 

src/generators/asset-types/__tests__/json.ts

@@ -8,7 +8,7 @@ const mockOptions = (jsonOptions: any = {}) =>
   ({
     codepoints: mockCodepoints,
     formatOptions: { [OtherAssetType.JSON]: jsonOptions }
-  } as any);
+  }) as any;
 
 const renderAndParse = async (jsonOptions?: any) =>
   JSON.parse(

src/generators/asset-types/__tests__/svg.ts

@@ -56,7 +56,7 @@ const mockOptions = (svgOptions = { __mock: 'options__' } as any) =>
       foo: { id: 'foo', absolutePath: '/root/foo.svg' },
       bar: { id: 'bar', absolutePath: '/root/bar.svg' }
     }
-  } as unknown as FontGeneratorOptions);
+  }) as unknown as FontGeneratorOptions;
 
 describe('`SVG` font generator', () => {
   beforeEach(() => {

src/generators/asset-types/__tests__/ttf.ts

@@ -12,7 +12,7 @@ jest.mock('svg2ttf', () =>
 const mockOptions = (ttfOptions = { __mock: 'options__' } as any) =>
   ({
     formatOptions: { [FontAssetType.TTF]: ttfOptions }
-  } as unknown as FontGeneratorOptions);
+  }) as unknown as FontGeneratorOptions;
 
 const svg = '::svg::';
 

src/generators/asset-types/__tests__/woff.ts

@@ -12,7 +12,7 @@ jest.mock('ttf2woff', () =>
 const mockOptions = (woffOptions = { __mock: 'options__' } as any) =>
   ({
     formatOptions: { [FontAssetType.WOFF]: woffOptions }
-  } as unknown as FontGeneratorOptions);
+  }) as unknown as FontGeneratorOptions;
 
 const ttf = '::ttf::' as unknown as Buffer;
 

src/generators/asset-types/__tests__/woff2.ts

@@ -9,7 +9,7 @@ jest.mock('ttf2woff2', () =>
 );
 
 const mockOptions = (woffOptions = { __mock: 'options__' } as any) =>
-  ({} as unknown as FontGeneratorOptions);
+  ({}) as unknown as FontGeneratorOptions;
 
 const ttf = '::ttf::' as unknown as Buffer;
 

src/generators/asset-types/ts.ts

@@ -1,4 +1,4 @@
-import { pascalCase, constantCase } from 'change-case';
+import { pascal as pascalCase, constant as constantCase } from 'case';
 import { FontGenerator } from '../../types/generator';
 
 const generateEnumKeys = (assetKeys: string[]): Record<string, string> =>

src/utils/assets.ts

@@ -1,5 +1,4 @@
-import glob from 'glob';
-import { promisify } from 'util';
+import { glob } from 'glob';
 import { resolve, relative, join } from 'path';
 import { removeExtension, splitSegments } from '../utils/path';
 import { writeFile } from './fs-async';
@@ -24,8 +23,7 @@ export const ASSETS_EXTENSION = 'svg';
 
 export const loadPaths = async (dir: string): Promise<string[]> => {
   const globPath = join(dir, `**/*.${ASSETS_EXTENSION}`);
-
-  const files = await promisify(glob)(globPath, {});
+  const files = await glob(globPath, {});
 
   if (!files.length) {
     throw new Error(`No SVGs found in ${dir}`);